diff --git a/Backup.AWS/AmazonExtensions.cs b/Backup.AWS/AmazonExtensions.cs
index 1a47c1a6..11fc4eb9 100644
--- a/Backup.AWS/AmazonExtensions.cs
+++ b/Backup.AWS/AmazonExtensions.cs
@@ -1,57 +1,56 @@
-namespace Ecng.Backup.Amazon
-{
-	using System;
-	using System.Collections.Generic;
-	using System.Linq;
-	using System.Reflection;
+namespace Ecng.Backup.Amazon;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
+using global::Amazon;
 
-	using global::Amazon;
+using Ecng.Common;
 
-	using Ecng.Common;
+/// <summary>
+/// Extension class for AWS.
+/// </summary>
+[CLSCompliant(false)]
+public static class AmazonExtensions
+{
+	private static RegionEndpoint[] _endpoints;
 
 	/// <summary>
-	/// Extension class for AWS.
+	/// All regions.
 	/// </summary>
-	[CLSCompliant(false)]
-	public static class AmazonExtensions
+	public static IEnumerable<RegionEndpoint> Endpoints
 	{
-		private static RegionEndpoint[] _endpoints;
-
-		/// <summary>
-		/// All regions.
-		/// </summary>
-		public static IEnumerable<RegionEndpoint> Endpoints
+		get
 		{
-			get
+			lock (typeof(AmazonExtensions))
 			{
-				lock (typeof(AmazonExtensions))
-				{
-					_endpoints ??= [.. typeof(RegionEndpoint)
-							.GetFields(BindingFlags.Static | BindingFlags.Public)
-							.Where(f => f.FieldType == typeof(RegionEndpoint))
-							.Select(f => (RegionEndpoint)f.GetValue(null))];
-				}
-
-				return _endpoints;
+				_endpoints ??= [.. typeof(RegionEndpoint)
+						.GetFields(BindingFlags.Static | BindingFlags.Public)
+						.Where(f => f.FieldType == typeof(RegionEndpoint))
+						.Select(f => (RegionEndpoint)f.GetValue(null))];
 			}
+
+			return _endpoints;
 		}
+	}
 
-		/// <summary>
-		/// Get region by name.
-		/// </summary>
-		/// <param name="name">Region name.</param>
-		/// <returns>Region.</returns>
-		public static RegionEndpoint GetEndpoint(string name)
-		{
-			if (name.IsEmpty())
-				throw new ArgumentNullException(nameof(name));
+	/// <summary>
+	/// Get region by name.
+	/// </summary>
+	/// <param name="name">Region name.</param>
+	/// <returns>Region.</returns>
+	public static RegionEndpoint GetEndpoint(string name)
+	{
+		if (name.IsEmpty())
+			throw new ArgumentNullException(nameof(name));
 
-			var region = Endpoints.FirstOrDefault(e =>
-				e.SystemName.EqualsIgnoreCase(name) ||
-				e.SystemName.Remove("-").EqualsIgnoreCase(name) ||
-				e.DisplayName.EqualsIgnoreCase(name));
+		var region = Endpoints.FirstOrDefault(e =>
+			e.SystemName.EqualsIgnoreCase(name) ||
+			e.SystemName.Remove("-").EqualsIgnoreCase(name) ||
+			e.DisplayName.EqualsIgnoreCase(name));
 
-			return region ?? RegionEndpoint.GetBySystemName(name);
-		}
+		return region ?? RegionEndpoint.GetBySystemName(name);
 	}
 }
\ No newline at end of file
diff --git a/Backup.AWS/AmazonGlacierService.cs b/Backup.AWS/AmazonGlacierService.cs
index 85460def..7ee148b6 100644
--- a/Backup.AWS/AmazonGlacierService.cs
+++ b/Backup.AWS/AmazonGlacierService.cs
@@ -1,144 +1,143 @@
-namespace Ecng.Backup.Amazon
-{
-	using System;
-	using System.Collections.Generic;
-	using System.IO;
-	using System.Threading;
-	using System.Threading.Tasks;
+namespace Ecng.Backup.Amazon;
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
 
-	using global::Amazon;
-	using global::Amazon.Runtime;
-	using global::Amazon.Glacier.Model;
-	using global::Amazon.Glacier;
+using global::Amazon;
+using global::Amazon.Runtime;
+using global::Amazon.Glacier.Model;
+using global::Amazon.Glacier;
 
-	using Ecng.Common;
+using Ecng.Common;
+
+/// <summary>
+/// The data storage service based on Amazon Glacier https://aws.amazon.com/s3/glacier/ .
+/// </summary>
+public class AmazonGlacierService : Disposable, IBackupService
+{
+	private readonly IAmazonGlacier _client;
+	private readonly string _vaultName;
+	private readonly AWSCredentials _credentials;
+	private readonly RegionEndpoint _endpoint;
+	private const int _bufferSize = FileSizes.MB * 100;
 
 	/// <summary>
-	/// The data storage service based on Amazon Glacier https://aws.amazon.com/s3/glacier/ .
+	/// Initializes a new instance of the <see cref="AmazonGlacierService"/>.
 	/// </summary>
-	public class AmazonGlacierService : Disposable, IBackupService
+	/// <param name="endpoint">Region address.</param>
+	/// <param name="bucket">Storage name.</param>
+	/// <param name="accessKey">Key.</param>
+	/// <param name="secretKey">Secret.</param>
+	public AmazonGlacierService(string endpoint, string bucket, string accessKey, string secretKey)
+		: this(AmazonExtensions.GetEndpoint(endpoint), bucket, accessKey, secretKey)
 	{
-		private readonly IAmazonGlacier _client;
-		private readonly string _vaultName;
-		private readonly AWSCredentials _credentials;
-		private readonly RegionEndpoint _endpoint;
-		private const int _bufferSize = FileSizes.MB * 100;
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="AmazonGlacierService"/>.
-		/// </summary>
-		/// <param name="endpoint">Region address.</param>
-		/// <param name="bucket">Storage name.</param>
-		/// <param name="accessKey">Key.</param>
-		/// <param name="secretKey">Secret.</param>
-		public AmazonGlacierService(string endpoint, string bucket, string accessKey, string secretKey)
-			: this(AmazonExtensions.GetEndpoint(endpoint), bucket, accessKey, secretKey)
-		{
-		}
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="AmazonGlacierService"/>.
-		/// </summary>
-		/// <param name="endpoint">Region address.</param>
-		/// <param name="vaultName">Storage name.</param>
-		/// <param name="accessKey">Key.</param>
-		/// <param name="secretKey">Secret.</param>
-		[CLSCompliant(false)]
-		public AmazonGlacierService(RegionEndpoint endpoint, string vaultName, string accessKey, string secretKey)
-		{
-			_credentials = new BasicAWSCredentials(accessKey, secretKey);
-			_endpoint = endpoint ?? throw new ArgumentNullException(nameof(endpoint));
-			_vaultName = vaultName.ThrowIfEmpty(nameof(vaultName));
-			_client = new AmazonGlacierClient(_credentials, _endpoint);
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="AmazonGlacierService"/>.
+	/// </summary>
+	/// <param name="endpoint">Region address.</param>
+	/// <param name="vaultName">Storage name.</param>
+	/// <param name="accessKey">Key.</param>
+	/// <param name="secretKey">Secret.</param>
+	[CLSCompliant(false)]
+	public AmazonGlacierService(RegionEndpoint endpoint, string vaultName, string accessKey, string secretKey)
+	{
+		_credentials = new BasicAWSCredentials(accessKey, secretKey);
+		_endpoint = endpoint ?? throw new ArgumentNullException(nameof(endpoint));
+		_vaultName = vaultName.ThrowIfEmpty(nameof(vaultName));
+		_client = new AmazonGlacierClient(_credentials, _endpoint);
+	}
 
-		bool IBackupService.CanFolders => false;
-		bool IBackupService.CanPublish => false;
-		bool IBackupService.CanPartialDownload => true;
+	bool IBackupService.CanFolders => false;
+	bool IBackupService.CanPublish => false;
+	bool IBackupService.CanPartialDownload => true;
 
-		IAsyncEnumerable<BackupEntry> IBackupService.FindAsync(BackupEntry parent, string criteria, CancellationToken cancellationToken)
-		{
-			throw new NotImplementedException();
-		}
+	IAsyncEnumerable<BackupEntry> IBackupService.FindAsync(BackupEntry parent, string criteria, CancellationToken cancellationToken)
+	{
+		throw new NotImplementedException();
+	}
 
-		Task IBackupService.DeleteAsync(BackupEntry entry, CancellationToken cancellationToken)
-			=> _client.DeleteArchiveAsync(new()
-			{
-				VaultName = _vaultName,
-				ArchiveId = entry.Name,
-			}, cancellationToken);
+	Task IBackupService.DeleteAsync(BackupEntry entry, CancellationToken cancellationToken)
+		=> _client.DeleteArchiveAsync(new()
+		{
+			VaultName = _vaultName,
+			ArchiveId = entry.Name,
+		}, cancellationToken);
 
-		Task IBackupService.FillInfoAsync(BackupEntry entry, CancellationToken cancellationToken)
-			=> throw new NotImplementedException();
+	Task IBackupService.FillInfoAsync(BackupEntry entry, CancellationToken cancellationToken)
+		=> throw new NotImplementedException();
 
-		async Task IBackupService.DownloadAsync(BackupEntry entry, Stream stream, long? offset, long? length, Action<int> progress, CancellationToken cancellationToken)
+	async Task IBackupService.DownloadAsync(BackupEntry entry, Stream stream, long? offset, long? length, Action<int> progress, CancellationToken cancellationToken)
+	{
+		GetJobOutputRequest request = new()
 		{
-			GetJobOutputRequest request = new()
-			{
-				//JobId = jobId,
-				VaultName = _vaultName,
-			};
+			//JobId = jobId,
+			VaultName = _vaultName,
+		};
 
-			if (offset != null || length != null)
-			{
-				if (offset is null || length is null)
-					throw new NotSupportedException();
+		if (offset != null || length != null)
+		{
+			if (offset is null || length is null)
+				throw new NotSupportedException();
 
-				request.Range = $"bytes={offset}-{offset + length}";
-			}
+			request.Range = $"bytes={offset}-{offset + length}";
+		}
 
-			var response = await _client.GetJobOutputAsync(request, cancellationToken);
+		var response = await _client.GetJobOutputAsync(request, cancellationToken);
 
-			using var webStream = response.Body;
+		using var webStream = response.Body;
 
-			var bytes = new byte[_bufferSize];
-			var readTotal = 0L;
+		var bytes = new byte[_bufferSize];
+		var readTotal = 0L;
 
-			var prevProgress = -1;
+		var prevProgress = -1;
 
-			var objLen = 0L; //TODO
+		var objLen = 0L; //TODO
 
-			while (readTotal < objLen)
-			{
-				var expected = (int)(objLen - readTotal).Min(_bufferSize);
-				var actual = await webStream.ReadAsync(bytes, 0, expected, cancellationToken);
+		while (readTotal < objLen)
+		{
+			var expected = (int)(objLen - readTotal).Min(_bufferSize);
+			var actual = await webStream.ReadAsync(bytes, 0, expected, cancellationToken);
 
-				if (actual == 0)
-					break;
+			if (actual == 0)
+				break;
 
-				await stream.WriteAsync(bytes, 0, actual, cancellationToken);
+			await stream.WriteAsync(bytes, 0, actual, cancellationToken);
 
-				readTotal += actual;
+			readTotal += actual;
 
-				var currProgress = (int)(readTotal * 100L / objLen);
+			var currProgress = (int)(readTotal * 100L / objLen);
 
-				if (currProgress < 100 && prevProgress < currProgress)
-				{
-					progress(currProgress);
-					prevProgress = currProgress;
-				}
+			if (currProgress < 100 && prevProgress < currProgress)
+			{
+				progress(currProgress);
+				prevProgress = currProgress;
 			}
 		}
+	}
 
-		Task IBackupService.UploadAsync(BackupEntry entry, Stream stream, Action<int> progress, CancellationToken cancellationToken)
-			=> throw new NotImplementedException();
+	Task IBackupService.UploadAsync(BackupEntry entry, Stream stream, Action<int> progress, CancellationToken cancellationToken)
+		=> throw new NotImplementedException();
 
-		Task<string> IBackupService.PublishAsync(BackupEntry entry, CancellationToken cancellationToken)
-			=> throw new NotSupportedException();
+	Task<string> IBackupService.PublishAsync(BackupEntry entry, CancellationToken cancellationToken)
+		=> throw new NotSupportedException();
 
-		Task IBackupService.UnPublishAsync(BackupEntry entry, CancellationToken cancellationToken)
-			=> throw new NotSupportedException();
+	Task IBackupService.UnPublishAsync(BackupEntry entry, CancellationToken cancellationToken)
+		=> throw new NotSupportedException();
 
-		Task IBackupService.CreateFolder(BackupEntry entry, CancellationToken cancellationToken)
-			=> throw new NotSupportedException();
+	Task IBackupService.CreateFolder(BackupEntry entry, CancellationToken cancellationToken)
+		=> throw new NotSupportedException();
 
-		/// <summary>
-		/// Disposes the managed resources.
-		/// </summary>
-		protected override void DisposeManaged()
-		{
-			_client.Dispose();
-			base.DisposeManaged();
-		}
+	/// <summary>
+	/// Disposes the managed resources.
+	/// </summary>
+	protected override void DisposeManaged()
+	{
+		_client.Dispose();
+		base.DisposeManaged();
 	}
 }
\ No newline at end of file
diff --git a/Backup.AWS/AmazonS3Service.cs b/Backup.AWS/AmazonS3Service.cs
index 84f2a7ba..da8377b3 100644
--- a/Backup.AWS/AmazonS3Service.cs
+++ b/Backup.AWS/AmazonS3Service.cs
@@ -1,307 +1,306 @@
-namespace Ecng.Backup.Amazon
+namespace Ecng.Backup.Amazon;
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Net;
+using System.Runtime.CompilerServices;
+
+using global::Amazon;
+using global::Amazon.Runtime;
+using global::Amazon.S3;
+using global::Amazon.S3.Model;
+
+using Ecng.Common;
+
+/// <summary>
+/// The data storage service based on Amazon S3 https://aws.amazon.com/s3/ .
+/// </summary>
+public class AmazonS3Service : Disposable, IBackupService
 {
-	using System;
-	using System.Collections.Generic;
-	using System.IO;
-	using System.Linq;
-	using System.Threading;
-	using System.Threading.Tasks;
-	using System.Net;
-	using System.Runtime.CompilerServices;
-
-	using global::Amazon;
-	using global::Amazon.Runtime;
-	using global::Amazon.S3;
-	using global::Amazon.S3.Model;
-
-	using Ecng.Common;
+	private readonly string _bucket;
+	private readonly IAmazonS3 _client;
+	private const int _bufferSize = FileSizes.MB * 10;
+	private readonly AWSCredentials _credentials;
+	private readonly RegionEndpoint _endpoint;
 
 	/// <summary>
-	/// The data storage service based on Amazon S3 https://aws.amazon.com/s3/ .
+	/// Initializes a new instance of the <see cref="AmazonS3Service"/>.
 	/// </summary>
-	public class AmazonS3Service : Disposable, IBackupService
+	/// <param name="endpoint">Region address.</param>
+	/// <param name="bucket">Storage name.</param>
+	/// <param name="accessKey">Key.</param>
+	/// <param name="secretKey">Secret.</param>
+	public AmazonS3Service(string endpoint, string bucket, string accessKey, string secretKey)
+		: this(AmazonExtensions.GetEndpoint(endpoint), bucket, accessKey, secretKey)
 	{
-		private readonly string _bucket;
-		private readonly IAmazonS3 _client;
-		private const int _bufferSize = FileSizes.MB * 10;
-		private readonly AWSCredentials _credentials;
-		private readonly RegionEndpoint _endpoint;
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="AmazonS3Service"/>.
-		/// </summary>
-		/// <param name="endpoint">Region address.</param>
-		/// <param name="bucket">Storage name.</param>
-		/// <param name="accessKey">Key.</param>
-		/// <param name="secretKey">Secret.</param>
-		public AmazonS3Service(string endpoint, string bucket, string accessKey, string secretKey)
-			: this(AmazonExtensions.GetEndpoint(endpoint), bucket, accessKey, secretKey)
-		{
-		}
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="AmazonS3Service"/>.
-		/// </summary>
-		/// <param name="endpoint">Region address.</param>
-		/// <param name="bucket">Storage name.</param>
-		/// <param name="accessKey">Key.</param>
-		/// <param name="secretKey">Secret.</param>
-		[CLSCompliant(false)]
-		public AmazonS3Service(RegionEndpoint endpoint, string bucket, string accessKey, string secretKey)
-		{
-			_credentials = new BasicAWSCredentials(accessKey, secretKey);
-			_endpoint = endpoint ?? throw new ArgumentNullException(nameof(endpoint));
-			_bucket = bucket.ThrowIfEmpty(nameof(bucket));
-			_client = new AmazonS3Client(_credentials, _endpoint);
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="AmazonS3Service"/>.
+	/// </summary>
+	/// <param name="endpoint">Region address.</param>
+	/// <param name="bucket">Storage name.</param>
+	/// <param name="accessKey">Key.</param>
+	/// <param name="secretKey">Secret.</param>
+	[CLSCompliant(false)]
+	public AmazonS3Service(RegionEndpoint endpoint, string bucket, string accessKey, string secretKey)
+	{
+		_credentials = new BasicAWSCredentials(accessKey, secretKey);
+		_endpoint = endpoint ?? throw new ArgumentNullException(nameof(endpoint));
+		_bucket = bucket.ThrowIfEmpty(nameof(bucket));
+		_client = new AmazonS3Client(_credentials, _endpoint);
+	}
 
-		bool IBackupService.CanFolders => false;
-		bool IBackupService.CanPublish => true;
-		bool IBackupService.CanPartialDownload => true;
+	bool IBackupService.CanFolders => false;
+	bool IBackupService.CanPublish => true;
+	bool IBackupService.CanPartialDownload => true;
 
-		async IAsyncEnumerable<BackupEntry> IBackupService.FindAsync(BackupEntry parent, string criteria, [EnumeratorCancellation]CancellationToken cancellationToken)
+	async IAsyncEnumerable<BackupEntry> IBackupService.FindAsync(BackupEntry parent, string criteria, [EnumeratorCancellation]CancellationToken cancellationToken)
+	{
+		//if (parent != null && !parent.IsDirectory)
+		//	throw new ArgumentException("{0} should be directory.".Put(parent.Name), "parent");
+
+		var request = new ListObjectsV2Request
 		{
-			//if (parent != null && !parent.IsDirectory)
-			//	throw new ArgumentException("{0} should be directory.".Put(parent.Name), "parent");
+			BucketName = _bucket,
+			Prefix = parent != null ? parent.GetFullPath() : null,
+		};
 
-			var request = new ListObjectsV2Request
-			{
-				BucketName = _bucket,
-				Prefix = parent != null ? parent.GetFullPath() : null,
-			};
+		if (!criteria.IsEmpty())
+			request.Prefix += "/" + criteria;
 
-			if (!criteria.IsEmpty())
-				request.Prefix += "/" + criteria;
+		do
+		{
+			var response = await _client.ListObjectsV2Async(request, cancellationToken);
 
-			do
+			foreach (var entry in response.S3Objects)
 			{
-				var response = await _client.ListObjectsV2Async(request, cancellationToken);
-
-				foreach (var entry in response.S3Objects)
-				{
-					var be = GetPath(entry.Key);
-					be.LastModified = entry.LastModified;
-					be.Size = entry.Size;
-					yield return be;
-				}
+				var be = GetPath(entry.Key);
+				be.LastModified = entry.LastModified;
+				be.Size = entry.Size;
+				yield return be;
+			}
 
-				foreach (var commonPrefix in response.CommonPrefixes)
+			foreach (var commonPrefix in response.CommonPrefixes)
+			{
+				yield return new()
 				{
-					yield return new()
-					{
-						Name = commonPrefix,
-						Parent = parent,
-					};
-				}
-
-				if (response.IsTruncated)
-					request.ContinuationToken = response.NextContinuationToken;
-				else
-					break;
+					Name = commonPrefix,
+					Parent = parent,
+				};
 			}
-			while (true);
+
+			if (response.IsTruncated)
+				request.ContinuationToken = response.NextContinuationToken;
+			else
+				break;
 		}
+		while (true);
+	}
 
-		Task IBackupService.DeleteAsync(BackupEntry entry, CancellationToken cancellationToken)
-			=> _client.DeleteObjectAsync(_bucket, entry.GetFullPath(), cancellationToken);
+	Task IBackupService.DeleteAsync(BackupEntry entry, CancellationToken cancellationToken)
+		=> _client.DeleteObjectAsync(_bucket, entry.GetFullPath(), cancellationToken);
 
-		async Task IBackupService.DownloadAsync(BackupEntry entry, Stream stream, long? offset, long? length, Action<int> progress, CancellationToken cancellationToken)
-		{
-			if (entry is null)
-				throw new ArgumentNullException(nameof(entry));
+	async Task IBackupService.DownloadAsync(BackupEntry entry, Stream stream, long? offset, long? length, Action<int> progress, CancellationToken cancellationToken)
+	{
+		if (entry is null)
+			throw new ArgumentNullException(nameof(entry));
 
-			if (stream is null)
-				throw new ArgumentNullException(nameof(stream));
+		if (stream is null)
+			throw new ArgumentNullException(nameof(stream));
 
-			if (progress is null)
-				throw new ArgumentNullException(nameof(progress));
+		if (progress is null)
+			throw new ArgumentNullException(nameof(progress));
 
-			var key = entry.GetFullPath();
+		var key = entry.GetFullPath();
 
-			var request = new GetObjectRequest
-			{
-				BucketName = _bucket,
-				Key = key,
-			};
+		var request = new GetObjectRequest
+		{
+			BucketName = _bucket,
+			Key = key,
+		};
 
-			if (offset != null || length != null)
-			{
-				if (offset is null || length is null)
-					throw new NotSupportedException();
+		if (offset != null || length != null)
+		{
+			if (offset is null || length is null)
+				throw new NotSupportedException();
 
-				request.ByteRange = new(offset.Value, offset.Value + length.Value);
-			}
+			request.ByteRange = new(offset.Value, offset.Value + length.Value);
+		}
 
-			var bytes = new byte[_bufferSize];
-			var readTotal = 0L;
+		var bytes = new byte[_bufferSize];
+		var readTotal = 0L;
 
-			var prevProgress = -1;
+		var prevProgress = -1;
 
-			using (var response = await _client.GetObjectAsync(request, cancellationToken))
-			using (var responseStream = response.ResponseStream)
-			{
-				var objLen = response.ContentLength;
+		using (var response = await _client.GetObjectAsync(request, cancellationToken))
+		using (var responseStream = response.ResponseStream)
+		{
+			var objLen = response.ContentLength;
 
-				while (readTotal < objLen)
-				{
-					var expected = (int)(objLen - readTotal).Min(_bufferSize);
-					var actual = await responseStream.ReadAsync(bytes, 0, expected, cancellationToken);
+			while (readTotal < objLen)
+			{
+				var expected = (int)(objLen - readTotal).Min(_bufferSize);
+				var actual = await responseStream.ReadAsync(bytes, 0, expected, cancellationToken);
 
-					if (actual == 0)
-						break;
+				if (actual == 0)
+					break;
 
-					await stream.WriteAsync(bytes, 0, actual, cancellationToken);
+				await stream.WriteAsync(bytes, 0, actual, cancellationToken);
 
-					readTotal += actual;
+				readTotal += actual;
 
-					var currProgress = (int)(readTotal * 100L / objLen);
+				var currProgress = (int)(readTotal * 100L / objLen);
 
-					if (currProgress < 100 && prevProgress < currProgress)
-					{
-						progress(currProgress);
-						prevProgress = currProgress;
-					}
+				if (currProgress < 100 && prevProgress < currProgress)
+				{
+					progress(currProgress);
+					prevProgress = currProgress;
 				}
 			}
-
-			if (prevProgress < 100)
-				progress(100);
 		}
 
-		async Task IBackupService.UploadAsync(BackupEntry entry, Stream stream, Action<int> progress, CancellationToken cancellationToken)
-		{
-			if (entry is null)
-				throw new ArgumentNullException(nameof(entry));
-
-			if (stream is null)
-				throw new ArgumentNullException(nameof(stream));
-
-			if (progress is null)
-				throw new ArgumentNullException(nameof(progress));
-
-			var key = entry.GetFullPath();
-
-			var initResponse = await _client.InitiateMultipartUploadAsync(new()
-			{
-				BucketName = _bucket,
-				Key = key,
-			}, cancellationToken);
+		if (prevProgress < 100)
+			progress(100);
+	}
 
-			var filePosition = 0L;
-			var prevProgress = -1;
+	async Task IBackupService.UploadAsync(BackupEntry entry, Stream stream, Action<int> progress, CancellationToken cancellationToken)
+	{
+		if (entry is null)
+			throw new ArgumentNullException(nameof(entry));
 
-			var etags = new List<PartETag>();
+		if (stream is null)
+			throw new ArgumentNullException(nameof(stream));
 
-			var partNum = 1;
+		if (progress is null)
+			throw new ArgumentNullException(nameof(progress));
 
-			while (filePosition < stream.Length)
-			{
-				var response = await _client.UploadPartAsync(new()
-				{
-					BucketName = _bucket,
-					UploadId = initResponse.UploadId,
-					PartNumber = partNum,
-					PartSize = _bufferSize,
-					//FilePosition = filePosition,
-					InputStream = stream,
-					Key = key
-				}, cancellationToken);
+		var key = entry.GetFullPath();
 
-				etags.Add(new(partNum, response.ETag));
+		var initResponse = await _client.InitiateMultipartUploadAsync(new()
+		{
+			BucketName = _bucket,
+			Key = key,
+		}, cancellationToken);
 
-				filePosition += _bufferSize;
+		var filePosition = 0L;
+		var prevProgress = -1;
 
-				var currProgress = (int)(filePosition.Min(stream.Length) * 100 / stream.Length);
+		var etags = new List<PartETag>();
 
-				if (currProgress > prevProgress)
-				{
-					progress(currProgress);
-					prevProgress = currProgress;
-				}
+		var partNum = 1;
 
-				partNum++;
-			}
-
-			await _client.CompleteMultipartUploadAsync(new()
+		while (filePosition < stream.Length)
+		{
+			var response = await _client.UploadPartAsync(new()
 			{
 				BucketName = _bucket,
 				UploadId = initResponse.UploadId,
-				Key = key,
-				PartETags = etags
+				PartNumber = partNum,
+				PartSize = _bufferSize,
+				//FilePosition = filePosition,
+				InputStream = stream,
+				Key = key
 			}, cancellationToken);
 
-			if (prevProgress < 100)
-				progress(100);
-		}
+			etags.Add(new(partNum, response.ETag));
 
-		Task IBackupService.CreateFolder(BackupEntry entry, CancellationToken cancellationToken)
-			=> throw new NotSupportedException();
+			filePosition += _bufferSize;
 
-		async Task IBackupService.FillInfoAsync(BackupEntry entry, CancellationToken cancellationToken)
-		{
-			var key = entry.GetFullPath();
+			var currProgress = (int)(filePosition.Min(stream.Length) * 100 / stream.Length);
 
-			var response = await _client.GetObjectMetadataAsync(new()
+			if (currProgress > prevProgress)
 			{
-				BucketName = _bucket,
-				Key = key,
-			}, cancellationToken);
+				progress(currProgress);
+				prevProgress = currProgress;
+			}
 
-			entry.Size = response.ContentLength;
+			partNum++;
 		}
 
-		async Task<string> IBackupService.PublishAsync(BackupEntry entry, CancellationToken cancellationToken)
+		await _client.CompleteMultipartUploadAsync(new()
 		{
-			var key = entry.GetFullPath();
+			BucketName = _bucket,
+			UploadId = initResponse.UploadId,
+			Key = key,
+			PartETags = etags
+		}, cancellationToken);
+
+		if (prevProgress < 100)
+			progress(100);
+	}
 
-			var response = await _client.PutACLAsync(new()
-			{
-				BucketName = _bucket,
-				Key = key,
-				CannedACL = S3CannedACL.PublicRead,
-			}, cancellationToken);
+	Task IBackupService.CreateFolder(BackupEntry entry, CancellationToken cancellationToken)
+		=> throw new NotSupportedException();
 
-			if (response.HttpStatusCode != HttpStatusCode.OK)
-				throw new InvalidOperationException(response.HttpStatusCode.To<string>());
-			
-			return $"https://{_bucket}.s3.{_endpoint.SystemName}.amazonaws.com/{key}";
-		}
+	async Task IBackupService.FillInfoAsync(BackupEntry entry, CancellationToken cancellationToken)
+	{
+		var key = entry.GetFullPath();
 
-		async Task IBackupService.UnPublishAsync(BackupEntry entry, CancellationToken cancellationToken)
+		var response = await _client.GetObjectMetadataAsync(new()
 		{
-			var key = entry.GetFullPath();
+			BucketName = _bucket,
+			Key = key,
+		}, cancellationToken);
 
-			var response = await _client.PutACLAsync(new()
-			{
-				BucketName = _bucket,
-				Key = key,
-				CannedACL = S3CannedACL.Private,
-			}, cancellationToken);
+		entry.Size = response.ContentLength;
+	}
 
-			if (response.HttpStatusCode != HttpStatusCode.OK)
-				throw new InvalidOperationException(response.HttpStatusCode.To<string>());
-		}
+	async Task<string> IBackupService.PublishAsync(BackupEntry entry, CancellationToken cancellationToken)
+	{
+		var key = entry.GetFullPath();
 
-		private static BackupEntry GetPath(string key)
+		var response = await _client.PutACLAsync(new()
 		{
-			var entities = key.Split('/').Select(p => new BackupEntry { Name = p }).ToArray();
+			BucketName = _bucket,
+			Key = key,
+			CannedACL = S3CannedACL.PublicRead,
+		}, cancellationToken);
+
+		if (response.HttpStatusCode != HttpStatusCode.OK)
+			throw new InvalidOperationException(response.HttpStatusCode.To<string>());
+		
+		return $"https://{_bucket}.s3.{_endpoint.SystemName}.amazonaws.com/{key}";
+	}
 
-			BackupEntry parent = null;
+	async Task IBackupService.UnPublishAsync(BackupEntry entry, CancellationToken cancellationToken)
+	{
+		var key = entry.GetFullPath();
 
-			foreach (var entity in entities)
-			{
-				entity.Parent = parent;
-				parent = entity;
-			}
+		var response = await _client.PutACLAsync(new()
+		{
+			BucketName = _bucket,
+			Key = key,
+			CannedACL = S3CannedACL.Private,
+		}, cancellationToken);
 
-			return entities.Last();
-		}
+		if (response.HttpStatusCode != HttpStatusCode.OK)
+			throw new InvalidOperationException(response.HttpStatusCode.To<string>());
+	}
+
+	private static BackupEntry GetPath(string key)
+	{
+		var entities = key.Split('/').Select(p => new BackupEntry { Name = p }).ToArray();
 
-		/// <inheritdoc />
-		protected override void DisposeManaged()
+		BackupEntry parent = null;
+
+		foreach (var entity in entities)
 		{
-			_client.Dispose();
-			base.DisposeManaged();
+			entity.Parent = parent;
+			parent = entity;
 		}
+
+		return entities.Last();
+	}
+
+	/// <inheritdoc />
+	protected override void DisposeManaged()
+	{
+		_client.Dispose();
+		base.DisposeManaged();
 	}
 }
\ No newline at end of file
diff --git a/Backup/IBackupService.cs b/Backup/IBackupService.cs
index 05cb85b2..744cfc33 100644
--- a/Backup/IBackupService.cs
+++ b/Backup/IBackupService.cs
@@ -1,100 +1,99 @@
-namespace Ecng.Backup
-{
-	using System;
-	using System.Collections.Generic;
-	using System.IO;
-	using System.Threading;
-	using System.Threading.Tasks;
+namespace Ecng.Backup;
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
 
+/// <summary>
+/// The interface describing online data storage service.
+/// </summary>
+public interface IBackupService : IDisposable
+{
 	/// <summary>
-	/// The interface describing online data storage service.
+	/// Is publishing feature available.
 	/// </summary>
-	public interface IBackupService : IDisposable
-	{
-		/// <summary>
-		/// Is publishing feature available.
-		/// </summary>
-		bool CanPublish { get; }
+	bool CanPublish { get; }
 
-		/// <summary>
-		/// Is folders feature available.
-		/// </summary>
-		bool CanFolders { get; }
+	/// <summary>
+	/// Is folders feature available.
+	/// </summary>
+	bool CanFolders { get; }
 
-		/// <summary>
-		/// Is partial download feature available.
-		/// </summary>
-		bool CanPartialDownload { get; }
+	/// <summary>
+	/// Is partial download feature available.
+	/// </summary>
+	bool CanPartialDownload { get; }
 
-		/// <summary>
-		/// Is partial upload feature available.
-		/// </summary>
-		/// <param name="entry"><see cref="BackupEntry"/></param>
-		/// <param name="cancellationToken"><see cref="CancellationToken"/></param>
-		/// <returns><see cref="Task"/></returns>
-		Task CreateFolder(BackupEntry entry, CancellationToken cancellationToken = default);
+	/// <summary>
+	/// Is partial upload feature available.
+	/// </summary>
+	/// <param name="entry"><see cref="BackupEntry"/></param>
+	/// <param name="cancellationToken"><see cref="CancellationToken"/></param>
+	/// <returns><see cref="Task"/></returns>
+	Task CreateFolder(BackupEntry entry, CancellationToken cancellationToken = default);
 
-		/// <summary>
-		/// Find files by the specified criteria.
-		/// </summary>
-		/// <param name="parent">Parent element. Can be null.</param>
-		/// <param name="criteria">Criteria.</param>
-		/// <param name="cancellationToken"><see cref="CancellationToken"/></param>
-		/// <returns>File list.</returns>
-		IAsyncEnumerable<BackupEntry> FindAsync(BackupEntry parent, string criteria, CancellationToken cancellationToken = default);
+	/// <summary>
+	/// Find files by the specified criteria.
+	/// </summary>
+	/// <param name="parent">Parent element. Can be null.</param>
+	/// <param name="criteria">Criteria.</param>
+	/// <param name="cancellationToken"><see cref="CancellationToken"/></param>
+	/// <returns>File list.</returns>
+	IAsyncEnumerable<BackupEntry> FindAsync(BackupEntry parent, string criteria, CancellationToken cancellationToken = default);
 
-		/// <summary>
-		/// Fill file info.
-		/// </summary>
-		/// <param name="entry">Element.</param>
-		/// <param name="cancellationToken"><see cref="CancellationToken"/></param>
-		/// <returns><see cref="Task"/></returns>
-		Task FillInfoAsync(BackupEntry entry, CancellationToken cancellationToken = default);
+	/// <summary>
+	/// Fill file info.
+	/// </summary>
+	/// <param name="entry">Element.</param>
+	/// <param name="cancellationToken"><see cref="CancellationToken"/></param>
+	/// <returns><see cref="Task"/></returns>
+	Task FillInfoAsync(BackupEntry entry, CancellationToken cancellationToken = default);
 
-		/// <summary>
-		/// Delete file from the service.
-		/// </summary>
-		/// <param name="entry">Element.</param>
-		/// <param name="cancellationToken"><see cref="CancellationToken"/></param>
-		/// <returns><see cref="Task"/></returns>
-		Task DeleteAsync(BackupEntry entry, CancellationToken cancellationToken = default);
+	/// <summary>
+	/// Delete file from the service.
+	/// </summary>
+	/// <param name="entry">Element.</param>
+	/// <param name="cancellationToken"><see cref="CancellationToken"/></param>
+	/// <returns><see cref="Task"/></returns>
+	Task DeleteAsync(BackupEntry entry, CancellationToken cancellationToken = default);
 
-		/// <summary>
-		/// Save file.
-		/// </summary>
-		/// <param name="entry">Element.</param>
-		/// <param name="stream"></param>
-		/// <param name="offset"></param>
-		/// <param name="length"></param>
-		/// <param name="progress">Progress notification.</param>
-		/// <param name="cancellationToken"><see cref="CancellationToken"/></param>
-		/// <returns><see cref="Task"/></returns>
-		Task DownloadAsync(BackupEntry entry, Stream stream, long? offset, long? length, Action<int> progress, CancellationToken cancellationToken = default);
+	/// <summary>
+	/// Save file.
+	/// </summary>
+	/// <param name="entry">Element.</param>
+	/// <param name="stream"></param>
+	/// <param name="offset"></param>
+	/// <param name="length"></param>
+	/// <param name="progress">Progress notification.</param>
+	/// <param name="cancellationToken"><see cref="CancellationToken"/></param>
+	/// <returns><see cref="Task"/></returns>
+	Task DownloadAsync(BackupEntry entry, Stream stream, long? offset, long? length, Action<int> progress, CancellationToken cancellationToken = default);
 
-		/// <summary>
-		/// Upload file.
-		/// </summary>
-		/// <param name="entry">Element.</param>
-		/// <param name="stream">The stream of the open file into which data from the service will be downloaded.</param>
-		/// <param name="progress">Progress notification.</param>
-		/// <param name="cancellationToken"><see cref="CancellationToken"/></param>
-		/// <returns><see cref="Task"/></returns>
-		Task UploadAsync(BackupEntry entry, Stream stream, Action<int> progress, CancellationToken cancellationToken = default);
+	/// <summary>
+	/// Upload file.
+	/// </summary>
+	/// <param name="entry">Element.</param>
+	/// <param name="stream">The stream of the open file into which data from the service will be downloaded.</param>
+	/// <param name="progress">Progress notification.</param>
+	/// <param name="cancellationToken"><see cref="CancellationToken"/></param>
+	/// <returns><see cref="Task"/></returns>
+	Task UploadAsync(BackupEntry entry, Stream stream, Action<int> progress, CancellationToken cancellationToken = default);
 
-		/// <summary>
-		/// Get public url for the specified element.
-		/// </summary>
-		/// <param name="entry">Element.</param>
-		/// <param name="cancellationToken"><see cref="CancellationToken"/></param>
-		/// <returns>Public url.</returns>
-		Task<string> PublishAsync(BackupEntry entry, CancellationToken cancellationToken = default);
+	/// <summary>
+	/// Get public url for the specified element.
+	/// </summary>
+	/// <param name="entry">Element.</param>
+	/// <param name="cancellationToken"><see cref="CancellationToken"/></param>
+	/// <returns>Public url.</returns>
+	Task<string> PublishAsync(BackupEntry entry, CancellationToken cancellationToken = default);
 
-		/// <summary>
-		/// Remove public url for the specified element.
-		/// </summary>
-		/// <param name="entry">Element.</param>
-		/// <param name="cancellationToken"><see cref="CancellationToken"/></param>
-		/// <returns><see cref="Task"/></returns>
-		Task UnPublishAsync(BackupEntry entry, CancellationToken cancellationToken = default);
-	}
+	/// <summary>
+	/// Remove public url for the specified element.
+	/// </summary>
+	/// <param name="entry">Element.</param>
+	/// <param name="cancellationToken"><see cref="CancellationToken"/></param>
+	/// <returns><see cref="Task"/></returns>
+	Task UnPublishAsync(BackupEntry entry, CancellationToken cancellationToken = default);
 }
\ No newline at end of file
diff --git a/Collections/BackwardComparer.cs b/Collections/BackwardComparer.cs
index 2cfa5503..c9c82b6e 100644
--- a/Collections/BackwardComparer.cs
+++ b/Collections/BackwardComparer.cs
@@ -1,18 +1,17 @@
-namespace Ecng.Collections
-{
-	using System;
-	using System.Collections.Generic;
+namespace Ecng.Collections;
+
+using System;
+using System.Collections.Generic;
 
-	/// <summary>
-	/// Provides a comparer that compares objects in reverse order.
-	/// </summary>
-	/// <typeparam name="T">The type of objects to compare. Must implement <see cref="IComparable{T}"/>.</typeparam>
-	public class BackwardComparer<T> : IComparer<T>
-		where T : IComparable<T>
+/// <summary>
+/// Provides a comparer that compares objects in reverse order.
+/// </summary>
+/// <typeparam name="T">The type of objects to compare. Must implement <see cref="IComparable{T}"/>.</typeparam>
+public class BackwardComparer<T> : IComparer<T>
+	where T : IComparable<T>
+{
+	int IComparer<T>.Compare(T x, T y)
 	{
-		int IComparer<T>.Compare(T x, T y)
-		{
-			return -x.CompareTo(y);
-		}
+		return -x.CompareTo(y);
 	}
 }
\ No newline at end of file
diff --git a/Collections/BaseBlockingQueue.cs b/Collections/BaseBlockingQueue.cs
index e02b4bcc..3e23313f 100644
--- a/Collections/BaseBlockingQueue.cs
+++ b/Collections/BaseBlockingQueue.cs
@@ -1,324 +1,323 @@
-namespace Ecng.Collections
+namespace Ecng.Collections;
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Threading;
+
+using Ecng.Common;
+
+// http://stackoverflow.com/questions/530211/creating-a-blocking-queuet-in-net
+/// <summary>
+/// Abstract base class for a blocking queue implementation with a generic type and an inner collection.
+/// </summary>
+/// <typeparam name="T">The type of elements in the queue.</typeparam>
+/// <typeparam name="TF">The type of the inner collection, which must implement <see cref="ICollection{T}"/>.</typeparam>
+public abstract class BaseBlockingQueue<T, TF>(TF innerCollection) : ISynchronizedCollection<T>, IBlockingQueue<T>
+	where TF : ICollection<T>
 {
-	using System;
-	using System.Collections;
-	using System.Collections.Generic;
-	using System.Threading;
+	/// <summary>
+	/// Gets the inner collection used to store the queue elements.
+	/// </summary>
+	protected TF InnerCollection { get; } = innerCollection;
 
-	using Ecng.Common;
+	// -1 is unlimited
+	private int _maxSize = -1;
 
-	// http://stackoverflow.com/questions/530211/creating-a-blocking-queuet-in-net
 	/// <summary>
-	/// Abstract base class for a blocking queue implementation with a generic type and an inner collection.
+	/// Gets or sets the maximum size of the queue. A value of -1 indicates no size limit.
 	/// </summary>
-	/// <typeparam name="T">The type of elements in the queue.</typeparam>
-	/// <typeparam name="TF">The type of the inner collection, which must implement <see cref="ICollection{T}"/>.</typeparam>
-	public abstract class BaseBlockingQueue<T, TF>(TF innerCollection) : ISynchronizedCollection<T>, IBlockingQueue<T>
-		where TF : ICollection<T>
+	/// <exception cref="ArgumentOutOfRangeException">Thrown when the value is 0 or less than -1.</exception>
+	public int MaxSize
 	{
-		/// <summary>
-		/// Gets the inner collection used to store the queue elements.
-		/// </summary>
-		protected TF InnerCollection { get; } = innerCollection;
-
-		// -1 is unlimited
-		private int _maxSize = -1;
-
-		/// <summary>
-		/// Gets or sets the maximum size of the queue. A value of -1 indicates no size limit.
-		/// </summary>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown when the value is 0 or less than -1.</exception>
-		public int MaxSize
+		get => _maxSize;
+		set
 		{
-			get => _maxSize;
-			set
-			{
-				if (value == 0 || value < -1)
-					throw new ArgumentOutOfRangeException(nameof(value));
+			if (value == 0 || value < -1)
+				throw new ArgumentOutOfRangeException(nameof(value));
 
-				_maxSize = value;
-			}
+			_maxSize = value;
 		}
+	}
 
-		/// <summary>
-		/// Gets the synchronization object used to coordinate access to the queue.
-		/// </summary>
-		public SyncObject SyncRoot { get; } = new();
+	/// <summary>
+	/// Gets the synchronization object used to coordinate access to the queue.
+	/// </summary>
+	public SyncObject SyncRoot { get; } = new();
 
-		/// <summary>
-		/// Gets the current number of items in the queue.
-		/// </summary>
-		public int Count => InnerCollection.Count;
+	/// <summary>
+	/// Gets the current number of items in the queue.
+	/// </summary>
+	public int Count => InnerCollection.Count;
 
-		private bool _isClosed;
+	private bool _isClosed;
 
-		/// <summary>
-		/// Gets a value indicating whether the queue is closed.
-		/// </summary>
-		public bool IsClosed => _isClosed;
+	/// <summary>
+	/// Gets a value indicating whether the queue is closed.
+	/// </summary>
+	public bool IsClosed => _isClosed;
 
-		/// <summary>
-		/// Closes the queue, preventing further enqueues and waking up any blocked threads.
-		/// </summary>
-		public void Close()
+	/// <summary>
+	/// Closes the queue, preventing further enqueues and waking up any blocked threads.
+	/// </summary>
+	public void Close()
+	{
+		lock (SyncRoot)
 		{
-			lock (SyncRoot)
-			{
-				_isClosed = true;
-				Monitor.PulseAll(SyncRoot);
-			}
+			_isClosed = true;
+			Monitor.PulseAll(SyncRoot);
 		}
+	}
 
-		/// <summary>
-		/// Reopens the queue, allowing enqueue operations to proceed.
-		/// </summary>
-		public void Open()
+	/// <summary>
+	/// Reopens the queue, allowing enqueue operations to proceed.
+	/// </summary>
+	public void Open()
+	{
+		lock (SyncRoot)
 		{
-			lock (SyncRoot)
-			{
-				_isClosed = false;
-			}
+			_isClosed = false;
 		}
+	}
 
-		/// <summary>
-		/// Blocks the current thread while the queue is full, unless it is closed.
-		/// </summary>
-		private void WaitWhileFull()
+	/// <summary>
+	/// Blocks the current thread while the queue is full, unless it is closed.
+	/// </summary>
+	private void WaitWhileFull()
+	{
+		while (InnerCollection.Count >= _maxSize && !_isClosed)
 		{
-			while (InnerCollection.Count >= _maxSize && !_isClosed)
-			{
-				Monitor.Wait(SyncRoot);
-			}
+			Monitor.Wait(SyncRoot);
 		}
+	}
 
-		/// <summary>
-		/// Blocks the current thread until the queue is empty or closed.
-		/// </summary>
-		public void WaitUntilEmpty()
+	/// <summary>
+	/// Blocks the current thread until the queue is empty or closed.
+	/// </summary>
+	public void WaitUntilEmpty()
+	{
+		lock (SyncRoot)
 		{
-			lock (SyncRoot)
-			{
-				while (InnerCollection.Count > 0 && !_isClosed)
-					Monitor.Wait(SyncRoot);
-			}
+			while (InnerCollection.Count > 0 && !_isClosed)
+				Monitor.Wait(SyncRoot);
 		}
+	}
 
-		/// <summary>
-		/// Adds an item to the queue, optionally forcing the enqueue even if the queue is full.
-		/// </summary>
-		/// <param name="item">The item to add to the queue.</param>
-		/// <param name="force">If true, adds the item regardless of the maximum size; otherwise, waits if the queue is full.</param>
-		public void Enqueue(T item, bool force = false)
+	/// <summary>
+	/// Adds an item to the queue, optionally forcing the enqueue even if the queue is full.
+	/// </summary>
+	/// <param name="item">The item to add to the queue.</param>
+	/// <param name="force">If true, adds the item regardless of the maximum size; otherwise, waits if the queue is full.</param>
+	public void Enqueue(T item, bool force = false)
+	{
+		lock (SyncRoot)
 		{
-			lock (SyncRoot)
+			if (_isClosed)
+				return;
+
+			if (!force && _maxSize != -1)
 			{
-				if (_isClosed)
-					return;
-
-				if (!force && _maxSize != -1)
-				{
-					if (InnerCollection.Count >= _maxSize)
-						WaitWhileFull();
-				}
-
-				OnEnqueue(item, force);
-
-				if (InnerCollection.Count == 1)
-				{
-					// wake up any blocked dequeue
-					Monitor.PulseAll(SyncRoot);
-				}
+				if (InnerCollection.Count >= _maxSize)
+					WaitWhileFull();
 			}
-		}
 
-		/// <summary>
-		/// Performs the actual enqueue operation on the inner collection.
-		/// </summary>
-		/// <param name="item">The item to enqueue.</param>
-		/// <param name="force">Indicates whether the enqueue is forced.</param>
-		protected abstract void OnEnqueue(T item, bool force);
-
-		/// <summary>
-		/// Performs the actual dequeue operation on the inner collection.
-		/// </summary>
-		/// <returns>The dequeued item.</returns>
-		protected abstract T OnDequeue();
-
-		/// <summary>
-		/// Retrieves, but does not remove, the head of the queue.
-		/// </summary>
-		/// <returns>The item at the head of the queue.</returns>
-		protected abstract T OnPeek();
-
-		/// <summary>
-		/// Removes and returns the item at the head of the queue.
-		/// </summary>
-		/// <returns>The dequeued item.</returns>
-		public T Dequeue()
-		{
-			TryDequeue(out T retVal, false);
-			return retVal;
-		}
+			OnEnqueue(item, force);
 
-		/// <summary>
-		/// Blocks the current thread while the queue is empty, based on the specified conditions.
-		/// </summary>
-		/// <param name="exitOnClose">If true, exits if the queue is closed.</param>
-		/// <param name="block">If true, blocks until an item is available; otherwise, returns immediately.</param>
-		/// <returns>True if an item is available; otherwise, false.</returns>
-		private bool WaitWhileEmpty(bool exitOnClose, bool block)
-		{
-			while (InnerCollection.Count == 0)
+			if (InnerCollection.Count == 1)
 			{
-				if (exitOnClose && _isClosed)
-					return false;
-
-				if (!block)
-					return false;
-
-				Monitor.Wait(SyncRoot);
+				// wake up any blocked dequeue
+				Monitor.PulseAll(SyncRoot);
 			}
-
-			return true;
 		}
+	}
 
-		/// <summary>
-		/// Attempts to remove and return the item at the head of the queue.
-		/// </summary>
-		/// <param name="value">When this method returns, contains the dequeued item if successful; otherwise, the default value.</param>
-		/// <param name="exitOnClose">If true, exits if the queue is closed.</param>
-		/// <param name="block">If true, blocks until an item is available; otherwise, returns immediately.</param>
-		/// <returns>True if an item was dequeued; otherwise, false.</returns>
-		public bool TryDequeue(out T value, bool exitOnClose = true, bool block = true)
-		{
-			lock (SyncRoot)
-			{
-				if (!WaitWhileEmpty(exitOnClose, block))
-				{
-					value = default;
-					return false;
-				}
+	/// <summary>
+	/// Performs the actual enqueue operation on the inner collection.
+	/// </summary>
+	/// <param name="item">The item to enqueue.</param>
+	/// <param name="force">Indicates whether the enqueue is forced.</param>
+	protected abstract void OnEnqueue(T item, bool force);
 
-				value = OnDequeue();
+	/// <summary>
+	/// Performs the actual dequeue operation on the inner collection.
+	/// </summary>
+	/// <returns>The dequeued item.</returns>
+	protected abstract T OnDequeue();
 
-				if (InnerCollection.Count == (_maxSize - 1) || InnerCollection.Count == 0)
-				{
-					// wake up any blocked enqueue
-					Monitor.PulseAll(SyncRoot);
-				}
+	/// <summary>
+	/// Retrieves, but does not remove, the head of the queue.
+	/// </summary>
+	/// <returns>The item at the head of the queue.</returns>
+	protected abstract T OnPeek();
 
-				return true;
-			}
-		}
+	/// <summary>
+	/// Removes and returns the item at the head of the queue.
+	/// </summary>
+	/// <returns>The dequeued item.</returns>
+	public T Dequeue()
+	{
+		TryDequeue(out T retVal, false);
+		return retVal;
+	}
 
-		/// <summary>
-		/// Retrieves, but does not remove, the item at the head of the queue.
-		/// </summary>
-		/// <returns>The item at the head of the queue.</returns>
-		public T Peek()
+	/// <summary>
+	/// Blocks the current thread while the queue is empty, based on the specified conditions.
+	/// </summary>
+	/// <param name="exitOnClose">If true, exits if the queue is closed.</param>
+	/// <param name="block">If true, blocks until an item is available; otherwise, returns immediately.</param>
+	/// <returns>True if an item is available; otherwise, false.</returns>
+	private bool WaitWhileEmpty(bool exitOnClose, bool block)
+	{
+		while (InnerCollection.Count == 0)
 		{
-			TryPeek(out T retVal, false);
-			return retVal;
+			if (exitOnClose && _isClosed)
+				return false;
+
+			if (!block)
+				return false;
+
+			Monitor.Wait(SyncRoot);
 		}
 
-		/// <summary>
-		/// Attempts to retrieve, but not remove, the item at the head of the queue.
-		/// </summary>
-		/// <param name="value">When this method returns, contains the peeked item if successful; otherwise, the default value.</param>
-		/// <param name="exitOnClose">If true, exits if the queue is closed.</param>
-		/// <param name="block">If true, blocks until an item is available; otherwise, returns immediately.</param>
-		/// <returns>True if an item was peeked; otherwise, false.</returns>
-		public bool TryPeek(out T value, bool exitOnClose = true, bool block = true)
+		return true;
+	}
+
+	/// <summary>
+	/// Attempts to remove and return the item at the head of the queue.
+	/// </summary>
+	/// <param name="value">When this method returns, contains the dequeued item if successful; otherwise, the default value.</param>
+	/// <param name="exitOnClose">If true, exits if the queue is closed.</param>
+	/// <param name="block">If true, blocks until an item is available; otherwise, returns immediately.</param>
+	/// <returns>True if an item was dequeued; otherwise, false.</returns>
+	public bool TryDequeue(out T value, bool exitOnClose = true, bool block = true)
+	{
+		lock (SyncRoot)
 		{
-			lock (SyncRoot)
+			if (!WaitWhileEmpty(exitOnClose, block))
 			{
-				if (!WaitWhileEmpty(exitOnClose, block))
-				{
-					value = default;
-					return false;
-				}
+				value = default;
+				return false;
+			}
 
-				value = OnPeek();
+			value = OnDequeue();
 
-				return true;
+			if (InnerCollection.Count == (_maxSize - 1) || InnerCollection.Count == 0)
+			{
+				// wake up any blocked enqueue
+				Monitor.PulseAll(SyncRoot);
 			}
+
+			return true;
 		}
+	}
+
+	/// <summary>
+	/// Retrieves, but does not remove, the item at the head of the queue.
+	/// </summary>
+	/// <returns>The item at the head of the queue.</returns>
+	public T Peek()
+	{
+		TryPeek(out T retVal, false);
+		return retVal;
+	}
 
-		/// <summary>
-		/// Removes all items from the queue and notifies blocked threads.
-		/// </summary>
-		public void Clear()
+	/// <summary>
+	/// Attempts to retrieve, but not remove, the item at the head of the queue.
+	/// </summary>
+	/// <param name="value">When this method returns, contains the peeked item if successful; otherwise, the default value.</param>
+	/// <param name="exitOnClose">If true, exits if the queue is closed.</param>
+	/// <param name="block">If true, blocks until an item is available; otherwise, returns immediately.</param>
+	/// <returns>True if an item was peeked; otherwise, false.</returns>
+	public bool TryPeek(out T value, bool exitOnClose = true, bool block = true)
+	{
+		lock (SyncRoot)
 		{
-			lock (SyncRoot)
+			if (!WaitWhileEmpty(exitOnClose, block))
 			{
-				InnerCollection.Clear();
-				Monitor.PulseAll(SyncRoot);
+				value = default;
+				return false;
 			}
+
+			value = OnPeek();
+
+			return true;
 		}
+	}
 
-		/// <summary>
-		/// Removes the specified item from the queue. This operation is not supported.
-		/// </summary>
-		/// <param name="item">The item to remove.</param>
-		/// <returns>Always throws <see cref="NotSupportedException"/>.</returns>
-		/// <exception cref="NotSupportedException">Thrown because removal of specific items is not supported.</exception>
-		bool ICollection<T>.Remove(T item)
+	/// <summary>
+	/// Removes all items from the queue and notifies blocked threads.
+	/// </summary>
+	public void Clear()
+	{
+		lock (SyncRoot)
 		{
-			throw new NotSupportedException();
+			InnerCollection.Clear();
+			Monitor.PulseAll(SyncRoot);
 		}
+	}
+
+	/// <summary>
+	/// Removes the specified item from the queue. This operation is not supported.
+	/// </summary>
+	/// <param name="item">The item to remove.</param>
+	/// <returns>Always throws <see cref="NotSupportedException"/>.</returns>
+	/// <exception cref="NotSupportedException">Thrown because removal of specific items is not supported.</exception>
+	bool ICollection<T>.Remove(T item)
+	{
+		throw new NotSupportedException();
+	}
 
-		/// <summary>
-		/// Gets a value indicating whether the collection is read-only. Always returns false.
-		/// </summary>
-		bool ICollection<T>.IsReadOnly => false;
+	/// <summary>
+	/// Gets a value indicating whether the collection is read-only. Always returns false.
+	/// </summary>
+	bool ICollection<T>.IsReadOnly => false;
 
-		/// <summary>
-		/// Adds an item to the queue using the <see cref="Enqueue(T, bool)"/> method.
-		/// </summary>
-		/// <param name="item">The item to add.</param>
-		void ICollection<T>.Add(T item)
-		{
-			Enqueue(item);
-		}
+	/// <summary>
+	/// Adds an item to the queue using the <see cref="Enqueue(T, bool)"/> method.
+	/// </summary>
+	/// <param name="item">The item to add.</param>
+	void ICollection<T>.Add(T item)
+	{
+		Enqueue(item);
+	}
 
-		/// <summary>
-		/// Determines whether the queue contains a specific item.
-		/// </summary>
-		/// <param name="item">The item to locate.</param>
-		/// <returns>True if the item is found; otherwise, false.</returns>
-		bool ICollection<T>.Contains(T item)
-		{
-			lock (SyncRoot)
-				return InnerCollection.Contains(item);
-		}
+	/// <summary>
+	/// Determines whether the queue contains a specific item.
+	/// </summary>
+	/// <param name="item">The item to locate.</param>
+	/// <returns>True if the item is found; otherwise, false.</returns>
+	bool ICollection<T>.Contains(T item)
+	{
+		lock (SyncRoot)
+			return InnerCollection.Contains(item);
+	}
 
-		/// <summary>
-		/// Copies the elements of the queue to an array, starting at the specified index.
-		/// </summary>
-		/// <param name="array">The destination array.</param>
-		/// <param name="arrayIndex">The zero-based index in the array at which copying begins.</param>
-		void ICollection<T>.CopyTo(T[] array, int arrayIndex)
-		{
-			lock (SyncRoot)
-				InnerCollection.CopyTo(array, arrayIndex);
-		}
+	/// <summary>
+	/// Copies the elements of the queue to an array, starting at the specified index.
+	/// </summary>
+	/// <param name="array">The destination array.</param>
+	/// <param name="arrayIndex">The zero-based index in the array at which copying begins.</param>
+	void ICollection<T>.CopyTo(T[] array, int arrayIndex)
+	{
+		lock (SyncRoot)
+			InnerCollection.CopyTo(array, arrayIndex);
+	}
 
-		/// <summary>
-		/// Returns an enumerator that iterates through the queue.
-		/// </summary>
-		/// <returns>An enumerator for the queue.</returns>
-		public IEnumerator<T> GetEnumerator()
-		{
-			return InnerCollection.GetEnumerator();
-		}
+	/// <summary>
+	/// Returns an enumerator that iterates through the queue.
+	/// </summary>
+	/// <returns>An enumerator for the queue.</returns>
+	public IEnumerator<T> GetEnumerator()
+	{
+		return InnerCollection.GetEnumerator();
+	}
 
-		/// <summary>
-		/// Returns an enumerator that iterates through the queue (non-generic version).
-		/// </summary>
-		/// <returns>An enumerator for the queue.</returns>
-		IEnumerator IEnumerable.GetEnumerator()
-		{
-			return GetEnumerator();
-		}
+	/// <summary>
+	/// Returns an enumerator that iterates through the queue (non-generic version).
+	/// </summary>
+	/// <returns>An enumerator for the queue.</returns>
+	IEnumerator IEnumerable.GetEnumerator()
+	{
+		return GetEnumerator();
 	}
 }
\ No newline at end of file
diff --git a/Collections/BaseCollection.cs b/Collections/BaseCollection.cs
index c0f8afbe..63d6f171 100644
--- a/Collections/BaseCollection.cs
+++ b/Collections/BaseCollection.cs
@@ -1,576 +1,575 @@
-namespace Ecng.Collections
+namespace Ecng.Collections;
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+using Ecng.Common;
+
+/// <summary>
+/// Represents a base class for a generic collection with event notifications and inner collection management.
+/// </summary>
+/// <typeparam name="TItem">The type of elements in the collection.</typeparam>
+/// <typeparam name="TCollection">The type of the inner collection, which must implement <see cref="ICollection{TItem}"/>.</typeparam>
+[Serializable]
+public abstract class BaseCollection<TItem, TCollection> : ICollection<TItem>, ICollection, INotifyList<TItem>, IList
+	where TCollection : ICollection<TItem>
 {
-	using System;
-	using System.Collections;
-	using System.Collections.Generic;
+	/// <summary>
+	/// Initializes a new instance of the <see cref="BaseCollection{TItem, TCollection}"/> class with the specified inner collection.
+	/// </summary>
+	/// <param name="innerCollection">The inner collection to manage.</param>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="innerCollection"/> is null.</exception>
+	protected BaseCollection(TCollection innerCollection)
+	{
+		if (innerCollection.IsNull())
+			throw new ArgumentNullException(nameof(innerCollection));
+
+		InnerCollection = innerCollection;
+	}
+
+	/// <summary>
+	/// Gets or sets a value indicating whether to check for null items in the collection.
+	/// </summary>
+	public bool CheckNullableItems { get; set; }
+
+	/// <summary>
+	/// Gets the inner collection that stores the items.
+	/// </summary>
+	protected TCollection InnerCollection { get; }
 
-	using Ecng.Common;
+	/// <summary>
+	/// Retrieves an item at the specified index from the inner collection.
+	/// </summary>
+	/// <param name="index">The zero-based index of the item to retrieve.</param>
+	/// <returns>The item at the specified index.</returns>
+	protected abstract TItem OnGetItem(int index);
 
 	/// <summary>
-	/// Represents a base class for a generic collection with event notifications and inner collection management.
+	/// Inserts an item into the inner collection at the specified index.
 	/// </summary>
-	/// <typeparam name="TItem">The type of elements in the collection.</typeparam>
-	/// <typeparam name="TCollection">The type of the inner collection, which must implement <see cref="ICollection{TItem}"/>.</typeparam>
-	[Serializable]
-	public abstract class BaseCollection<TItem, TCollection> : ICollection<TItem>, ICollection, INotifyList<TItem>, IList
-		where TCollection : ICollection<TItem>
+	/// <param name="index">The zero-based index at which to insert the item.</param>
+	/// <param name="item">The item to insert.</param>
+	protected abstract void OnInsert(int index, TItem item);
+
+	/// <summary>
+	/// Removes an item from the inner collection at the specified index.
+	/// </summary>
+	/// <param name="index">The zero-based index of the item to remove.</param>
+	protected abstract void OnRemoveAt(int index);
+
+	/// <summary>
+	/// Adds an item to the inner collection.
+	/// </summary>
+	/// <param name="item">The item to add.</param>
+	protected virtual void OnAdd(TItem item)
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="BaseCollection{TItem, TCollection}"/> class with the specified inner collection.
-		/// </summary>
-		/// <param name="innerCollection">The inner collection to manage.</param>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="innerCollection"/> is null.</exception>
-		protected BaseCollection(TCollection innerCollection)
-		{
-			if (innerCollection.IsNull())
-				throw new ArgumentNullException(nameof(innerCollection));
+		InnerCollection.Add(item);
+	}
 
-			InnerCollection = innerCollection;
-		}
+	/// <summary>
+	/// Removes an item from the inner collection.
+	/// </summary>
+	/// <param name="item">The item to remove.</param>
+	/// <returns>True if the item was removed; otherwise, false.</returns>
+	protected virtual bool OnRemove(TItem item)
+	{
+		return InnerCollection.Remove(item);
+	}
+
+	/// <summary>
+	/// Removes all items from the inner collection.
+	/// </summary>
+	protected virtual void OnClear()
+	{
+		InnerCollection.Clear();
+	}
+
+	/// <summary>
+	/// Returns an enumerator that iterates through the collection (non-generic version).
+	/// </summary>
+	/// <returns>An enumerator for the collection.</returns>
+	IEnumerator IEnumerable.GetEnumerator()
+		=> ((IEnumerable<TItem>)this).GetEnumerator();
+
+	/// <summary>
+	/// Returns an enumerator that iterates through the collection.
+	/// </summary>
+	/// <returns>An enumerator for the collection.</returns>
+	public virtual IEnumerator<TItem> GetEnumerator()
+		=> InnerCollection.GetEnumerator();
+
+	/// <summary>
+	/// Gets the number of items in the collection.
+	/// </summary>
+	public virtual int Count => InnerCollection.Count;
+
+	/// <summary>
+	/// Determines whether the collection contains a specific item.
+	/// </summary>
+	/// <param name="item">The item to locate.</param>
+	/// <returns>True if the item is found; otherwise, false.</returns>
+	public virtual bool Contains(TItem item) => InnerCollection.Contains(item);
+
+	/// <summary>
+	/// Validates the specified index to ensure it is within the valid range.
+	/// </summary>
+	/// <param name="index">The index to check.</param>
+	/// <exception cref="ArgumentOutOfRangeException">Thrown when the index is less than 0 or greater than <see cref="Count"/>.</exception>
+	private void CheckIndex(int index)
+	{
+		if (index < 0 || index > Count)
+			throw new ArgumentOutOfRangeException(nameof(index), index, "Index has incorrect value.");
+	}
 
-		/// <summary>
-		/// Gets or sets a value indicating whether to check for null items in the collection.
-		/// </summary>
-		public bool CheckNullableItems { get; set; }
-
-		/// <summary>
-		/// Gets the inner collection that stores the items.
-		/// </summary>
-		protected TCollection InnerCollection { get; }
-
-		/// <summary>
-		/// Retrieves an item at the specified index from the inner collection.
-		/// </summary>
-		/// <param name="index">The zero-based index of the item to retrieve.</param>
-		/// <returns>The item at the specified index.</returns>
-		protected abstract TItem OnGetItem(int index);
-
-		/// <summary>
-		/// Inserts an item into the inner collection at the specified index.
-		/// </summary>
-		/// <param name="index">The zero-based index at which to insert the item.</param>
-		/// <param name="item">The item to insert.</param>
-		protected abstract void OnInsert(int index, TItem item);
-
-		/// <summary>
-		/// Removes an item from the inner collection at the specified index.
-		/// </summary>
-		/// <param name="index">The zero-based index of the item to remove.</param>
-		protected abstract void OnRemoveAt(int index);
-
-		/// <summary>
-		/// Adds an item to the inner collection.
-		/// </summary>
-		/// <param name="item">The item to add.</param>
-		protected virtual void OnAdd(TItem item)
+	/// <summary>
+	/// Gets or sets the item at the specified index.
+	/// </summary>
+	/// <param name="index">The zero-based index of the item.</param>
+	/// <returns>The item at the specified index.</returns>
+	/// <exception cref="ArgumentOutOfRangeException">Thrown when the index is invalid.</exception>
+	public virtual TItem this[int index]
+	{
+		get => OnGetItem(index);
+		set
 		{
-			InnerCollection.Add(item);
+			CheckIndex(index);
+
+			if (index < Count)
+			{
+				RemoveAt(index);
+				Insert(index, value);
+			}
+			else
+				Add(value);
 		}
+	}
 
-		/// <summary>
-		/// Removes an item from the inner collection.
-		/// </summary>
-		/// <param name="item">The item to remove.</param>
-		/// <returns>True if the item was removed; otherwise, false.</returns>
-		protected virtual bool OnRemove(TItem item)
+	/// <summary>
+	/// Returns the index of the specified item in the collection.
+	/// </summary>
+	/// <param name="item">The item to locate.</param>
+	/// <returns>The zero-based index of the item, or -1 if not found.</returns>
+	public abstract int IndexOf(TItem item);
+
+	/// <summary>
+	/// Removes the item at the specified index.
+	/// </summary>
+	/// <param name="index">The zero-based index of the item to remove.</param>
+	public virtual void RemoveAt(int index)
+	{
+		if (OnRemovingAt(index))
 		{
-			return InnerCollection.Remove(item);
+			OnRemoveAt(index);
+			OnRemovedAt(index);
 		}
+	}
+
+	/// <summary>
+	/// Inserts an item into the collection at the specified index.
+	/// </summary>
+	/// <param name="index">The zero-based index at which to insert the item.</param>
+	/// <param name="item">The item to insert.</param>
+	/// <exception cref="ArgumentOutOfRangeException">Thrown when the index is invalid.</exception>
+	public virtual void Insert(int index, TItem item)
+	{
+		CheckIndex(index);
 
-		/// <summary>
-		/// Removes all items from the inner collection.
-		/// </summary>
-		protected virtual void OnClear()
+		if (index == Count)
+			Add(item);
+		else
 		{
-			InnerCollection.Clear();
+			OnInserting(index, item);
+			OnInsert(index, item);
+			OnInserted(index, item);
 		}
+	}
+
+	/// <summary>
+	/// Gets a value indicating whether the collection is read-only.
+	/// </summary>
+	public virtual bool IsReadOnly => false;
 
-		/// <summary>
-		/// Returns an enumerator that iterates through the collection (non-generic version).
-		/// </summary>
-		/// <returns>An enumerator for the collection.</returns>
-		IEnumerator IEnumerable.GetEnumerator()
-			=> ((IEnumerable<TItem>)this).GetEnumerator();
-
-		/// <summary>
-		/// Returns an enumerator that iterates through the collection.
-		/// </summary>
-		/// <returns>An enumerator for the collection.</returns>
-		public virtual IEnumerator<TItem> GetEnumerator()
-			=> InnerCollection.GetEnumerator();
-
-		/// <summary>
-		/// Gets the number of items in the collection.
-		/// </summary>
-		public virtual int Count => InnerCollection.Count;
-
-		/// <summary>
-		/// Determines whether the collection contains a specific item.
-		/// </summary>
-		/// <param name="item">The item to locate.</param>
-		/// <returns>True if the item is found; otherwise, false.</returns>
-		public virtual bool Contains(TItem item) => InnerCollection.Contains(item);
-
-		/// <summary>
-		/// Validates the specified index to ensure it is within the valid range.
-		/// </summary>
-		/// <param name="index">The index to check.</param>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown when the index is less than 0 or greater than <see cref="Count"/>.</exception>
-		private void CheckIndex(int index)
+	/// <summary>
+	/// Adds an item to the collection.
+	/// </summary>
+	/// <param name="item">The item to add.</param>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="item"/> is null and <see cref="CheckNullableItems"/> is true.</exception>
+	public virtual void Add(TItem item)
+	{
+		if (CheckNullableItems && item.IsNull())
+			throw new ArgumentNullException(nameof(item));
+
+		if (OnAdding(item))
 		{
-			if (index < 0 || index > Count)
-				throw new ArgumentOutOfRangeException(nameof(index), index, "Index has incorrect value.");
+			OnAdd(item);
+			OnAdded(item);
 		}
+	}
 
-		/// <summary>
-		/// Gets or sets the item at the specified index.
-		/// </summary>
-		/// <param name="index">The zero-based index of the item.</param>
-		/// <returns>The item at the specified index.</returns>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown when the index is invalid.</exception>
-		public virtual TItem this[int index]
+	/// <summary>
+	/// Removes all items from the collection.
+	/// </summary>
+	public virtual void Clear()
+	{
+		if (OnClearing())
 		{
-			get => OnGetItem(index);
-			set
-			{
-				CheckIndex(index);
-
-				if (index < Count)
-				{
-					RemoveAt(index);
-					Insert(index, value);
-				}
-				else
-					Add(value);
-			}
+			OnClear();
+			OnCleared();
 		}
+	}
 
-		/// <summary>
-		/// Returns the index of the specified item in the collection.
-		/// </summary>
-		/// <param name="item">The item to locate.</param>
-		/// <returns>The zero-based index of the item, or -1 if not found.</returns>
-		public abstract int IndexOf(TItem item);
-
-		/// <summary>
-		/// Removes the item at the specified index.
-		/// </summary>
-		/// <param name="index">The zero-based index of the item to remove.</param>
-		public virtual void RemoveAt(int index)
+	/// <summary>
+	/// Removes the specified item from the collection.
+	/// </summary>
+	/// <param name="item">The item to remove.</param>
+	/// <returns>True if the item was removed; otherwise, false.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="item"/> is null and <see cref="CheckNullableItems"/> is true.</exception>
+	public virtual bool Remove(TItem item)
+	{
+		if (CheckNullableItems && item.IsNull())
+			throw new ArgumentNullException(nameof(item));
+
+		if (OnRemoving(item))
 		{
-			if (OnRemovingAt(index))
+			if (OnRemove(item))
 			{
-				OnRemoveAt(index);
-				OnRemovedAt(index);
+				OnRemoved(item);
+				return true;
 			}
 		}
 
-		/// <summary>
-		/// Inserts an item into the collection at the specified index.
-		/// </summary>
-		/// <param name="index">The zero-based index at which to insert the item.</param>
-		/// <param name="item">The item to insert.</param>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown when the index is invalid.</exception>
-		public virtual void Insert(int index, TItem item)
-		{
-			CheckIndex(index);
+		return false;
+	}
 
-			if (index == Count)
-				Add(item);
-			else
-			{
-				OnInserting(index, item);
-				OnInsert(index, item);
-				OnInserted(index, item);
-			}
-		}
+	/// <summary>
+	/// Occurs before an item is added to the collection.
+	/// </summary>
+	public event Func<TItem, bool> Adding;
 
-		/// <summary>
-		/// Gets a value indicating whether the collection is read-only.
-		/// </summary>
-		public virtual bool IsReadOnly => false;
-
-		/// <summary>
-		/// Adds an item to the collection.
-		/// </summary>
-		/// <param name="item">The item to add.</param>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="item"/> is null and <see cref="CheckNullableItems"/> is true.</exception>
-		public virtual void Add(TItem item)
-		{
-			if (CheckNullableItems && item.IsNull())
-				throw new ArgumentNullException(nameof(item));
+	/// <summary>
+	/// Occurs after an item has been added to the collection.
+	/// </summary>
+	public event Action<TItem> Added;
 
-			if (OnAdding(item))
-			{
-				OnAdd(item);
-				OnAdded(item);
-			}
-		}
+	/// <summary>
+	/// Occurs before an item is removed from the collection.
+	/// </summary>
+	public event Func<TItem, bool> Removing;
 
-		/// <summary>
-		/// Removes all items from the collection.
-		/// </summary>
-		public virtual void Clear()
-		{
-			if (OnClearing())
-			{
-				OnClear();
-				OnCleared();
-			}
-		}
+	/// <summary>
+	/// Occurs after an item has been removed from the collection.
+	/// </summary>
+	public event Action<TItem> Removed;
 
-		/// <summary>
-		/// Removes the specified item from the collection.
-		/// </summary>
-		/// <param name="item">The item to remove.</param>
-		/// <returns>True if the item was removed; otherwise, false.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="item"/> is null and <see cref="CheckNullableItems"/> is true.</exception>
-		public virtual bool Remove(TItem item)
-		{
-			if (CheckNullableItems && item.IsNull())
-				throw new ArgumentNullException(nameof(item));
+	/// <summary>
+	/// Occurs before an item is removed at the specified index.
+	/// </summary>
+	public event Func<int, bool> RemovingAt;
 
-			if (OnRemoving(item))
-			{
-				if (OnRemove(item))
-				{
-					OnRemoved(item);
-					return true;
-				}
-			}
+	/// <summary>
+	/// Occurs after an item has been removed at the specified index.
+	/// </summary>
+	public event Action<int> RemovedAt;
 
-			return false;
-		}
+	/// <summary>
+	/// Occurs before the collection is cleared.
+	/// </summary>
+	public event Func<bool> Clearing;
 
-		/// <summary>
-		/// Occurs before an item is added to the collection.
-		/// </summary>
-		public event Func<TItem, bool> Adding;
-
-		/// <summary>
-		/// Occurs after an item has been added to the collection.
-		/// </summary>
-		public event Action<TItem> Added;
-
-		/// <summary>
-		/// Occurs before an item is removed from the collection.
-		/// </summary>
-		public event Func<TItem, bool> Removing;
-
-		/// <summary>
-		/// Occurs after an item has been removed from the collection.
-		/// </summary>
-		public event Action<TItem> Removed;
-
-		/// <summary>
-		/// Occurs before an item is removed at the specified index.
-		/// </summary>
-		public event Func<int, bool> RemovingAt;
-
-		/// <summary>
-		/// Occurs after an item has been removed at the specified index.
-		/// </summary>
-		public event Action<int> RemovedAt;
-
-		/// <summary>
-		/// Occurs before the collection is cleared.
-		/// </summary>
-		public event Func<bool> Clearing;
-
-		/// <summary>
-		/// Occurs after the collection has been cleared.
-		/// </summary>
-		public event Action Cleared;
-
-		/// <summary>
-		/// Occurs before an item is inserted at the specified index.
-		/// </summary>
-		public event Func<int, TItem, bool> Inserting;
-
-		/// <summary>
-		/// Occurs after an item has been inserted at the specified index.
-		/// </summary>
-		public event Action<int, TItem> Inserted;
-
-		/// <summary>
-		/// Occurs when the collection has been modified.
-		/// </summary>
-		public event Action Changed;
-
-		/// <summary>
-		/// Invokes the <see cref="Inserting"/> event before inserting an item.
-		/// </summary>
-		/// <param name="index">The zero-based index at which to insert the item.</param>
-		/// <param name="item">The item to insert.</param>
-		/// <returns>True if the insertion should proceed; otherwise, false.</returns>
-		protected virtual bool OnInserting(int index, TItem item)
-		{
-			return Inserting?.Invoke(index, item) ?? true;
-		}
+	/// <summary>
+	/// Occurs after the collection has been cleared.
+	/// </summary>
+	public event Action Cleared;
 
-		/// <summary>
-		/// Invokes the <see cref="Inserted"/> event and notifies of a change after inserting an item.
-		/// </summary>
-		/// <param name="index">The zero-based index at which the item was inserted.</param>
-		/// <param name="item">The inserted item.</param>
-		protected virtual void OnInserted(int index, TItem item)
-		{
-			Inserted?.Invoke(index, item);
-			OnChanged();
-		}
+	/// <summary>
+	/// Occurs before an item is inserted at the specified index.
+	/// </summary>
+	public event Func<int, TItem, bool> Inserting;
 
-		/// <summary>
-		/// Invokes the <see cref="Adding"/> event before adding an item.
-		/// </summary>
-		/// <param name="item">The item to add.</param>
-		/// <returns>True if the addition should proceed; otherwise, false.</returns>
-		protected virtual bool OnAdding(TItem item)
-		{
-			return Adding?.Invoke(item) ?? true;
-		}
+	/// <summary>
+	/// Occurs after an item has been inserted at the specified index.
+	/// </summary>
+	public event Action<int, TItem> Inserted;
 
-		/// <summary>
-		/// Invokes the <see cref="Added"/> event and notifies of a change after adding an item.
-		/// </summary>
-		/// <param name="item">The added item.</param>
-		protected virtual void OnAdded(TItem item)
-		{
-			Added?.Invoke(item);
-			OnChanged();
-		}
+	/// <summary>
+	/// Occurs when the collection has been modified.
+	/// </summary>
+	public event Action Changed;
 
-		/// <summary>
-		/// Invokes the <see cref="Clearing"/> event before clearing the collection.
-		/// </summary>
-		/// <returns>True if the clearing should proceed; otherwise, false.</returns>
-		protected virtual bool OnClearing()
-		{
-			return Clearing?.Invoke() ?? true;
-		}
+	/// <summary>
+	/// Invokes the <see cref="Inserting"/> event before inserting an item.
+	/// </summary>
+	/// <param name="index">The zero-based index at which to insert the item.</param>
+	/// <param name="item">The item to insert.</param>
+	/// <returns>True if the insertion should proceed; otherwise, false.</returns>
+	protected virtual bool OnInserting(int index, TItem item)
+	{
+		return Inserting?.Invoke(index, item) ?? true;
+	}
 
-		/// <summary>
-		/// Invokes the <see cref="Cleared"/> event and notifies of a change after clearing the collection.
-		/// </summary>
-		protected virtual void OnCleared()
-		{
-			Cleared?.Invoke();
-			OnChanged();
-		}
+	/// <summary>
+	/// Invokes the <see cref="Inserted"/> event and notifies of a change after inserting an item.
+	/// </summary>
+	/// <param name="index">The zero-based index at which the item was inserted.</param>
+	/// <param name="item">The inserted item.</param>
+	protected virtual void OnInserted(int index, TItem item)
+	{
+		Inserted?.Invoke(index, item);
+		OnChanged();
+	}
 
-		/// <summary>
-		/// Invokes the <see cref="Removing"/> event before removing an item.
-		/// </summary>
-		/// <param name="item">The item to remove.</param>
-		/// <returns>True if the removal should proceed; otherwise, false.</returns>
-		protected virtual bool OnRemoving(TItem item)
-		{
-			return Removing?.Invoke(item) ?? true;
-		}
+	/// <summary>
+	/// Invokes the <see cref="Adding"/> event before adding an item.
+	/// </summary>
+	/// <param name="item">The item to add.</param>
+	/// <returns>True if the addition should proceed; otherwise, false.</returns>
+	protected virtual bool OnAdding(TItem item)
+	{
+		return Adding?.Invoke(item) ?? true;
+	}
 
-		/// <summary>
-		/// Invokes the <see cref="Removed"/> event and notifies of a change after removing an item.
-		/// </summary>
-		/// <param name="item">The removed item.</param>
-		protected virtual void OnRemoved(TItem item)
-		{
-			Removed?.Invoke(item);
-			OnChanged();
-		}
+	/// <summary>
+	/// Invokes the <see cref="Added"/> event and notifies of a change after adding an item.
+	/// </summary>
+	/// <param name="item">The added item.</param>
+	protected virtual void OnAdded(TItem item)
+	{
+		Added?.Invoke(item);
+		OnChanged();
+	}
 
-		/// <summary>
-		/// Invokes the <see cref="RemovingAt"/> event before removing an item at the specified index.
-		/// </summary>
-		/// <param name="index">The zero-based index of the item to remove.</param>
-		/// <returns>True if the removal should proceed; otherwise, false.</returns>
-		protected virtual bool OnRemovingAt(int index)
-		{
-			return RemovingAt?.Invoke(index) ?? true;
-		}
+	/// <summary>
+	/// Invokes the <see cref="Clearing"/> event before clearing the collection.
+	/// </summary>
+	/// <returns>True if the clearing should proceed; otherwise, false.</returns>
+	protected virtual bool OnClearing()
+	{
+		return Clearing?.Invoke() ?? true;
+	}
 
-		/// <summary>
-		/// Invokes the <see cref="RemovedAt"/> event and notifies of a change after removing an item at the specified index.
-		/// </summary>
-		/// <param name="index">The zero-based index of the removed item.</param>
-		protected virtual void OnRemovedAt(int index)
-		{
-			RemovedAt?.Invoke(index);
-			OnChanged();
-		}
+	/// <summary>
+	/// Invokes the <see cref="Cleared"/> event and notifies of a change after clearing the collection.
+	/// </summary>
+	protected virtual void OnCleared()
+	{
+		Cleared?.Invoke();
+		OnChanged();
+	}
 
-		/// <summary>
-		/// Invokes the <see cref="Changed"/> event to notify of a modification in the collection.
-		/// </summary>
-		protected virtual void OnChanged()
-		{
-			Changed?.Invoke();
-		}
+	/// <summary>
+	/// Invokes the <see cref="Removing"/> event before removing an item.
+	/// </summary>
+	/// <param name="item">The item to remove.</param>
+	/// <returns>True if the removal should proceed; otherwise, false.</returns>
+	protected virtual bool OnRemoving(TItem item)
+	{
+		return Removing?.Invoke(item) ?? true;
+	}
 
-		#region IList Members
+	/// <summary>
+	/// Invokes the <see cref="Removed"/> event and notifies of a change after removing an item.
+	/// </summary>
+	/// <param name="item">The removed item.</param>
+	protected virtual void OnRemoved(TItem item)
+	{
+		Removed?.Invoke(item);
+		OnChanged();
+	}
 
-		/// <summary>
-		/// Determines whether the collection contains a specific value (non-generic).
-		/// </summary>
-		/// <param name="value">The value to locate.</param>
-		/// <returns>True if the value is found and compatible; otherwise, false.</returns>
-		bool IList.Contains(object value)
-		{
-			if (!IsCompatible(value))
-				return false;
+	/// <summary>
+	/// Invokes the <see cref="RemovingAt"/> event before removing an item at the specified index.
+	/// </summary>
+	/// <param name="index">The zero-based index of the item to remove.</param>
+	/// <returns>True if the removal should proceed; otherwise, false.</returns>
+	protected virtual bool OnRemovingAt(int index)
+	{
+		return RemovingAt?.Invoke(index) ?? true;
+	}
 
-			return Contains((TItem)value);
-		}
+	/// <summary>
+	/// Invokes the <see cref="RemovedAt"/> event and notifies of a change after removing an item at the specified index.
+	/// </summary>
+	/// <param name="index">The zero-based index of the removed item.</param>
+	protected virtual void OnRemovedAt(int index)
+	{
+		RemovedAt?.Invoke(index);
+		OnChanged();
+	}
 
-		/// <summary>
-		/// Adds a value to the collection (non-generic).
-		/// </summary>
-		/// <param name="value">The value to add.</param>
-		/// <returns>The new count of items in the collection.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="value"/> is null and incompatible with <typeparamref name="TItem"/>.</exception>
-		int IList.Add(object value)
-		{
-			if (!IsCompatible(value))
-				throw new ArgumentNullException(nameof(value));
+	/// <summary>
+	/// Invokes the <see cref="Changed"/> event to notify of a modification in the collection.
+	/// </summary>
+	protected virtual void OnChanged()
+	{
+		Changed?.Invoke();
+	}
 
-			Add((TItem)value);
-			return Count;
-		}
+	#region IList Members
 
-		/// <summary>
-		/// Gets a value indicating whether the collection is read-only (non-generic).
-		/// </summary>
-		bool IList.IsReadOnly => false;
-
-		/// <summary>
-		/// Gets or sets the item at the specified index (non-generic).
-		/// </summary>
-		/// <param name="index">The zero-based index of the item.</param>
-		/// <returns>The item at the specified index.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when setting a value that is null and incompatible with <typeparamref name="TItem"/>.</exception>
-		object IList.this[int index]
-		{
-			get => this[index];
-			set
-			{
-				if (!IsCompatible(value))
-					throw new ArgumentNullException(nameof(value));
+	/// <summary>
+	/// Determines whether the collection contains a specific value (non-generic).
+	/// </summary>
+	/// <param name="value">The value to locate.</param>
+	/// <returns>True if the value is found and compatible; otherwise, false.</returns>
+	bool IList.Contains(object value)
+	{
+		if (!IsCompatible(value))
+			return false;
 
-				this[index] = (TItem)value;
-			}
-		}
+		return Contains((TItem)value);
+	}
 
-		/// <summary>
-		/// Removes all items from the collection (non-generic).
-		/// </summary>
-		void IList.Clear()
-		{
-			((ICollection<TItem>)this).Clear();
-		}
+	/// <summary>
+	/// Adds a value to the collection (non-generic).
+	/// </summary>
+	/// <param name="value">The value to add.</param>
+	/// <returns>The new count of items in the collection.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="value"/> is null and incompatible with <typeparamref name="TItem"/>.</exception>
+	int IList.Add(object value)
+	{
+		if (!IsCompatible(value))
+			throw new ArgumentNullException(nameof(value));
 
-		/// <summary>
-		/// Returns the index of a specific value in the collection (non-generic).
-		/// </summary>
-		/// <param name="value">The value to locate.</param>
-		/// <returns>The zero-based index of the value, or -1 if not found or incompatible.</returns>
-		int IList.IndexOf(object value)
-		{
-			if (!IsCompatible(value))
-				return -1;
+		Add((TItem)value);
+		return Count;
+	}
 
-			return IndexOf((TItem)value);
-		}
+	/// <summary>
+	/// Gets a value indicating whether the collection is read-only (non-generic).
+	/// </summary>
+	bool IList.IsReadOnly => false;
 
-		/// <summary>
-		/// Inserts a value into the collection at the specified index (non-generic).
-		/// </summary>
-		/// <param name="index">The zero-based index at which to insert the value.</param>
-		/// <param name="value">The value to insert.</param>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="value"/> is null and incompatible with <typeparamref name="TItem"/>.</exception>
-		void IList.Insert(int index, object value)
+	/// <summary>
+	/// Gets or sets the item at the specified index (non-generic).
+	/// </summary>
+	/// <param name="index">The zero-based index of the item.</param>
+	/// <returns>The item at the specified index.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when setting a value that is null and incompatible with <typeparamref name="TItem"/>.</exception>
+	object IList.this[int index]
+	{
+		get => this[index];
+		set
 		{
 			if (!IsCompatible(value))
 				throw new ArgumentNullException(nameof(value));
 
-			Insert(index, (TItem)value);
+			this[index] = (TItem)value;
 		}
+	}
 
-		/// <summary>
-		/// Removes a specific value from the collection (non-generic).
-		/// </summary>
-		/// <param name="value">The value to remove.</param>
-		void IList.Remove(object value)
-		{
-			if (!IsCompatible(value))
-				return;
+	/// <summary>
+	/// Removes all items from the collection (non-generic).
+	/// </summary>
+	void IList.Clear()
+	{
+		((ICollection<TItem>)this).Clear();
+	}
 
-			Remove((TItem)value);
-		}
+	/// <summary>
+	/// Returns the index of a specific value in the collection (non-generic).
+	/// </summary>
+	/// <param name="value">The value to locate.</param>
+	/// <returns>The zero-based index of the value, or -1 if not found or incompatible.</returns>
+	int IList.IndexOf(object value)
+	{
+		if (!IsCompatible(value))
+			return -1;
 
-		/// <summary>
-		/// Removes the item at the specified index (non-generic).
-		/// </summary>
-		/// <param name="index">The zero-based index of the item to remove.</param>
-		void IList.RemoveAt(int index)
-		{
-			RemoveAt(index);
-		}
+		return IndexOf((TItem)value);
+	}
 
-		/// <summary>
-		/// Gets a value indicating whether the collection has a fixed size (non-generic). Always returns false.
-		/// </summary>
-		bool IList.IsFixedSize => false;
-
-		#endregion
-
-		private static readonly bool _isValueType = typeof(TItem).IsValueType;
-
-		/// <summary>
-		/// Determines whether a value is compatible with the collection's item type.
-		/// </summary>
-		/// <param name="value">The value to check.</param>
-		/// <returns>True if the value is compatible; otherwise, false.</returns>
-		private static bool IsCompatible(object value) => !_isValueType || value != null;
-
-		/// <summary>
-		/// Gets a value indicating whether the collection is synchronized (non-generic). Always returns false.
-		/// </summary>
-		bool ICollection.IsSynchronized => false;
-
-		/// <summary>
-		/// Gets the synchronization root object (non-generic). Returns the current instance.
-		/// </summary>
-		object ICollection.SyncRoot => this;
-
-		/// <summary>
-		/// Copies the elements of the collection to an array (non-generic).
-		/// </summary>
-		/// <param name="array">The destination array.</param>
-		/// <param name="index">The zero-based index in the array at which copying begins.</param>
-		void ICollection.CopyTo(Array array, int index)
-			=> CopyTo((TItem[])array, index);
-
-		/// <summary>
-		/// Copies the elements of the collection to an array.
-		/// </summary>
-		/// <param name="array">The destination array.</param>
-		/// <param name="index">The zero-based index in the array at which copying begins.</param>
-		public void CopyTo(TItem[] array, int index)
-		{
-			int count = Count;
+	/// <summary>
+	/// Inserts a value into the collection at the specified index (non-generic).
+	/// </summary>
+	/// <param name="index">The zero-based index at which to insert the value.</param>
+	/// <param name="value">The value to insert.</param>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="value"/> is null and incompatible with <typeparamref name="TItem"/>.</exception>
+	void IList.Insert(int index, object value)
+	{
+		if (!IsCompatible(value))
+			throw new ArgumentNullException(nameof(value));
 
-			if (count == 0)
-				return;
+		Insert(index, (TItem)value);
+	}
 
-			var i = 0;
-			foreach (var item in (ICollection<TItem>)this)
-			{
-				if (i >= count)
-					break;
+	/// <summary>
+	/// Removes a specific value from the collection (non-generic).
+	/// </summary>
+	/// <param name="value">The value to remove.</param>
+	void IList.Remove(object value)
+	{
+		if (!IsCompatible(value))
+			return;
 
-				array[index] = item;
+		Remove((TItem)value);
+	}
 
-				index++;
-				i++;
-			}
+	/// <summary>
+	/// Removes the item at the specified index (non-generic).
+	/// </summary>
+	/// <param name="index">The zero-based index of the item to remove.</param>
+	void IList.RemoveAt(int index)
+	{
+		RemoveAt(index);
+	}
+
+	/// <summary>
+	/// Gets a value indicating whether the collection has a fixed size (non-generic). Always returns false.
+	/// </summary>
+	bool IList.IsFixedSize => false;
+
+	#endregion
+
+	private static readonly bool _isValueType = typeof(TItem).IsValueType;
+
+	/// <summary>
+	/// Determines whether a value is compatible with the collection's item type.
+	/// </summary>
+	/// <param name="value">The value to check.</param>
+	/// <returns>True if the value is compatible; otherwise, false.</returns>
+	private static bool IsCompatible(object value) => !_isValueType || value != null;
+
+	/// <summary>
+	/// Gets a value indicating whether the collection is synchronized (non-generic). Always returns false.
+	/// </summary>
+	bool ICollection.IsSynchronized => false;
+
+	/// <summary>
+	/// Gets the synchronization root object (non-generic). Returns the current instance.
+	/// </summary>
+	object ICollection.SyncRoot => this;
+
+	/// <summary>
+	/// Copies the elements of the collection to an array (non-generic).
+	/// </summary>
+	/// <param name="array">The destination array.</param>
+	/// <param name="index">The zero-based index in the array at which copying begins.</param>
+	void ICollection.CopyTo(Array array, int index)
+		=> CopyTo((TItem[])array, index);
+
+	/// <summary>
+	/// Copies the elements of the collection to an array.
+	/// </summary>
+	/// <param name="array">The destination array.</param>
+	/// <param name="index">The zero-based index in the array at which copying begins.</param>
+	public void CopyTo(TItem[] array, int index)
+	{
+		int count = Count;
+
+		if (count == 0)
+			return;
+
+		var i = 0;
+		foreach (var item in (ICollection<TItem>)this)
+		{
+			if (i >= count)
+				break;
+
+			array[index] = item;
+
+			index++;
+			i++;
 		}
 	}
 }
\ No newline at end of file
diff --git a/Collections/BaseEnumerator.cs b/Collections/BaseEnumerator.cs
index cdefdc59..8f6d6626 100644
--- a/Collections/BaseEnumerator.cs
+++ b/Collections/BaseEnumerator.cs
@@ -1,73 +1,72 @@
-namespace Ecng.Collections
-{
-	using System;
-	using System.Collections.Generic;
+namespace Ecng.Collections;
+
+using System;
+using System.Collections.Generic;
 
-	using Ecng.Common;
+using Ecng.Common;
 
+/// <summary>
+/// Represents an abstract base class for an enumerator over a generic enumerable source.
+/// </summary>
+/// <typeparam name="TEnumerable">The type of the enumerable source, which must implement <see cref="IEnumerable{TItem}"/>.</typeparam>
+/// <typeparam name="TItem">The type of elements in the enumerable source.</typeparam>
+public abstract class BaseEnumerator<TEnumerable, TItem> : SimpleEnumerator<TItem>
+	where TEnumerable : IEnumerable<TItem>
+{
 	/// <summary>
-	/// Represents an abstract base class for an enumerator over a generic enumerable source.
+	/// Initializes a new instance of the <see cref="BaseEnumerator{TEnumerable, TItem}"/> class with the specified source.
 	/// </summary>
-	/// <typeparam name="TEnumerable">The type of the enumerable source, which must implement <see cref="IEnumerable{TItem}"/>.</typeparam>
-	/// <typeparam name="TItem">The type of elements in the enumerable source.</typeparam>
-	public abstract class BaseEnumerator<TEnumerable, TItem> : SimpleEnumerator<TItem>
-		where TEnumerable : IEnumerable<TItem>
+	/// <param name="source">The enumerable source to iterate over.</param>
+	/// <exception cref="ArgumentException">Thrown when <paramref name="source"/> is null.</exception>
+	protected BaseEnumerator(TEnumerable source)
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="BaseEnumerator{TEnumerable, TItem}"/> class with the specified source.
-		/// </summary>
-		/// <param name="source">The enumerable source to iterate over.</param>
-		/// <exception cref="ArgumentException">Thrown when <paramref name="source"/> is null.</exception>
-		protected BaseEnumerator(TEnumerable source)
-		{
-			if (source.IsNull())
-				throw new ArgumentException(nameof(source));
+		if (source.IsNull())
+			throw new ArgumentException(nameof(source));
 
-			Source = source;
-			Reset();
-		}
-
-		/// <summary>
-		/// Gets or sets the enumerable source being iterated over.
-		/// </summary>
-		public TEnumerable Source { get; private set; }
+		Source = source;
+		Reset();
+	}
 
-		/// <summary>
-		/// Disposes of managed resources by resetting the enumerator and clearing the source.
-		/// </summary>
-		protected override void DisposeManaged()
-		{
-			Reset();
-			Source = default;
-		}
+	/// <summary>
+	/// Gets or sets the enumerable source being iterated over.
+	/// </summary>
+	public TEnumerable Source { get; private set; }
 
-		/// <summary>
-		/// Advances the enumerator to the next element of the collection.
-		/// </summary>
-		/// <returns>True if the enumerator was successfully advanced to the next element; false if the enumerator has passed the end of the collection.</returns>
-		/// <exception cref="ObjectDisposedException">Thrown if the enumerator has been disposed.</exception>
-		public override bool MoveNext()
-		{
-			ThrowIfDisposed();
+	/// <summary>
+	/// Disposes of managed resources by resetting the enumerator and clearing the source.
+	/// </summary>
+	protected override void DisposeManaged()
+	{
+		Reset();
+		Source = default;
+	}
 
-			var canProcess = true;
-			Current = ProcessMove(ref canProcess);
-			return canProcess;
-		}
+	/// <summary>
+	/// Advances the enumerator to the next element of the collection.
+	/// </summary>
+	/// <returns>True if the enumerator was successfully advanced to the next element; false if the enumerator has passed the end of the collection.</returns>
+	/// <exception cref="ObjectDisposedException">Thrown if the enumerator has been disposed.</exception>
+	public override bool MoveNext()
+	{
+		ThrowIfDisposed();
 
-		/// <summary>
-		/// Sets the enumerator to its initial position, which is before the first element in the collection.
-		/// </summary>
-		public override void Reset()
-		{
-			Current = default;
-		}
+		var canProcess = true;
+		Current = ProcessMove(ref canProcess);
+		return canProcess;
+	}
 
-		/// <summary>
-		/// Processes the movement to the next element and determines whether iteration can continue.
-		/// </summary>
-		/// <param name="canProcess">A reference parameter indicating whether the enumerator can proceed; set to false if the end is reached.</param>
-		/// <returns>The next item in the collection, or the default value if no further items are available.</returns>
-		protected abstract TItem ProcessMove(ref bool canProcess);
+	/// <summary>
+	/// Sets the enumerator to its initial position, which is before the first element in the collection.
+	/// </summary>
+	public override void Reset()
+	{
+		Current = default;
 	}
+
+	/// <summary>
+	/// Processes the movement to the next element and determines whether iteration can continue.
+	/// </summary>
+	/// <param name="canProcess">A reference parameter indicating whether the enumerator can proceed; set to false if the end is reached.</param>
+	/// <returns>The next item in the collection, or the default value if no further items are available.</returns>
+	protected abstract TItem ProcessMove(ref bool canProcess);
 }
\ No newline at end of file
diff --git a/Collections/BaseList.cs b/Collections/BaseList.cs
index 378c1980..2d67faf4 100644
--- a/Collections/BaseList.cs
+++ b/Collections/BaseList.cs
@@ -1,60 +1,59 @@
-namespace Ecng.Collections
-{
-	using System;
-	using System.Collections.Generic;
+namespace Ecng.Collections;
+
+using System;
+using System.Collections.Generic;
 
+/// <summary>
+/// Represents a base class for a strongly-typed list of items.
+/// </summary>
+/// <typeparam name="TItem">The type of elements in the list.</typeparam>
+[Serializable]
+public abstract class BaseList<TItem>(IList<TItem> innerList) : BaseCollection<TItem, IList<TItem>>(innerList)
+{
 	/// <summary>
-	/// Represents a base class for a strongly-typed list of items.
+	/// Initializes a new instance of the <see cref="BaseList{TItem}"/> class with an empty inner list.
 	/// </summary>
-	/// <typeparam name="TItem">The type of elements in the list.</typeparam>
-	[Serializable]
-	public abstract class BaseList<TItem>(IList<TItem> innerList) : BaseCollection<TItem, IList<TItem>>(innerList)
+	protected BaseList()
+		: this([])
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="BaseList{TItem}"/> class with an empty inner list.
-		/// </summary>
-		protected BaseList()
-			: this([])
-		{
-		}
+	}
 
-		/// <summary>
-		/// Retrieves the item at the specified index from the inner list.
-		/// </summary>
-		/// <param name="index">The zero-based index of the item to retrieve.</param>
-		/// <returns>The item at the specified index.</returns>
-		protected override TItem OnGetItem(int index)
-		{
-			return InnerCollection[index];
-		}
+	/// <summary>
+	/// Retrieves the item at the specified index from the inner list.
+	/// </summary>
+	/// <param name="index">The zero-based index of the item to retrieve.</param>
+	/// <returns>The item at the specified index.</returns>
+	protected override TItem OnGetItem(int index)
+	{
+		return InnerCollection[index];
+	}
 
-		/// <summary>
-		/// Inserts an item into the inner list at the specified index.
-		/// </summary>
-		/// <param name="index">The zero-based index at which the item should be inserted.</param>
-		/// <param name="item">The item to insert into the list.</param>
-		protected override void OnInsert(int index, TItem item)
-		{
-			InnerCollection.Insert(index, item);
-		}
+	/// <summary>
+	/// Inserts an item into the inner list at the specified index.
+	/// </summary>
+	/// <param name="index">The zero-based index at which the item should be inserted.</param>
+	/// <param name="item">The item to insert into the list.</param>
+	protected override void OnInsert(int index, TItem item)
+	{
+		InnerCollection.Insert(index, item);
+	}
 
-		/// <summary>
-		/// Removes the item at the specified index from the inner list.
-		/// </summary>
-		/// <param name="index">The zero-based index of the item to remove.</param>
-		protected override void OnRemoveAt(int index)
-		{
-			InnerCollection.RemoveAt(index);
-		}
+	/// <summary>
+	/// Removes the item at the specified index from the inner list.
+	/// </summary>
+	/// <param name="index">The zero-based index of the item to remove.</param>
+	protected override void OnRemoveAt(int index)
+	{
+		InnerCollection.RemoveAt(index);
+	}
 
-		/// <summary>
-		/// Determines the index of a specific item in the inner list.
-		/// </summary>
-		/// <param name="item">The item to locate in the list.</param>
-		/// <returns>The index of the item if found in the list; otherwise, -1.</returns>
-		public override int IndexOf(TItem item)
-		{
-			return InnerCollection.IndexOf(item);
-		}
+	/// <summary>
+	/// Determines the index of a specific item in the inner list.
+	/// </summary>
+	/// <param name="item">The item to locate in the list.</param>
+	/// <returns>The index of the item if found in the list; otherwise, -1.</returns>
+	public override int IndexOf(TItem item)
+	{
+		return InnerCollection.IndexOf(item);
 	}
 }
\ No newline at end of file
diff --git a/Collections/BaseOrderedBlockingQueue.cs b/Collections/BaseOrderedBlockingQueue.cs
index 2f6d25cd..4cf3f8ef 100644
--- a/Collections/BaseOrderedBlockingQueue.cs
+++ b/Collections/BaseOrderedBlockingQueue.cs
@@ -1,64 +1,63 @@
-namespace Ecng.Collections
-{
-	using System.Collections.Generic;
+namespace Ecng.Collections;
+
+using System.Collections.Generic;
 
+/// <summary>
+/// Represents a base class for an ordered blocking queue that sorts elements based on a specified key.
+/// </summary>
+/// <typeparam name="TSort">The type used to determine the sort order of elements.</typeparam>
+/// <typeparam name="TValue">The type of the values stored in the queue.</typeparam>
+/// <typeparam name="TCollection">The type of the inner collection, which must implement <see cref="ICollection{T}"/> and <see cref="IQueue{T}"/> for tuples of <typeparamref name="TSort"/> and <typeparamref name="TValue"/>.</typeparam>
+public abstract class BaseOrderedBlockingQueue<TSort, TValue, TCollection>(TCollection collection) :
+	BaseBlockingQueue<(TSort sort, TValue elem), TCollection>(collection)
+	where TCollection : ICollection<(TSort, TValue)>, IQueue<(TSort, TValue)>
+{
 	/// <summary>
-	/// Represents a base class for an ordered blocking queue that sorts elements based on a specified key.
+	/// Attempts to remove and return the next value from the queue.
 	/// </summary>
-	/// <typeparam name="TSort">The type used to determine the sort order of elements.</typeparam>
-	/// <typeparam name="TValue">The type of the values stored in the queue.</typeparam>
-	/// <typeparam name="TCollection">The type of the inner collection, which must implement <see cref="ICollection{T}"/> and <see cref="IQueue{T}"/> for tuples of <typeparamref name="TSort"/> and <typeparamref name="TValue"/>.</typeparam>
-	public abstract class BaseOrderedBlockingQueue<TSort, TValue, TCollection>(TCollection collection) :
-		BaseBlockingQueue<(TSort sort, TValue elem), TCollection>(collection)
-		where TCollection : ICollection<(TSort, TValue)>, IQueue<(TSort, TValue)>
+	/// <param name="value">When this method returns, contains the dequeued value if successful; otherwise, the default value of <typeparamref name="TValue"/>.</param>
+	/// <param name="exitOnClose">If true, exits immediately if the queue is closed; otherwise, waits for an item.</param>
+	/// <param name="block">If true, blocks until an item is available; otherwise, returns immediately.</param>
+	/// <returns>True if a value was successfully dequeued; otherwise, false.</returns>
+	public bool TryDequeue(out TValue value, bool exitOnClose = true, bool block = true)
 	{
-		/// <summary>
-		/// Attempts to remove and return the next value from the queue.
-		/// </summary>
-		/// <param name="value">When this method returns, contains the dequeued value if successful; otherwise, the default value of <typeparamref name="TValue"/>.</param>
-		/// <param name="exitOnClose">If true, exits immediately if the queue is closed; otherwise, waits for an item.</param>
-		/// <param name="block">If true, blocks until an item is available; otherwise, returns immediately.</param>
-		/// <returns>True if a value was successfully dequeued; otherwise, false.</returns>
-		public bool TryDequeue(out TValue value, bool exitOnClose = true, bool block = true)
+		if (base.TryDequeue(out var pair, exitOnClose, block))
 		{
-			if (base.TryDequeue(out var pair, exitOnClose, block))
-			{
-				value = pair.elem;
-				return true;
-			}
-
-			value = default;
-			return false;
+			value = pair.elem;
+			return true;
 		}
 
-		/// <summary>
-		/// Adds a new value to the queue with the specified sort order.
-		/// </summary>
-		/// <param name="sort">The sort key determining the order of the value in the queue.</param>
-		/// <param name="value">The value to add to the queue.</param>
-		protected void Enqueue(TSort sort, TValue value)
-			=> Enqueue(new(sort, value));
+		value = default;
+		return false;
+	}
 
-		/// <summary>
-		/// Adds an item to the inner collection when enqueuing.
-		/// </summary>
-		/// <param name="item">The tuple containing the sort key and value to enqueue.</param>
-		/// <param name="force">If true, forces the item to be enqueued even if the queue is full; otherwise, respects the maximum size limit.</param>
-		protected override void OnEnqueue((TSort, TValue) item, bool force)
-			=> InnerCollection.Enqueue(item);
+	/// <summary>
+	/// Adds a new value to the queue with the specified sort order.
+	/// </summary>
+	/// <param name="sort">The sort key determining the order of the value in the queue.</param>
+	/// <param name="value">The value to add to the queue.</param>
+	protected void Enqueue(TSort sort, TValue value)
+		=> Enqueue(new(sort, value));
 
-		/// <summary>
-		/// Removes and returns the next item from the inner collection.
-		/// </summary>
-		/// <returns>The tuple containing the sort key and value of the dequeued item.</returns>
-		protected override (TSort, TValue) OnDequeue()
-			=> InnerCollection.Dequeue();
+	/// <summary>
+	/// Adds an item to the inner collection when enqueuing.
+	/// </summary>
+	/// <param name="item">The tuple containing the sort key and value to enqueue.</param>
+	/// <param name="force">If true, forces the item to be enqueued even if the queue is full; otherwise, respects the maximum size limit.</param>
+	protected override void OnEnqueue((TSort, TValue) item, bool force)
+		=> InnerCollection.Enqueue(item);
 
-		/// <summary>
-		/// Retrieves, but does not remove, the next item from the inner collection.
-		/// </summary>
-		/// <returns>The tuple containing the sort key and value of the item at the head of the queue.</returns>
-		protected override (TSort, TValue) OnPeek()
-			=> InnerCollection.Peek();
-	}
+	/// <summary>
+	/// Removes and returns the next item from the inner collection.
+	/// </summary>
+	/// <returns>The tuple containing the sort key and value of the dequeued item.</returns>
+	protected override (TSort, TValue) OnDequeue()
+		=> InnerCollection.Dequeue();
+
+	/// <summary>
+	/// Retrieves, but does not remove, the next item from the inner collection.
+	/// </summary>
+	/// <returns>The tuple containing the sort key and value of the item at the head of the queue.</returns>
+	protected override (TSort, TValue) OnPeek()
+		=> InnerCollection.Peek();
 }
\ No newline at end of file
diff --git a/Collections/BitArrayReader.cs b/Collections/BitArrayReader.cs
index 1bef2adc..30a6f688 100644
--- a/Collections/BitArrayReader.cs
+++ b/Collections/BitArrayReader.cs
@@ -1,169 +1,256 @@
-namespace Ecng.Collections
-{
-	using System;
-	using System.IO;
+namespace Ecng.Collections;
+
+using System;
+using System.IO;
 
-	using Ecng.Common;
+using Ecng.Common;
+
+/// <summary>
+/// Provides a reader for bit-level data from a stream.
+/// </summary>
+public class BitArrayReader
+{
+	private int _bitOffset;
+	private long _dataOffset;
+	private readonly ulong[] _data;
+	private readonly Stream _underlyingStream;
 
 	/// <summary>
-	/// Provides a reader for bit-level data from a stream.
+	/// Initializes a new instance of the <see cref="BitArrayReader"/> class with the specified underlying stream.
 	/// </summary>
-	public class BitArrayReader
+	/// <param name="underlyingStream">The stream to read bit-level data from.</param>
+	/// <exception cref="ArgumentNullException">Thrown if <paramref name="underlyingStream"/> is null.</exception>
+	public BitArrayReader(Stream underlyingStream)
 	{
-		private int _bitOffset;
-		private long _dataOffset;
-		private readonly ulong[] _data;
-		private readonly Stream _underlyingStream;
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="BitArrayReader"/> class with the specified underlying stream.
-		/// </summary>
-		/// <param name="underlyingStream">The stream to read bit-level data from.</param>
-		/// <exception cref="ArgumentNullException">Thrown if <paramref name="underlyingStream"/> is null.</exception>
-		public BitArrayReader(Stream underlyingStream)
-		{
-			_underlyingStream = underlyingStream ?? throw new ArgumentNullException(nameof(underlyingStream));
+		_underlyingStream = underlyingStream ?? throw new ArgumentNullException(nameof(underlyingStream));
 
-			// TODO
-			var bytes = underlyingStream.To<byte[]>();
+		// TODO
+		var bytes = underlyingStream.To<byte[]>();
 
-			_data = new ulong[bytes.Length / 8 + 2];
-			Buffer.BlockCopy(bytes, 0, _data, 0, bytes.Length);
-		}
+		_data = new ulong[bytes.Length / 8 + 2];
+		Buffer.BlockCopy(bytes, 0, _data, 0, bytes.Length);
+	}
 
-		/// <summary>
-		/// Gets or sets the current bit offset within the stream.
-		/// </summary>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown if the value is negative.</exception>
-		public long Offset
-		{
+	/// <summary>
+	/// Gets or sets the current bit offset within the stream.
+	/// </summary>
+	/// <exception cref="ArgumentOutOfRangeException">Thrown if the value is negative.</exception>
+	public long Offset
+	{
 #pragma warning disable CS0675 // Bitwise-or operator used on a sign-extended operand
-			get => (_dataOffset << 6) | _bitOffset;
+		get => (_dataOffset << 6) | _bitOffset;
 #pragma warning restore CS0675 // Bitwise-or operator used on a sign-extended operand
-			set
-			{
-				if (value < 0)// || value >= _bits.Length)
-					throw new ArgumentOutOfRangeException(nameof(value));
+		set
+		{
+			if (value < 0)// || value >= _bits.Length)
+				throw new ArgumentOutOfRangeException(nameof(value));
 
-				_dataOffset = value >> 6;
-				_bitOffset = (int)(value & 63);
-			}
+			_dataOffset = value >> 6;
+			_bitOffset = (int)(value & 63);
 		}
+	}
 
-		/// <summary>
-		/// Retrieves the 64-bit value at the specified offset.
-		/// </summary>
-		/// <param name="offset">The offset to read from.</param>
-		/// <returns>The 64-bit value at the specified offset.</returns>
-		private ulong Get(long offset)
+	/// <summary>
+	/// Retrieves the 64-bit value at the specified offset.
+	/// </summary>
+	/// <param name="offset">The offset to read from.</param>
+	/// <returns>The 64-bit value at the specified offset.</returns>
+	private ulong Get(long offset)
+	{
+		return _data[offset];
+	}
+
+	/// <summary>
+	/// Reads a single bit from the stream.
+	/// </summary>
+	/// <returns>The value of the bit read.</returns>
+	public bool Read()
+	{
+		var b = Get(_dataOffset);
+
+		var value = ((b >> _bitOffset) & 1) != 0;
+
+		if (_bitOffset == 63)
 		{
-			return _data[offset];
+			_bitOffset = 0;
+			_dataOffset++;
 		}
+		else
+			_bitOffset++;
 
-		/// <summary>
-		/// Reads a single bit from the stream.
-		/// </summary>
-		/// <returns>The value of the bit read.</returns>
-		public bool Read()
-		{
-			var b = Get(_dataOffset);
+		return value;
+	}
 
-			var value = ((b >> _bitOffset) & 1) != 0;
+	/// <summary>
+	/// Reads an array of bits from the stream.
+	/// </summary>
+	/// <param name="count">The number of bits to read.</param>
+	/// <returns>An array of boolean values representing the bits read.</returns>
+	public bool[] ReadArray(int count)
+	{
+		var retVal = new bool[count];
 
-			if (_bitOffset == 63)
-			{
-				_bitOffset = 0;
-				_dataOffset++;
-			}
-			else
-				_bitOffset++;
+		for (var i = 0; i < count; i++)
+			retVal[i] = Read();
 
-			return value;
-		}
+		return retVal;
+	}
 
-		/// <summary>
-		/// Reads an array of bits from the stream.
-		/// </summary>
-		/// <param name="count">The number of bits to read.</param>
-		/// <returns>An array of boolean values representing the bits read.</returns>
-		public bool[] ReadArray(int count)
-		{
-			var retVal = new bool[count];
+	/// <summary>
+	/// Reads a specified number of bits from the stream as an integer.
+	/// </summary>
+	/// <param name="count">The number of bits to read.</param>
+	/// <returns>The integer value represented by the bits read.</returns>
+	/// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="count"/> is invalid.</exception>
+	public int Read(int count)
+	{
+		return (int)ReadLong(count);
+	}
 
-			for (var i = 0; i < count; i++)
-				retVal[i] = Read();
+	/// <summary>
+	/// Moves the current bit offset by the specified number of bits.
+	/// </summary>
+	/// <param name="offset">The number of bits to move the offset by.</param>
+	public void Seek(int offset)
+	{
+		var newOffset = _bitOffset + offset;
+		_dataOffset += newOffset >> 6;
+		_bitOffset = newOffset & 63;
+	}
 
-			return retVal;
-		}
+	/// <summary>
+	/// Reads a specified number of bits from the stream as a long integer.
+	/// </summary>
+	/// <param name="count">The number of bits to read.</param>
+	/// <returns>The long integer value represented by the bits read.</returns>
+	/// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="count"/> is invalid.</exception>
+	public long ReadLong(int count)
+	{
+		if (count <= 0 || count > 64)
+			throw new ArgumentOutOfRangeException(nameof(count), count, "Invalid count value.");
+
+		var bitOffset = _bitOffset;
+
+		var value = Get(_dataOffset) >> bitOffset;
+
+		var shift = 64 - bitOffset;
+		if (shift < count)
+			value |= Get(_dataOffset + 1) << shift;
+
+		bitOffset += count;
+		_dataOffset += bitOffset >> 6;
+		_bitOffset = bitOffset & 63;
+
+		value &= ulong.MaxValue >> (64 - count);
+
+		return (long)value;
+	}
+
+	/// <summary>
+	/// Reads an integer value from the stream using a variable-length encoding.
+	/// </summary>
+	/// <returns>The integer value read from the stream.</returns>
+	public int ReadInt()
+	{
+		var bits = Get(_dataOffset);
+		var bitOffset = _bitOffset;
 
-		/// <summary>
-		/// Reads a specified number of bits from the stream as an integer.
-		/// </summary>
-		/// <param name="count">The number of bits to read.</param>
-		/// <returns>The integer value represented by the bits read.</returns>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="count"/> is invalid.</exception>
-		public int Read(int count)
+		bits >>= bitOffset;
+
+		if (bitOffset > 0)
+			bits |= Get(_dataOffset + 1) << (64 - bitOffset); // честные 64 бита в битс
+
+		var value = 0;
+
+		int seek;
+
+		if ((bits & 1) == 0)
 		{
-			return (int)ReadLong(count);
+			seek = 1;
 		}
-
-		/// <summary>
-		/// Moves the current bit offset by the specified number of bits.
-		/// </summary>
-		/// <param name="offset">The number of bits to move the offset by.</param>
-		public void Seek(int offset)
+		else if ((bits & 4) == 0)
 		{
-			var newOffset = _bitOffset + offset;
-			_dataOffset += newOffset >> 6;
-			_bitOffset = newOffset & 63;
+			seek = 3;
+			value = 1;
 		}
-
-		/// <summary>
-		/// Reads a specified number of bits from the stream as a long integer.
-		/// </summary>
-		/// <param name="count">The number of bits to read.</param>
-		/// <returns>The long integer value represented by the bits read.</returns>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="count"/> is invalid.</exception>
-		public long ReadLong(int count)
+		else if ((bits & 8) == 0)
 		{
-			if (count <= 0 || count > 64)
-				throw new ArgumentOutOfRangeException(nameof(count), count, "Invalid count value.");
-
-			var bitOffset = _bitOffset;
+			seek = 4 + 4;
+			value = ((int)(uint.MaxValue >> (32 - 4))) & (int)(bits >> 4);
+		}
+		else if ((bits & 16) == 0)
+		{
+			seek = 5 + 8;
+			value = ((int)(uint.MaxValue >> (32 - 8))) & (int)(bits >> 5);
+		}
+		else if ((bits & 32) == 0)
+		{
+			seek = 6 + 16;
+			value = ((int)(uint.MaxValue >> (32 - 16))) & (int)(bits >> 6);
+		}
+		else if ((bits & 64) == 0)
+		{
+			seek = 7 + 24;
+			value = ((int)(uint.MaxValue >> (32 - 24))) & (int)(bits >> 7);
+		}
+		else
+		{
+			seek = 7 + 32;
+			value = (int)(bits >> 7);
+		}
 
-			var value = Get(_dataOffset) >> bitOffset;
+		value = (bits & 2) != 0 ? value : -value;
 
-			var shift = 64 - bitOffset;
-			if (shift < count)
-				value |= Get(_dataOffset + 1) << shift;
+		bitOffset += seek;
+		_dataOffset += (bitOffset >> 6);
+		_bitOffset = bitOffset & 63;
 
-			bitOffset += count;
-			_dataOffset += bitOffset >> 6;
-			_bitOffset = bitOffset & 63;
+		return value;
+	}
 
-			value &= ulong.MaxValue >> (64 - count);
+	/// <summary>
+	/// Reads a long integer value from the stream using a variable-length encoding.
+	/// </summary>
+	/// <returns>The long integer value read from the stream.</returns>
+	public long ReadLong()
+	{
+		var offset = _dataOffset;
+		var bitOffset = _bitOffset;
+		var bits = Get(offset) >> bitOffset;
 
-			return (long)value;
-		}
+		if (bitOffset > 0)
+			bits |= Get(offset + 1) << (64 - bitOffset);
 
-		/// <summary>
-		/// Reads an integer value from the stream using a variable-length encoding.
-		/// </summary>
-		/// <returns>The integer value read from the stream.</returns>
-		public int ReadInt()
+		long value;
+		if ((bits & 1) != 0)
 		{
-			var bits = Get(_dataOffset);
-			var bitOffset = _bitOffset;
+			var isPositive = (bits & 2) != 0;
+
+			bitOffset += 2;
 
-			bits >>= bitOffset;
+			offset += bitOffset >> 6;
+			bitOffset &= 63;
+			bits = Get(offset) >> bitOffset;
 
 			if (bitOffset > 0)
-				bits |= Get(_dataOffset + 1) << (64 - bitOffset); // честные 64 бита в битс
+				bits |= Get(offset + 1) << (64 - bitOffset);
+
+			bitOffset += 63;
 
-			var value = 0;
+			value = (long)(bits & (ulong.MaxValue >> (64 - 63)));
+
+			if (!isPositive)
+				value = -value;
+		}
+		else
+		{
+			bitOffset += 1;
+			bits >>= 1;
 
 			int seek;
 
+			value = 0;
+
 			if ((bits & 1) == 0)
 			{
 				seek = 1;
@@ -200,122 +287,34 @@ public int ReadInt()
 			}
 
 			value = (bits & 2) != 0 ? value : -value;
-
 			bitOffset += seek;
-			_dataOffset += (bitOffset >> 6);
-			_bitOffset = bitOffset & 63;
-
-			return value;
 		}
 
-		/// <summary>
-		/// Reads a long integer value from the stream using a variable-length encoding.
-		/// </summary>
-		/// <returns>The long integer value read from the stream.</returns>
-		public long ReadLong()
-		{
-			var offset = _dataOffset;
-			var bitOffset = _bitOffset;
-			var bits = Get(offset) >> bitOffset;
-
-			if (bitOffset > 0)
-				bits |= Get(offset + 1) << (64 - bitOffset);
+		offset += bitOffset >> 6;
+		bitOffset &= 63;
+		_dataOffset = offset;
+		_bitOffset = bitOffset;
 
-			long value;
-			if ((bits & 1) != 0)
-			{
-				var isPositive = (bits & 2) != 0;
-
-				bitOffset += 2;
-
-				offset += bitOffset >> 6;
-				bitOffset &= 63;
-				bits = Get(offset) >> bitOffset;
-
-				if (bitOffset > 0)
-					bits |= Get(offset + 1) << (64 - bitOffset);
-
-				bitOffset += 63;
-
-				value = (long)(bits & (ulong.MaxValue >> (64 - 63)));
-
-				if (!isPositive)
-					value = -value;
-			}
-			else
-			{
-				bitOffset += 1;
-				bits >>= 1;
-
-				int seek;
-
-				value = 0;
-
-				if ((bits & 1) == 0)
-				{
-					seek = 1;
-				}
-				else if ((bits & 4) == 0)
-				{
-					seek = 3;
-					value = 1;
-				}
-				else if ((bits & 8) == 0)
-				{
-					seek = 4 + 4;
-					value = ((int)(uint.MaxValue >> (32 - 4))) & (int)(bits >> 4);
-				}
-				else if ((bits & 16) == 0)
-				{
-					seek = 5 + 8;
-					value = ((int)(uint.MaxValue >> (32 - 8))) & (int)(bits >> 5);
-				}
-				else if ((bits & 32) == 0)
-				{
-					seek = 6 + 16;
-					value = ((int)(uint.MaxValue >> (32 - 16))) & (int)(bits >> 6);
-				}
-				else if ((bits & 64) == 0)
-				{
-					seek = 7 + 24;
-					value = ((int)(uint.MaxValue >> (32 - 24))) & (int)(bits >> 7);
-				}
-				else
-				{
-					seek = 7 + 32;
-					value = (int)(bits >> 7);
-				}
-
-				value = (bits & 2) != 0 ? value : -value;
-				bitOffset += seek;
-			}
-
-			offset += bitOffset >> 6;
-			bitOffset &= 63;
-			_dataOffset = offset;
-			_bitOffset = bitOffset;
-
-			return value;
-		}
+		return value;
+	}
 
-		/// <summary>
-		/// Reads a decimal value from the stream.
-		/// </summary>
-		/// <returns>The decimal value read from the stream.</returns>
-		public decimal ReadDecimal()
-		{
-			var isPos = Read();
+	/// <summary>
+	/// Reads a decimal value from the stream.
+	/// </summary>
+	/// <returns>The decimal value read from the stream.</returns>
+	public decimal ReadDecimal()
+	{
+		var isPos = Read();
 
-			var i1 = ReadInt();
-			var i2 = ReadInt();
-			var i3 = ReadInt();
-			var i4 = ReadInt() << 16;
-			var dec = new[] { i1, i2, i3, i4 }.To<decimal>();
+		var i1 = ReadInt();
+		var i2 = ReadInt();
+		var i3 = ReadInt();
+		var i4 = ReadInt() << 16;
+		var dec = new[] { i1, i2, i3, i4 }.To<decimal>();
 
-			if (!isPos)
-				dec = -dec;
+		if (!isPos)
+			dec = -dec;
 
-			return dec;
-		}
+		return dec;
 	}
 }
\ No newline at end of file
diff --git a/Collections/BitArrayWriter.cs b/Collections/BitArrayWriter.cs
index 7825d5f2..db4d25b8 100644
--- a/Collections/BitArrayWriter.cs
+++ b/Collections/BitArrayWriter.cs
@@ -1,187 +1,186 @@
-namespace Ecng.Collections
-{
-	using System;
-	using System.IO;
+namespace Ecng.Collections;
+
+using System;
+using System.IO;
 
-	using Ecng.Common;
+using Ecng.Common;
+
+/// <summary>
+/// Provides a writer for bit-level data to a stream.
+/// </summary>
+public class BitArrayWriter(Stream underlyingStream) : Disposable
+{
+	private readonly Stream _underlyingStream = underlyingStream ?? throw new ArgumentNullException(nameof(underlyingStream));
+	private int _temp;
+	private int _bitOffset;
 
 	/// <summary>
-	/// Provides a writer for bit-level data to a stream.
+	/// Flushes the current byte to the underlying stream and resets the buffer.
 	/// </summary>
-	public class BitArrayWriter(Stream underlyingStream) : Disposable
+	private void Flush()
 	{
-		private readonly Stream _underlyingStream = underlyingStream ?? throw new ArgumentNullException(nameof(underlyingStream));
-		private int _temp;
-		private int _bitOffset;
-
-		/// <summary>
-		/// Flushes the current byte to the underlying stream and resets the buffer.
-		/// </summary>
-		private void Flush()
-		{
-			_underlyingStream.WriteByte((byte)_temp);
-			_temp = 0;
-			_bitOffset = 0;
-		}
+		_underlyingStream.WriteByte((byte)_temp);
+		_temp = 0;
+		_bitOffset = 0;
+	}
 
-		/// <summary>
-		/// Disposes the writer, ensuring any remaining bits are flushed to the stream.
-		/// </summary>
-		protected override void DisposeManaged()
-		{
-			if (_bitOffset > 0)
-				Flush();
+	/// <summary>
+	/// Disposes the writer, ensuring any remaining bits are flushed to the stream.
+	/// </summary>
+	protected override void DisposeManaged()
+	{
+		if (_bitOffset > 0)
+			Flush();
 
-			base.DisposeManaged();
-		}
+		base.DisposeManaged();
+	}
 
-		/// <summary>
-		/// Writes a single bit to the stream.
-		/// </summary>
-		/// <param name="bit">The bit to write.</param>
-		public void Write(bool bit)
-		{
-			_temp |= ((bit ? 1 : 0) << _bitOffset);
+	/// <summary>
+	/// Writes a single bit to the stream.
+	/// </summary>
+	/// <param name="bit">The bit to write.</param>
+	public void Write(bool bit)
+	{
+		_temp |= ((bit ? 1 : 0) << _bitOffset);
 
-			_bitOffset++;
+		_bitOffset++;
 
-			if (_bitOffset < 8)
-				return;
+		if (_bitOffset < 8)
+			return;
 
-			Flush();
-		}
+		Flush();
+	}
 
-		/// <summary>
-		/// Writes an integer value to the stream using a variable-length encoding.
-		/// </summary>
-		/// <param name="value">The integer value to write.</param>
-		public void WriteInt(int value)
+	/// <summary>
+	/// Writes an integer value to the stream using a variable-length encoding.
+	/// </summary>
+	/// <param name="value">The integer value to write.</param>
+	public void WriteInt(int value)
+	{
+		if (value == 0)
+			Write(false);
+		else
 		{
-			if (value == 0)
+			Write(true);
+
+			if (value < 0)
+			{
+				value = -value;
+				Write(false);
+			}
+			else
+				Write(true);
+
+			if (value == 1)
 				Write(false);
 			else
 			{
 				Write(true);
 
-				if (value < 0)
+				if (value < 16)
 				{
-					value = -value;
 					Write(false);
+					WriteBits(value, 4);
 				}
-				else
-					Write(true);
-
-				if (value == 1)
-					Write(false);
 				else
 				{
 					Write(true);
 
-					if (value < 16)
+					if (value <= byte.MaxValue)
 					{
 						Write(false);
-						WriteBits(value, 4);
+						WriteBits(value, 8);
 					}
 					else
 					{
 						Write(true);
 
-						if (value <= byte.MaxValue)
+						if (value <= ushort.MaxValue)
 						{
 							Write(false);
-							WriteBits(value, 8);
+							WriteBits(value, 16);
 						}
 						else
 						{
 							Write(true);
 
-							if (value <= ushort.MaxValue)
+							if (value <= 16777216) // 24 bits
 							{
 								Write(false);
-								WriteBits(value, 16);
+								WriteBits(value, 24);
 							}
 							else
 							{
 								Write(true);
-
-								if (value <= 16777216) // 24 bits
-								{
-									Write(false);
-									WriteBits(value, 24);
-								}
-								else
-								{
-									Write(true);
-									WriteBits(value, 32);
-								}
+								WriteBits(value, 32);
 							}
 						}
 					}
 				}
 			}
 		}
+	}
 
-		/// <summary>
-		/// Writes a long integer value to the stream using a variable-length encoding.
-		/// </summary>
-		/// <param name="value">The long integer value to write.</param>
-		public void WriteLong(long value)
+	/// <summary>
+	/// Writes a long integer value to the stream using a variable-length encoding.
+	/// </summary>
+	/// <param name="value">The long integer value to write.</param>
+	public void WriteLong(long value)
+	{
+		if (value.Abs() > int.MaxValue)
 		{
-			if (value.Abs() > int.MaxValue)
-			{
-				Write(true);
-				Write(value >= 0);
-				WriteBits(value.Abs(), 63);
-			}
-			else
-			{
-				Write(false);
-				WriteInt((int)value);
-			}
+			Write(true);
+			Write(value >= 0);
+			WriteBits(value.Abs(), 63);
 		}
-
-		/// <summary>
-		/// Writes a specified number of bits from an integer value to the stream.
-		/// </summary>
-		/// <param name="value">The integer value to write.</param>
-		/// <param name="bitCount">The number of bits to write.</param>
-		public void WriteBits(int value, int bitCount)
+		else
 		{
-			for (var i = 0; i < bitCount; i++)
-				Write((value & (1 << i)) != 0);
+			Write(false);
+			WriteInt((int)value);
 		}
+	}
 
-		/// <summary>
-		/// Writes a specified number of bits from a long integer value to the stream.
-		/// </summary>
-		/// <param name="value">The long integer value to write.</param>
-		/// <param name="bitCount">The number of bits to write.</param>
-		public void WriteBits(long value, int bitCount)
-		{
-			for (var i = 0; i < bitCount; i++)
-				Write((value & (1L << i)) != 0);
-		}
+	/// <summary>
+	/// Writes a specified number of bits from an integer value to the stream.
+	/// </summary>
+	/// <param name="value">The integer value to write.</param>
+	/// <param name="bitCount">The number of bits to write.</param>
+	public void WriteBits(int value, int bitCount)
+	{
+		for (var i = 0; i < bitCount; i++)
+			Write((value & (1 << i)) != 0);
+	}
 
-		/// <summary>
-		/// Writes a decimal value to the stream.
-		/// </summary>
-		/// <param name="value">The decimal value to write.</param>
-		public void WriteDecimal(decimal value)
-		{
-			if (value < 0)
-			{
-				value = -value;
-				Write(false);
-			}
-			else
-				Write(true);
-			
-			var bits = value.To<int[]>();
+	/// <summary>
+	/// Writes a specified number of bits from a long integer value to the stream.
+	/// </summary>
+	/// <param name="value">The long integer value to write.</param>
+	/// <param name="bitCount">The number of bits to write.</param>
+	public void WriteBits(long value, int bitCount)
+	{
+		for (var i = 0; i < bitCount; i++)
+			Write((value & (1L << i)) != 0);
+	}
 
-			WriteInt(bits[0]);
-			WriteInt(bits[1]);
-			WriteInt(bits[2]);
-			WriteInt((bits[3] >> 16) & 0xff);
+	/// <summary>
+	/// Writes a decimal value to the stream.
+	/// </summary>
+	/// <param name="value">The decimal value to write.</param>
+	public void WriteDecimal(decimal value)
+	{
+		if (value < 0)
+		{
+			value = -value;
+			Write(false);
 		}
+		else
+			Write(true);
+		
+		var bits = value.To<int[]>();
+
+		WriteInt(bits[0]);
+		WriteInt(bits[1]);
+		WriteInt(bits[2]);
+		WriteInt((bits[3] >> 16) & 0xff);
 	}
 }
\ No newline at end of file
diff --git a/Collections/BlockingQueue.cs b/Collections/BlockingQueue.cs
index 2342c758..9f5b0d88 100644
--- a/Collections/BlockingQueue.cs
+++ b/Collections/BlockingQueue.cs
@@ -1,45 +1,44 @@
-namespace Ecng.Collections
+namespace Ecng.Collections;
+
+/// <summary>
+/// Represents a thread-safe blocking queue implementation for storing and retrieving items of type <typeparamref name="T"/>.
+/// </summary>
+/// <typeparam name="T">The type of elements in the queue.</typeparam>
+public sealed class BlockingQueue<T> : BaseBlockingQueue<T, QueueEx<T>>
 {
 	/// <summary>
-	/// Represents a thread-safe blocking queue implementation for storing and retrieving items of type <typeparamref name="T"/>.
+	/// Initializes a new instance of the <see cref="BlockingQueue{T}"/> class with an empty underlying queue.
 	/// </summary>
-	/// <typeparam name="T">The type of elements in the queue.</typeparam>
-	public sealed class BlockingQueue<T> : BaseBlockingQueue<T, QueueEx<T>>
+	public BlockingQueue()
+		: base(new QueueEx<T>())
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="BlockingQueue{T}"/> class with an empty underlying queue.
-		/// </summary>
-		public BlockingQueue()
-			: base(new QueueEx<T>())
-		{
-		}
+	}
 
-		/// <summary>
-		/// Adds an item to the underlying queue.
-		/// </summary>
-		/// <param name="item">The item to enqueue.</param>
-		/// <param name="force">If true, forces the item to be enqueued even if the queue is full; otherwise, respects the maximum size limit.</param>
-		protected override void OnEnqueue(T item, bool force)
-		{
-			InnerCollection.Enqueue(item);
-		}
+	/// <summary>
+	/// Adds an item to the underlying queue.
+	/// </summary>
+	/// <param name="item">The item to enqueue.</param>
+	/// <param name="force">If true, forces the item to be enqueued even if the queue is full; otherwise, respects the maximum size limit.</param>
+	protected override void OnEnqueue(T item, bool force)
+	{
+		InnerCollection.Enqueue(item);
+	}
 
-		/// <summary>
-		/// Removes and returns the item at the head of the underlying queue.
-		/// </summary>
-		/// <returns>The dequeued item.</returns>
-		protected override T OnDequeue()
-		{
-			return InnerCollection.Dequeue();
-		}
+	/// <summary>
+	/// Removes and returns the item at the head of the underlying queue.
+	/// </summary>
+	/// <returns>The dequeued item.</returns>
+	protected override T OnDequeue()
+	{
+		return InnerCollection.Dequeue();
+	}
 
-		/// <summary>
-		/// Retrieves, but does not remove, the item at the head of the underlying queue.
-		/// </summary>
-		/// <returns>The item at the head of the queue.</returns>
-		protected override T OnPeek()
-		{
-			return InnerCollection.Peek();
-		}
+	/// <summary>
+	/// Retrieves, but does not remove, the item at the head of the underlying queue.
+	/// </summary>
+	/// <returns>The item at the head of the queue.</returns>
+	protected override T OnPeek()
+	{
+		return InnerCollection.Peek();
 	}
 }
\ No newline at end of file
diff --git a/Collections/CachedSynchronizedDictionary.cs b/Collections/CachedSynchronizedDictionary.cs
index a42e1424..d30b9424 100644
--- a/Collections/CachedSynchronizedDictionary.cs
+++ b/Collections/CachedSynchronizedDictionary.cs
@@ -1,180 +1,179 @@
-namespace Ecng.Collections
-{
-	using System.Collections.Generic;
+namespace Ecng.Collections;
+
+using System.Collections.Generic;
 
+/// <summary>
+/// Represents a thread-safe dictionary with cached keys, values, and key-value pairs for improved performance.
+/// </summary>
+/// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
+/// <typeparam name="TValue">The type of values in the dictionary.</typeparam>
+public class CachedSynchronizedDictionary<TKey, TValue> : SynchronizedDictionary<TKey, TValue>
+{
 	/// <summary>
-	/// Represents a thread-safe dictionary with cached keys, values, and key-value pairs for improved performance.
+	/// Initializes a new instance of the <see cref="CachedSynchronizedDictionary{TKey, TValue}"/> class.
 	/// </summary>
-	/// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
-	/// <typeparam name="TValue">The type of values in the dictionary.</typeparam>
-	public class CachedSynchronizedDictionary<TKey, TValue> : SynchronizedDictionary<TKey, TValue>
+	public CachedSynchronizedDictionary()
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="CachedSynchronizedDictionary{TKey, TValue}"/> class.
-		/// </summary>
-		public CachedSynchronizedDictionary()
-		{
-		}
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="CachedSynchronizedDictionary{TKey, TValue}"/> class with the specified initial capacity.
-		/// </summary>
-		/// <param name="capacity">The initial number of elements that the dictionary can contain.</param>
-		public CachedSynchronizedDictionary(int capacity)
-			: base(capacity)
-		{
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="CachedSynchronizedDictionary{TKey, TValue}"/> class with the specified initial capacity.
+	/// </summary>
+	/// <param name="capacity">The initial number of elements that the dictionary can contain.</param>
+	public CachedSynchronizedDictionary(int capacity)
+		: base(capacity)
+	{
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="CachedSynchronizedDictionary{TKey, TValue}"/> class with the specified equality comparer.
-		/// </summary>
-		/// <param name="comparer">The equality comparer to use when comparing keys.</param>
-		public CachedSynchronizedDictionary(IEqualityComparer<TKey> comparer)
-			: base(comparer)
-		{
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="CachedSynchronizedDictionary{TKey, TValue}"/> class with the specified equality comparer.
+	/// </summary>
+	/// <param name="comparer">The equality comparer to use when comparing keys.</param>
+	public CachedSynchronizedDictionary(IEqualityComparer<TKey> comparer)
+		: base(comparer)
+	{
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="CachedSynchronizedDictionary{TKey, TValue}"/> class with the specified initial capacity and equality comparer.
-		/// </summary>
-		/// <param name="capacity">The initial number of elements that the dictionary can contain.</param>
-		/// <param name="comparer">The equality comparer to use when comparing keys.</param>
-		public CachedSynchronizedDictionary(int capacity, IEqualityComparer<TKey> comparer)
-			: base(capacity, comparer)
-		{
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="CachedSynchronizedDictionary{TKey, TValue}"/> class with the specified initial capacity and equality comparer.
+	/// </summary>
+	/// <param name="capacity">The initial number of elements that the dictionary can contain.</param>
+	/// <param name="comparer">The equality comparer to use when comparing keys.</param>
+	public CachedSynchronizedDictionary(int capacity, IEqualityComparer<TKey> comparer)
+		: base(capacity, comparer)
+	{
+	}
 
-		private TKey[] _cachedKeys;
+	private TKey[] _cachedKeys;
 
-		/// <summary>
-		/// Gets an array of cached keys from the dictionary.
-		/// </summary>
-		/// <remarks>
-		/// The keys are cached for performance and are reset when the dictionary is modified.
-		/// </remarks>
-		public TKey[] CachedKeys
+	/// <summary>
+	/// Gets an array of cached keys from the dictionary.
+	/// </summary>
+	/// <remarks>
+	/// The keys are cached for performance and are reset when the dictionary is modified.
+	/// </remarks>
+	public TKey[] CachedKeys
+	{
+		get
 		{
-			get
-			{
-				lock (SyncRoot)
-					return _cachedKeys ??= [.. Keys];
-			}
+			lock (SyncRoot)
+				return _cachedKeys ??= [.. Keys];
 		}
+	}
 
-		private TValue[] _cachedValues;
+	private TValue[] _cachedValues;
 
-		/// <summary>
-		/// Gets an array of cached values from the dictionary.
-		/// </summary>
-		/// <remarks>
-		/// The values are cached for performance and are reset when the dictionary is modified.
-		/// </remarks>
-		public TValue[] CachedValues
+	/// <summary>
+	/// Gets an array of cached values from the dictionary.
+	/// </summary>
+	/// <remarks>
+	/// The values are cached for performance and are reset when the dictionary is modified.
+	/// </remarks>
+	public TValue[] CachedValues
+	{
+		get
 		{
-			get
-			{
-				lock (SyncRoot)
-					return _cachedValues ??= [.. Values];
-			}
+			lock (SyncRoot)
+				return _cachedValues ??= [.. Values];
 		}
+	}
 
-		private KeyValuePair<TKey, TValue>[] _cachedPairs;
+	private KeyValuePair<TKey, TValue>[] _cachedPairs;
 
-		/// <summary>
-		/// Gets an array of cached key-value pairs from the dictionary.
-		/// </summary>
-		/// <remarks>
-		/// The key-value pairs are cached for performance and are reset when the dictionary is modified.
-		/// </remarks>
-		public KeyValuePair<TKey, TValue>[] CachedPairs
+	/// <summary>
+	/// Gets an array of cached key-value pairs from the dictionary.
+	/// </summary>
+	/// <remarks>
+	/// The key-value pairs are cached for performance and are reset when the dictionary is modified.
+	/// </remarks>
+	public KeyValuePair<TKey, TValue>[] CachedPairs
+	{
+		get
 		{
-			get
-			{
-				lock (SyncRoot)
-					return _cachedPairs ??= [.. this];
-			}
+			lock (SyncRoot)
+				return _cachedPairs ??= [.. this];
 		}
+	}
 
-		/// <summary>
-		/// Gets or sets the value associated with the specified key.
-		/// </summary>
-		/// <param name="key">The key of the value to get or set.</param>
-		/// <returns>The value associated with the specified key.</returns>
-		public override TValue this[TKey key]
+	/// <summary>
+	/// Gets or sets the value associated with the specified key.
+	/// </summary>
+	/// <param name="key">The key of the value to get or set.</param>
+	/// <returns>The value associated with the specified key.</returns>
+	public override TValue this[TKey key]
+	{
+		set
 		{
-			set
+			lock (SyncRoot)
 			{
-				lock (SyncRoot)
-				{
-					var isKey = false;
+				var isKey = false;
 
-					if (_cachedKeys != null && !ContainsKey(key))
-						isKey = true;
+				if (_cachedKeys != null && !ContainsKey(key))
+					isKey = true;
 
-					OnResetCache(isKey);
+				OnResetCache(isKey);
 
-					base[key] = value;
-				}
+				base[key] = value;
 			}
 		}
+	}
 
-		/// <summary>
-		/// Adds the specified key and value to the dictionary.
-		/// </summary>
-		/// <param name="key">The key of the element to add.</param>
-		/// <param name="value">The value of the element to add.</param>
-		public override void Add(TKey key, TValue value)
+	/// <summary>
+	/// Adds the specified key and value to the dictionary.
+	/// </summary>
+	/// <param name="key">The key of the element to add.</param>
+	/// <param name="value">The value of the element to add.</param>
+	public override void Add(TKey key, TValue value)
+	{
+		lock (SyncRoot)
 		{
-			lock (SyncRoot)
-			{
-				base.Add(key, value);
+			base.Add(key, value);
 
-				OnResetCache(true);
-			}
+			OnResetCache(true);
 		}
+	}
 
-		/// <summary>
-		/// Removes the value with the specified key from the dictionary.
-		/// </summary>
-		/// <param name="key">The key of the element to remove.</param>
-		/// <returns><c>true</c> if the element is successfully found and removed; otherwise, <c>false</c>.</returns>
-		public override bool Remove(TKey key)
+	/// <summary>
+	/// Removes the value with the specified key from the dictionary.
+	/// </summary>
+	/// <param name="key">The key of the element to remove.</param>
+	/// <returns><c>true</c> if the element is successfully found and removed; otherwise, <c>false</c>.</returns>
+	public override bool Remove(TKey key)
+	{
+		lock (SyncRoot)
 		{
-			lock (SyncRoot)
+			if (base.Remove(key))
 			{
-				if (base.Remove(key))
-				{
-					OnResetCache(true);
-
-					return true;
-				}
+				OnResetCache(true);
 
-				return false;
+				return true;
 			}
+
+			return false;
 		}
+	}
 
-		/// <summary>
-		/// Removes all keys and values from the dictionary.
-		/// </summary>
-		public override void Clear()
+	/// <summary>
+	/// Removes all keys and values from the dictionary.
+	/// </summary>
+	public override void Clear()
+	{
+		lock (SyncRoot)
 		{
-			lock (SyncRoot)
-			{
-				base.Clear();
+			base.Clear();
 
-				OnResetCache(true);
-			}
+			OnResetCache(true);
 		}
+	}
 
-		/// <summary>
-		/// Resets the cached keys, values, and key-value pairs when the dictionary is modified.
-		/// </summary>
-		/// <param name="isKey">Indicates whether the cache reset is due to a key modification.</param>
-		protected virtual void OnResetCache(bool isKey)
-		{
-			_cachedKeys = null;
-			_cachedValues = null;
-			_cachedPairs = null;
-		}
+	/// <summary>
+	/// Resets the cached keys, values, and key-value pairs when the dictionary is modified.
+	/// </summary>
+	/// <param name="isKey">Indicates whether the cache reset is due to a key modification.</param>
+	protected virtual void OnResetCache(bool isKey)
+	{
+		_cachedKeys = null;
+		_cachedValues = null;
+		_cachedPairs = null;
 	}
 }
diff --git a/Collections/CachedSynchronizedList.cs b/Collections/CachedSynchronizedList.cs
index 942cc291..7053421a 100644
--- a/Collections/CachedSynchronizedList.cs
+++ b/Collections/CachedSynchronizedList.cs
@@ -1,52 +1,51 @@
-namespace Ecng.Collections
+namespace Ecng.Collections;
+
+/// <summary>
+/// Represents a thread-safe list with a cached array of its elements for improved performance.
+/// </summary>
+/// <typeparam name="T">The type of elements in the list.</typeparam>
+public class CachedSynchronizedList<T> : SynchronizedList<T>
 {
 	/// <summary>
-	/// Represents a thread-safe list with a cached array of its elements for improved performance.
+	/// Initializes a new instance of the <see cref="CachedSynchronizedList{T}"/> class.
 	/// </summary>
-	/// <typeparam name="T">The type of elements in the list.</typeparam>
-	public class CachedSynchronizedList<T> : SynchronizedList<T>
+	public CachedSynchronizedList()
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="CachedSynchronizedList{T}"/> class.
-		/// </summary>
-		public CachedSynchronizedList()
-		{
-		}
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="CachedSynchronizedList{T}"/> class with the specified initial capacity.
-		/// </summary>
-		/// <param name="capacity">The initial number of elements that the list can contain.</param>
-		public CachedSynchronizedList(int capacity)
-			: base(capacity)
-		{
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="CachedSynchronizedList{T}"/> class with the specified initial capacity.
+	/// </summary>
+	/// <param name="capacity">The initial number of elements that the list can contain.</param>
+	public CachedSynchronizedList(int capacity)
+		: base(capacity)
+	{
+	}
 
-		private T[] _cache;
+	private T[] _cache;
 
-		/// <summary>
-		/// Gets a cached array of the elements in the list.
-		/// </summary>
-		/// <remarks>
-		/// The array is cached for performance and is reset when the list is modified.
-		/// </remarks>
-		public T[] Cache
+	/// <summary>
+	/// Gets a cached array of the elements in the list.
+	/// </summary>
+	/// <remarks>
+	/// The array is cached for performance and is reset when the list is modified.
+	/// </remarks>
+	public T[] Cache
+	{
+		get
 		{
-			get
-			{
-				lock (SyncRoot)
-					return _cache ??= [.. this];
-			}
+			lock (SyncRoot)
+				return _cache ??= [.. this];
 		}
+	}
 
-		/// <summary>
-		/// Called when the list is modified to reset the cached array.
-		/// </summary>
-		protected override void OnChanged()
-		{
-			_cache = null;
+	/// <summary>
+	/// Called when the list is modified to reset the cached array.
+	/// </summary>
+	protected override void OnChanged()
+	{
+		_cache = null;
 
-			base.OnChanged();
-		}
+		base.OnChanged();
 	}
 }
\ No newline at end of file
diff --git a/Collections/CachedSynchronizedOrderedDictionary.cs b/Collections/CachedSynchronizedOrderedDictionary.cs
index 68aaedcc..99c5b4c7 100644
--- a/Collections/CachedSynchronizedOrderedDictionary.cs
+++ b/Collections/CachedSynchronizedOrderedDictionary.cs
@@ -1,171 +1,170 @@
-namespace Ecng.Collections
-{
-	using System;
-	using System.Collections.Generic;
+namespace Ecng.Collections;
+
+using System;
+using System.Collections.Generic;
 
+/// <summary>
+/// Represents a thread-safe ordered dictionary with cached keys, values, and key-value pairs for improved performance.
+/// </summary>
+/// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
+/// <typeparam name="TValue">The type of values in the dictionary.</typeparam>
+public class CachedSynchronizedOrderedDictionary<TKey, TValue> : SynchronizedOrderedDictionary<TKey, TValue>
+{
 	/// <summary>
-	/// Represents a thread-safe ordered dictionary with cached keys, values, and key-value pairs for improved performance.
+	/// Initializes a new instance of the <see cref="CachedSynchronizedOrderedDictionary{TKey, TValue}"/> class.
 	/// </summary>
-	/// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
-	/// <typeparam name="TValue">The type of values in the dictionary.</typeparam>
-	public class CachedSynchronizedOrderedDictionary<TKey, TValue> : SynchronizedOrderedDictionary<TKey, TValue>
+	public CachedSynchronizedOrderedDictionary()
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="CachedSynchronizedOrderedDictionary{TKey, TValue}"/> class.
-		/// </summary>
-		public CachedSynchronizedOrderedDictionary()
-		{
-		}
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="CachedSynchronizedOrderedDictionary{TKey, TValue}"/> class with the specified key comparer.
-		/// </summary>
-		/// <param name="comparer">The comparer to use when comparing keys.</param>
-		public CachedSynchronizedOrderedDictionary(IComparer<TKey> comparer)
-			: base(comparer)
-		{
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="CachedSynchronizedOrderedDictionary{TKey, TValue}"/> class with the specified key comparer.
+	/// </summary>
+	/// <param name="comparer">The comparer to use when comparing keys.</param>
+	public CachedSynchronizedOrderedDictionary(IComparer<TKey> comparer)
+		: base(comparer)
+	{
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="CachedSynchronizedOrderedDictionary{TKey, TValue}"/> class with the specified key comparison function.
-		/// </summary>
-		/// <param name="comparer">The function to use when comparing keys.</param>
-		public CachedSynchronizedOrderedDictionary(Func<TKey, TKey, int> comparer)
-			: base(comparer)
-		{
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="CachedSynchronizedOrderedDictionary{TKey, TValue}"/> class with the specified key comparison function.
+	/// </summary>
+	/// <param name="comparer">The function to use when comparing keys.</param>
+	public CachedSynchronizedOrderedDictionary(Func<TKey, TKey, int> comparer)
+		: base(comparer)
+	{
+	}
 
-		private TKey[] _cachedKeys;
+	private TKey[] _cachedKeys;
 
-		/// <summary>
-		/// Gets an array of cached keys from the dictionary.
-		/// </summary>
-		/// <remarks>
-		/// The keys are cached for performance and are reset when the dictionary is modified.
-		/// </remarks>
-		public TKey[] CachedKeys
+	/// <summary>
+	/// Gets an array of cached keys from the dictionary.
+	/// </summary>
+	/// <remarks>
+	/// The keys are cached for performance and are reset when the dictionary is modified.
+	/// </remarks>
+	public TKey[] CachedKeys
+	{
+		get
 		{
-			get
-			{
-				lock (SyncRoot)
-					return _cachedKeys ??= [.. Keys];
-			}
+			lock (SyncRoot)
+				return _cachedKeys ??= [.. Keys];
 		}
+	}
 
-		private TValue[] _cachedValues;
+	private TValue[] _cachedValues;
 
-		/// <summary>
-		/// Gets an array of cached values from the dictionary.
-		/// </summary>
-		/// <remarks>
-		/// The values are cached for performance and are reset when the dictionary is modified.
-		/// </remarks>
-		public TValue[] CachedValues
+	/// <summary>
+	/// Gets an array of cached values from the dictionary.
+	/// </summary>
+	/// <remarks>
+	/// The values are cached for performance and are reset when the dictionary is modified.
+	/// </remarks>
+	public TValue[] CachedValues
+	{
+		get
 		{
-			get
-			{
-				lock (SyncRoot)
-					return _cachedValues ??= [.. Values];
-			}
+			lock (SyncRoot)
+				return _cachedValues ??= [.. Values];
 		}
+	}
 
-		private KeyValuePair<TKey, TValue>[] _cachedPairs;
+	private KeyValuePair<TKey, TValue>[] _cachedPairs;
 
-		/// <summary>
-		/// Gets an array of cached key-value pairs from the dictionary.
-		/// </summary>
-		/// <remarks>
-		/// The key-value pairs are cached for performance and are reset when the dictionary is modified.
-		/// </remarks>
-		public KeyValuePair<TKey, TValue>[] CachedPairs
+	/// <summary>
+	/// Gets an array of cached key-value pairs from the dictionary.
+	/// </summary>
+	/// <remarks>
+	/// The key-value pairs are cached for performance and are reset when the dictionary is modified.
+	/// </remarks>
+	public KeyValuePair<TKey, TValue>[] CachedPairs
+	{
+		get
 		{
-			get
-			{
-				lock (SyncRoot)
-					return _cachedPairs ??= [.. this];
-			}
+			lock (SyncRoot)
+				return _cachedPairs ??= [.. this];
 		}
+	}
 
-		/// <summary>
-		/// Gets or sets the value associated with the specified key.
-		/// </summary>
-		/// <param name="key">The key of the value to get or set.</param>
-		/// <returns>The value associated with the specified key.</returns>
-		public override TValue this[TKey key]
+	/// <summary>
+	/// Gets or sets the value associated with the specified key.
+	/// </summary>
+	/// <param name="key">The key of the value to get or set.</param>
+	/// <returns>The value associated with the specified key.</returns>
+	public override TValue this[TKey key]
+	{
+		set
 		{
-			set
+			lock (SyncRoot)
 			{
-				lock (SyncRoot)
-				{
-					var isKey = false;
+				var isKey = false;
 
-					if (!ContainsKey(key))
-						isKey = true;
+				if (!ContainsKey(key))
+					isKey = true;
 
-					OnResetCache(isKey);
+				OnResetCache(isKey);
 
-					base[key] = value;
-				}
+				base[key] = value;
 			}
 		}
+	}
 
-		/// <summary>
-		/// Adds the specified key and value to the dictionary.
-		/// </summary>
-		/// <param name="key">The key of the element to add.</param>
-		/// <param name="value">The value of the element to add.</param>
-		public override void Add(TKey key, TValue value)
+	/// <summary>
+	/// Adds the specified key and value to the dictionary.
+	/// </summary>
+	/// <param name="key">The key of the element to add.</param>
+	/// <param name="value">The value of the element to add.</param>
+	public override void Add(TKey key, TValue value)
+	{
+		lock (SyncRoot)
 		{
-			lock (SyncRoot)
-			{
-				base.Add(key, value);
+			base.Add(key, value);
 
-				OnResetCache(true);
-			}
+			OnResetCache(true);
 		}
+	}
 
-		/// <summary>
-		/// Removes the value with the specified key from the dictionary.
-		/// </summary>
-		/// <param name="key">The key of the element to remove.</param>
-		/// <returns><c>true</c> if the element is successfully found and removed; otherwise, <c>false</c>.</returns>
-		public override bool Remove(TKey key)
+	/// <summary>
+	/// Removes the value with the specified key from the dictionary.
+	/// </summary>
+	/// <param name="key">The key of the element to remove.</param>
+	/// <returns><c>true</c> if the element is successfully found and removed; otherwise, <c>false</c>.</returns>
+	public override bool Remove(TKey key)
+	{
+		lock (SyncRoot)
 		{
-			lock (SyncRoot)
+			if (base.Remove(key))
 			{
-				if (base.Remove(key))
-				{
-					OnResetCache(true);
-
-					return true;
-				}
+				OnResetCache(true);
 
-				return false;
+				return true;
 			}
+
+			return false;
 		}
+	}
 
-		/// <summary>
-		/// Removes all keys and values from the dictionary.
-		/// </summary>
-		public override void Clear()
+	/// <summary>
+	/// Removes all keys and values from the dictionary.
+	/// </summary>
+	public override void Clear()
+	{
+		lock (SyncRoot)
 		{
-			lock (SyncRoot)
-			{
-				base.Clear();
+			base.Clear();
 
-				OnResetCache(true);
-			}
+			OnResetCache(true);
 		}
+	}
 
-		/// <summary>
-		/// Resets the cached keys, values, and key-value pairs when the dictionary is modified.
-		/// </summary>
-		/// <param name="isKey">Indicates whether the cache reset is due to a key modification.</param>
-		protected virtual void OnResetCache(bool isKey)
-		{
-			_cachedKeys = null;
-			_cachedValues = null;
-			_cachedPairs = null;
-		}
+	/// <summary>
+	/// Resets the cached keys, values, and key-value pairs when the dictionary is modified.
+	/// </summary>
+	/// <param name="isKey">Indicates whether the cache reset is due to a key modification.</param>
+	protected virtual void OnResetCache(bool isKey)
+	{
+		_cachedKeys = null;
+		_cachedValues = null;
+		_cachedPairs = null;
 	}
 }
\ No newline at end of file
diff --git a/Collections/CachedSynchronizedPairSet.cs b/Collections/CachedSynchronizedPairSet.cs
index 10d08dfc..79f3c2a0 100644
--- a/Collections/CachedSynchronizedPairSet.cs
+++ b/Collections/CachedSynchronizedPairSet.cs
@@ -1,171 +1,170 @@
-namespace Ecng.Collections
-{
-	using System.Collections.Generic;
+namespace Ecng.Collections;
+
+using System.Collections.Generic;
 
+/// <summary>
+/// Represents a thread-safe set of key-value pairs with cached keys, values, and pairs for improved performance.
+/// </summary>
+/// <typeparam name="TKey">The type of keys in the set.</typeparam>
+/// <typeparam name="TValue">The type of values in the set.</typeparam>
+public class CachedSynchronizedPairSet<TKey, TValue> : SynchronizedPairSet<TKey, TValue>
+{
 	/// <summary>
-	/// Represents a thread-safe set of key-value pairs with cached keys, values, and pairs for improved performance.
+	/// Initializes a new instance of the <see cref="CachedSynchronizedPairSet{TKey, TValue}"/> class.
 	/// </summary>
-	/// <typeparam name="TKey">The type of keys in the set.</typeparam>
-	/// <typeparam name="TValue">The type of values in the set.</typeparam>
-	public class CachedSynchronizedPairSet<TKey, TValue> : SynchronizedPairSet<TKey, TValue>
+	public CachedSynchronizedPairSet()
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="CachedSynchronizedPairSet{TKey, TValue}"/> class.
-		/// </summary>
-		public CachedSynchronizedPairSet()
-		{
-		}
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="CachedSynchronizedPairSet{TKey, TValue}"/> class with the specified key comparer.
-		/// </summary>
-		/// <param name="comparer">The equality comparer to use when comparing keys.</param>
-		public CachedSynchronizedPairSet(IEqualityComparer<TKey> comparer)
-			: base(comparer)
-		{
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="CachedSynchronizedPairSet{TKey, TValue}"/> class with the specified key comparer.
+	/// </summary>
+	/// <param name="comparer">The equality comparer to use when comparing keys.</param>
+	public CachedSynchronizedPairSet(IEqualityComparer<TKey> comparer)
+		: base(comparer)
+	{
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="CachedSynchronizedPairSet{TKey, TValue}"/> class with the specified key and value comparers.
-		/// </summary>
-		/// <param name="keyComparer">The equality comparer to use when comparing keys.</param>
-		/// <param name="valueComparer">The equality comparer to use when comparing values.</param>
-		public CachedSynchronizedPairSet(IEqualityComparer<TKey> keyComparer, IEqualityComparer<TValue> valueComparer)
-			: base(keyComparer, valueComparer)
-		{
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="CachedSynchronizedPairSet{TKey, TValue}"/> class with the specified key and value comparers.
+	/// </summary>
+	/// <param name="keyComparer">The equality comparer to use when comparing keys.</param>
+	/// <param name="valueComparer">The equality comparer to use when comparing values.</param>
+	public CachedSynchronizedPairSet(IEqualityComparer<TKey> keyComparer, IEqualityComparer<TValue> valueComparer)
+		: base(keyComparer, valueComparer)
+	{
+	}
 
-		private TKey[] _cachedKeys;
+	private TKey[] _cachedKeys;
 
-		/// <summary>
-		/// Gets an array of cached keys from the set.
-		/// </summary>
-		/// <remarks>
-		/// The keys are cached for performance and are reset when the set is modified.
-		/// </remarks>
-		public TKey[] CachedKeys
+	/// <summary>
+	/// Gets an array of cached keys from the set.
+	/// </summary>
+	/// <remarks>
+	/// The keys are cached for performance and are reset when the set is modified.
+	/// </remarks>
+	public TKey[] CachedKeys
+	{
+		get
 		{
-			get
-			{
-				lock (SyncRoot)
-					return _cachedKeys ??= [.. Keys];
-			}
+			lock (SyncRoot)
+				return _cachedKeys ??= [.. Keys];
 		}
+	}
 
-		private TValue[] _cachedValues;
+	private TValue[] _cachedValues;
 
-		/// <summary>
-		/// Gets an array of cached values from the set.
-		/// </summary>
-		/// <remarks>
-		/// The values are cached for performance and are reset when the set is modified.
-		/// </remarks>
-		public TValue[] CachedValues
+	/// <summary>
+	/// Gets an array of cached values from the set.
+	/// </summary>
+	/// <remarks>
+	/// The values are cached for performance and are reset when the set is modified.
+	/// </remarks>
+	public TValue[] CachedValues
+	{
+		get
 		{
-			get
-			{
-				lock (SyncRoot)
-					return _cachedValues ??= [.. Values];
-			}
+			lock (SyncRoot)
+				return _cachedValues ??= [.. Values];
 		}
+	}
 
-		private KeyValuePair<TKey, TValue>[] _cachedPairs;
+	private KeyValuePair<TKey, TValue>[] _cachedPairs;
 
-		/// <summary>
-		/// Gets an array of cached key-value pairs from the set.
-		/// </summary>
-		/// <remarks>
-		/// The key-value pairs are cached for performance and are reset when the set is modified.
-		/// </remarks>
-		public KeyValuePair<TKey, TValue>[] CachedPairs
+	/// <summary>
+	/// Gets an array of cached key-value pairs from the set.
+	/// </summary>
+	/// <remarks>
+	/// The key-value pairs are cached for performance and are reset when the set is modified.
+	/// </remarks>
+	public KeyValuePair<TKey, TValue>[] CachedPairs
+	{
+		get
 		{
-			get
-			{
-				lock (SyncRoot)
-					return _cachedPairs ??= [.. this];
-			}
+			lock (SyncRoot)
+				return _cachedPairs ??= [.. this];
 		}
+	}
 
-		/// <summary>
-		/// Gets or sets the value associated with the specified key.
-		/// </summary>
-		/// <param name="key">The key of the value to get or set.</param>
-		/// <returns>The value associated with the specified key.</returns>
-		public override TValue this[TKey key]
+	/// <summary>
+	/// Gets or sets the value associated with the specified key.
+	/// </summary>
+	/// <param name="key">The key of the value to get or set.</param>
+	/// <returns>The value associated with the specified key.</returns>
+	public override TValue this[TKey key]
+	{
+		set
 		{
-			set
+			lock (SyncRoot)
 			{
-				lock (SyncRoot)
-				{
-					var isKey = false;
+				var isKey = false;
 
-					if (_cachedKeys != null && !ContainsKey(key))
-						isKey = true;
+				if (_cachedKeys != null && !ContainsKey(key))
+					isKey = true;
 
-					OnResetCache(isKey);
+				OnResetCache(isKey);
 
-					base[key] = value;
-				}
+				base[key] = value;
 			}
 		}
+	}
 
-		/// <summary>
-		/// Adds the specified key and value to the set.
-		/// </summary>
-		/// <param name="key">The key of the element to add.</param>
-		/// <param name="value">The value of the element to add.</param>
-		public override void Add(TKey key, TValue value)
+	/// <summary>
+	/// Adds the specified key and value to the set.
+	/// </summary>
+	/// <param name="key">The key of the element to add.</param>
+	/// <param name="value">The value of the element to add.</param>
+	public override void Add(TKey key, TValue value)
+	{
+		lock (SyncRoot)
 		{
-			lock (SyncRoot)
-			{
-				base.Add(key, value);
+			base.Add(key, value);
 
-				OnResetCache(true);
-			}
+			OnResetCache(true);
 		}
+	}
 
-		/// <summary>
-		/// Removes the value with the specified key from the set.
-		/// </summary>
-		/// <param name="key">The key of the element to remove.</param>
-		/// <returns><c>true</c> if the element is successfully found and removed; otherwise, <c>false</c>.</returns>
-		public override bool Remove(TKey key)
+	/// <summary>
+	/// Removes the value with the specified key from the set.
+	/// </summary>
+	/// <param name="key">The key of the element to remove.</param>
+	/// <returns><c>true</c> if the element is successfully found and removed; otherwise, <c>false</c>.</returns>
+	public override bool Remove(TKey key)
+	{
+		lock (SyncRoot)
 		{
-			lock (SyncRoot)
+			if (base.Remove(key))
 			{
-				if (base.Remove(key))
-				{
-					OnResetCache(true);
-
-					return true;
-				}
+				OnResetCache(true);
 
-				return false;
+				return true;
 			}
+
+			return false;
 		}
+	}
 
-		/// <summary>
-		/// Removes all keys and values from the set.
-		/// </summary>
-		public override void Clear()
+	/// <summary>
+	/// Removes all keys and values from the set.
+	/// </summary>
+	public override void Clear()
+	{
+		lock (SyncRoot)
 		{
-			lock (SyncRoot)
-			{
-				base.Clear();
+			base.Clear();
 
-				OnResetCache(true);
-			}
+			OnResetCache(true);
 		}
+	}
 
-		/// <summary>
-		/// Resets the cached keys, values, and key-value pairs when the set is modified.
-		/// </summary>
-		/// <param name="isKey">Indicates whether the cache reset is due to a key modification.</param>
-		protected virtual void OnResetCache(bool isKey)
-		{
-			_cachedKeys = null;
-			_cachedValues = null;
-			_cachedPairs = null;
-		}
+	/// <summary>
+	/// Resets the cached keys, values, and key-value pairs when the set is modified.
+	/// </summary>
+	/// <param name="isKey">Indicates whether the cache reset is due to a key modification.</param>
+	protected virtual void OnResetCache(bool isKey)
+	{
+		_cachedKeys = null;
+		_cachedValues = null;
+		_cachedPairs = null;
 	}
 }
\ No newline at end of file
diff --git a/Collections/CachedSynchronizedSet.cs b/Collections/CachedSynchronizedSet.cs
index 76fc14d8..1098a9be 100644
--- a/Collections/CachedSynchronizedSet.cs
+++ b/Collections/CachedSynchronizedSet.cs
@@ -1,103 +1,102 @@
-namespace Ecng.Collections
-{
-	using System.Collections.Generic;
+namespace Ecng.Collections;
+
+using System.Collections.Generic;
 
+/// <summary>
+/// Represents a thread-safe set with a cached array of its elements for improved performance.
+/// </summary>
+/// <typeparam name="T">The type of elements in the set.</typeparam>
+public class CachedSynchronizedSet<T> : SynchronizedSet<T>
+{
 	/// <summary>
-	/// Represents a thread-safe set with a cached array of its elements for improved performance.
+	/// Initializes a new instance of the <see cref="CachedSynchronizedSet{T}"/> class.
 	/// </summary>
-	/// <typeparam name="T">The type of elements in the set.</typeparam>
-	public class CachedSynchronizedSet<T> : SynchronizedSet<T>
+	public CachedSynchronizedSet()
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="CachedSynchronizedSet{T}"/> class.
-		/// </summary>
-		public CachedSynchronizedSet()
-		{
-		}
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="CachedSynchronizedSet{T}"/> class with the specified indexing option.
-		/// </summary>
-		/// <param name="allowIndexing">A value indicating whether indexing is allowed.</param>
-		public CachedSynchronizedSet(bool allowIndexing)
-			: base(allowIndexing)
-		{
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="CachedSynchronizedSet{T}"/> class with the specified indexing option.
+	/// </summary>
+	/// <param name="allowIndexing">A value indicating whether indexing is allowed.</param>
+	public CachedSynchronizedSet(bool allowIndexing)
+		: base(allowIndexing)
+	{
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="CachedSynchronizedSet{T}"/> class with the specified collection.
-		/// </summary>
-		/// <param name="collection">The collection whose elements are copied to the new set.</param>
-		public CachedSynchronizedSet(IEnumerable<T> collection)
-			: base(collection)
-		{
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="CachedSynchronizedSet{T}"/> class with the specified collection.
+	/// </summary>
+	/// <param name="collection">The collection whose elements are copied to the new set.</param>
+	public CachedSynchronizedSet(IEnumerable<T> collection)
+		: base(collection)
+	{
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="CachedSynchronizedSet{T}"/> class with the specified equality comparer.
-		/// </summary>
-		/// <param name="comparer">The equality comparer to use when comparing elements.</param>
-		public CachedSynchronizedSet(IEqualityComparer<T> comparer)
-			: base(comparer)
-		{
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="CachedSynchronizedSet{T}"/> class with the specified equality comparer.
+	/// </summary>
+	/// <param name="comparer">The equality comparer to use when comparing elements.</param>
+	public CachedSynchronizedSet(IEqualityComparer<T> comparer)
+		: base(comparer)
+	{
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="CachedSynchronizedSet{T}"/> class with the specified collection and equality comparer.
-		/// </summary>
-		/// <param name="collection">The collection whose elements are copied to the new set.</param>
-		/// <param name="comparer">The equality comparer to use when comparing elements.</param>
-		public CachedSynchronizedSet(IEnumerable<T> collection, IEqualityComparer<T> comparer)
-			: base(collection, comparer)
-		{
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="CachedSynchronizedSet{T}"/> class with the specified collection and equality comparer.
+	/// </summary>
+	/// <param name="collection">The collection whose elements are copied to the new set.</param>
+	/// <param name="comparer">The equality comparer to use when comparing elements.</param>
+	public CachedSynchronizedSet(IEnumerable<T> collection, IEqualityComparer<T> comparer)
+		: base(collection, comparer)
+	{
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="CachedSynchronizedSet{T}"/> class with the specified indexing option and equality comparer.
-		/// </summary>
-		/// <param name="allowIndexing">A value indicating whether indexing is allowed.</param>
-		/// <param name="comparer">The equality comparer to use when comparing elements.</param>
-		public CachedSynchronizedSet(bool allowIndexing, IEqualityComparer<T> comparer)
-			: base(allowIndexing, comparer)
-		{
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="CachedSynchronizedSet{T}"/> class with the specified indexing option and equality comparer.
+	/// </summary>
+	/// <param name="allowIndexing">A value indicating whether indexing is allowed.</param>
+	/// <param name="comparer">The equality comparer to use when comparing elements.</param>
+	public CachedSynchronizedSet(bool allowIndexing, IEqualityComparer<T> comparer)
+		: base(allowIndexing, comparer)
+	{
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="CachedSynchronizedSet{T}"/> class with the specified indexing option, collection, and equality comparer.
-		/// </summary>
-		/// <param name="allowIndexing">A value indicating whether indexing is allowed.</param>
-		/// <param name="collection">The collection whose elements are copied to the new set.</param>
-		/// <param name="comparer">The equality comparer to use when comparing elements.</param>
-		public CachedSynchronizedSet(bool allowIndexing, IEnumerable<T> collection, IEqualityComparer<T> comparer)
-			: base(allowIndexing, collection, comparer)
-		{
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="CachedSynchronizedSet{T}"/> class with the specified indexing option, collection, and equality comparer.
+	/// </summary>
+	/// <param name="allowIndexing">A value indicating whether indexing is allowed.</param>
+	/// <param name="collection">The collection whose elements are copied to the new set.</param>
+	/// <param name="comparer">The equality comparer to use when comparing elements.</param>
+	public CachedSynchronizedSet(bool allowIndexing, IEnumerable<T> collection, IEqualityComparer<T> comparer)
+		: base(allowIndexing, collection, comparer)
+	{
+	}
 
-		private T[] _cache;
+	private T[] _cache;
 
-		/// <summary>
-		/// Gets a cached array of the elements in the set.
-		/// </summary>
-		/// <remarks>
-		/// The array is cached for performance and is reset when the set is modified.
-		/// </remarks>
-		public T[] Cache
+	/// <summary>
+	/// Gets a cached array of the elements in the set.
+	/// </summary>
+	/// <remarks>
+	/// The array is cached for performance and is reset when the set is modified.
+	/// </remarks>
+	public T[] Cache
+	{
+		get
 		{
-			get
-			{
-				lock (SyncRoot)
-					return _cache ??= [.. this];
-			}
+			lock (SyncRoot)
+				return _cache ??= [.. this];
 		}
+	}
 
-		/// <summary>
-		/// Called when the set is modified to reset the cached array.
-		/// </summary>
-		protected override void OnChanged()
-		{
-			_cache = null;
+	/// <summary>
+	/// Called when the set is modified to reset the cached array.
+	/// </summary>
+	protected override void OnChanged()
+	{
+		_cache = null;
 
-			base.OnChanged();
-		}
+		base.OnChanged();
 	}
 }
\ No newline at end of file
diff --git a/Collections/CircularBuffer.cs b/Collections/CircularBuffer.cs
index fd04e5ac..d68546ad 100644
--- a/Collections/CircularBuffer.cs
+++ b/Collections/CircularBuffer.cs
@@ -1,429 +1,428 @@
+namespace Ecng.Collections;
+
 // Source: https://github.com/joaoportela/CircularBuffer-CSharp
 
 using System;
 using System.Collections;
 using System.Collections.Generic;
 
-namespace Ecng.Collections
+/// <summary>
+/// Circular buffer.
+/// 
+/// When writing to a full buffer:
+/// PushBack -> removes this[0] / Front()
+/// PushFront -> removes this[Size-1] / Back()
+/// 
+/// this implementation is inspired by
+/// http://www.boost.org/doc/libs/1_53_0/libs/circular_buffer/doc/circular_buffer.html
+/// because I liked their interface.
+/// </summary>
+public class CircularBuffer<T> : IEnumerable<T>, IList<T>
 {
+	private T[] _buffer;
+
+	/// <summary>
+	/// The _start. Index of the first element in buffer.
+	/// </summary>
+	private int _start;
+
+	/// <summary>
+	/// The _end. Index after the last element in the buffer.
+	/// </summary>
+	private int _end;
+
+	/// <summary>
+	/// The _size. Buffer size.
+	/// </summary>
+	private int _count;
+
 	/// <summary>
-	/// Circular buffer.
+	/// Initializes a new instance of the <see cref="CircularBuffer{T}"/> class.
 	/// 
-	/// When writing to a full buffer:
-	/// PushBack -> removes this[0] / Front()
-	/// PushFront -> removes this[Size-1] / Back()
+	/// </summary>
+	/// <param name='capacity'>
+	/// Buffer capacity. Must be positive.
+	/// </param>
+	public CircularBuffer(int capacity)
+		: this(capacity, [])
+	{
+	}
+
+	/// <summary>
+	/// Initializes a new instance of the <see cref="CircularBuffer{T}"/> class.
 	/// 
-	/// this implementation is inspired by
-	/// http://www.boost.org/doc/libs/1_53_0/libs/circular_buffer/doc/circular_buffer.html
-	/// because I liked their interface.
 	/// </summary>
-	public class CircularBuffer<T> : IEnumerable<T>, IList<T>
+	/// <param name='capacity'>
+	/// Buffer capacity. Must be positive.
+	/// </param>
+	/// <param name='items'>
+	/// Items to fill buffer with. Items length must be less than capacity.
+	/// Suggestion: use Skip(x).Take(y).ToArray() to build this argument from
+	/// any enumerable.
+	/// </param>
+	public CircularBuffer(int capacity, T[] items)
 	{
-		private T[] _buffer;
-
-		/// <summary>
-		/// The _start. Index of the first element in buffer.
-		/// </summary>
-		private int _start;
-
-		/// <summary>
-		/// The _end. Index after the last element in the buffer.
-		/// </summary>
-		private int _end;
-
-		/// <summary>
-		/// The _size. Buffer size.
-		/// </summary>
-		private int _count;
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="CircularBuffer{T}"/> class.
-		/// 
-		/// </summary>
-		/// <param name='capacity'>
-		/// Buffer capacity. Must be positive.
-		/// </param>
-		public CircularBuffer(int capacity)
-			: this(capacity, [])
+		if (capacity < 1)
 		{
+			throw new ArgumentException(
+				"Circular buffer cannot have negative or zero capacity.", nameof(capacity));
 		}
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="CircularBuffer{T}"/> class.
-		/// 
-		/// </summary>
-		/// <param name='capacity'>
-		/// Buffer capacity. Must be positive.
-		/// </param>
-		/// <param name='items'>
-		/// Items to fill buffer with. Items length must be less than capacity.
-		/// Suggestion: use Skip(x).Take(y).ToArray() to build this argument from
-		/// any enumerable.
-		/// </param>
-		public CircularBuffer(int capacity, T[] items)
+		if (items == null)
 		{
-			if (capacity < 1)
-			{
-				throw new ArgumentException(
-					"Circular buffer cannot have negative or zero capacity.", nameof(capacity));
-			}
-			if (items == null)
-			{
-				throw new ArgumentNullException(nameof(items));
-			}
-			if (items.Length > capacity)
-			{
-				throw new ArgumentException(
-					"Too many items to fit circular buffer", nameof(items));
-			}
+			throw new ArgumentNullException(nameof(items));
+		}
+		if (items.Length > capacity)
+		{
+			throw new ArgumentException(
+				"Too many items to fit circular buffer", nameof(items));
+		}
 
-			_buffer = new T[capacity];
+		_buffer = new T[capacity];
 
-			Array.Copy(items, _buffer, items.Length);
-			_count = items.Length;
+		Array.Copy(items, _buffer, items.Length);
+		_count = items.Length;
 
-			_start = 0;
-			_end = _count == capacity ? 0 : _count;
-		}
+		_start = 0;
+		_end = _count == capacity ? 0 : _count;
+	}
 
-		/// <summary>
-		/// Maximum capacity of the buffer. Elements pushed into the buffer after
-		/// maximum capacity is reached (IsFull = true), will remove an element.
-		/// </summary>
-		public virtual int Capacity
+	/// <summary>
+	/// Maximum capacity of the buffer. Elements pushed into the buffer after
+	/// maximum capacity is reached (IsFull = true), will remove an element.
+	/// </summary>
+	public virtual int Capacity
+	{
+		get => _buffer.Length;
+		set
 		{
-			get => _buffer.Length;
-			set
-			{
-				Array.Resize(ref _buffer, value);
-			}
+			Array.Resize(ref _buffer, value);
 		}
+	}
 
-		/// <summary>
-		/// Boolean indicating if Circular is at full capacity.
-		/// Adding more elements when the buffer is full will
-		/// cause elements to be removed from the other end
-		/// of the buffer.
-		/// </summary>
-		public bool IsFull
+	/// <summary>
+	/// Boolean indicating if Circular is at full capacity.
+	/// Adding more elements when the buffer is full will
+	/// cause elements to be removed from the other end
+	/// of the buffer.
+	/// </summary>
+	public bool IsFull
+	{
+		get
 		{
-			get
-			{
-				return Count == Capacity;
-			}
+			return Count == Capacity;
 		}
+	}
 
-		/// <summary>
-		/// True if has no elements.
-		/// </summary>
-		public bool IsEmpty => Count == 0;
-
-		/// <summary>
-		/// Current buffer size (the number of elements that the buffer has).
-		/// </summary>
-		public int Count => _count;
-
-		/// <summary>
-		/// Element at the front of the buffer - this[0].
-		/// </summary>
-		/// <returns>The value of the element of type T at the front of the buffer.</returns>
-		public T Front()
-		{
-			ThrowIfEmpty();
-			return _buffer[_start];
-		}
+	/// <summary>
+	/// True if has no elements.
+	/// </summary>
+	public bool IsEmpty => Count == 0;
 
-		/// <summary>
-		/// Element at the back of the buffer - this[Size - 1].
-		/// </summary>
-		/// <returns>The value of the element of type T at the back of the buffer.</returns>
-		public T Back()
-		{
-			ThrowIfEmpty();
-			return _buffer[(_end != 0 ? _end : Capacity) - 1];
-		}
+	/// <summary>
+	/// Current buffer size (the number of elements that the buffer has).
+	/// </summary>
+	public int Count => _count;
+
+	/// <summary>
+	/// Element at the front of the buffer - this[0].
+	/// </summary>
+	/// <returns>The value of the element of type T at the front of the buffer.</returns>
+	public T Front()
+	{
+		ThrowIfEmpty();
+		return _buffer[_start];
+	}
 
-		/// <summary>
-		/// Index access to elements in buffer.
-		/// Index does not loop around like when adding elements,
-		/// valid interval is [0;Size[
-		/// </summary>
-		/// <param name="index">Index of element to access.</param>
-		/// <exception cref="IndexOutOfRangeException">Thrown when index is outside of [; Size[ interval.</exception>
-		public T this[int index]
+	/// <summary>
+	/// Element at the back of the buffer - this[Size - 1].
+	/// </summary>
+	/// <returns>The value of the element of type T at the back of the buffer.</returns>
+	public T Back()
+	{
+		ThrowIfEmpty();
+		return _buffer[(_end != 0 ? _end : Capacity) - 1];
+	}
+
+	/// <summary>
+	/// Index access to elements in buffer.
+	/// Index does not loop around like when adding elements,
+	/// valid interval is [0;Size[
+	/// </summary>
+	/// <param name="index">Index of element to access.</param>
+	/// <exception cref="IndexOutOfRangeException">Thrown when index is outside of [; Size[ interval.</exception>
+	public T this[int index]
+	{
+		get
 		{
-			get
+			if (IsEmpty)
 			{
-				if (IsEmpty)
-				{
-					throw new IndexOutOfRangeException(string.Format("Cannot access index {0}. Buffer is empty", index));
-				}
-				if (index >= _count)
-				{
-					throw new IndexOutOfRangeException(string.Format("Cannot access index {0}. Buffer size is {1}", index, _count));
-				}
-				int actualIndex = InternalIndex(index);
-				return _buffer[actualIndex];
+				throw new IndexOutOfRangeException(string.Format("Cannot access index {0}. Buffer is empty", index));
 			}
-			set
+			if (index >= _count)
 			{
-				if (IsEmpty)
-				{
-					throw new IndexOutOfRangeException(string.Format("Cannot access index {0}. Buffer is empty", index));
-				}
-				if (index >= _count)
-				{
-					throw new IndexOutOfRangeException(string.Format("Cannot access index {0}. Buffer size is {1}", index, _count));
-				}
-				int actualIndex = InternalIndex(index);
-				_buffer[actualIndex] = value;
+				throw new IndexOutOfRangeException(string.Format("Cannot access index {0}. Buffer size is {1}", index, _count));
 			}
+			int actualIndex = InternalIndex(index);
+			return _buffer[actualIndex];
 		}
-
-		/// <summary>
-		/// Pushes a new element to the back of the buffer. Back()/this[Size-1]
-		/// will now return this element.
-		/// 
-		/// When the buffer is full, the element at Front()/this[0] will be 
-		/// popped to allow for this new element to fit.
-		/// </summary>
-		/// <param name="item">Item to push to the back of the buffer</param>
-		public virtual void PushBack(T item)
+		set
 		{
-			if (IsFull)
+			if (IsEmpty)
 			{
-				_buffer[_end] = item;
-				Increment(ref _end);
-				_start = _end;
+				throw new IndexOutOfRangeException(string.Format("Cannot access index {0}. Buffer is empty", index));
 			}
-			else
+			if (index >= _count)
 			{
-				_buffer[_end] = item;
-				Increment(ref _end);
-				++_count;
+				throw new IndexOutOfRangeException(string.Format("Cannot access index {0}. Buffer size is {1}", index, _count));
 			}
+			int actualIndex = InternalIndex(index);
+			_buffer[actualIndex] = value;
 		}
+	}
 
-		/// <summary>
-		/// Pushes a new element to the front of the buffer. Front()/this[0]
-		/// will now return this element.
-		/// 
-		/// When the buffer is full, the element at Back()/this[Size-1] will be 
-		/// popped to allow for this new element to fit.
-		/// </summary>
-		/// <param name="item">Item to push to the front of the buffer</param>
-		public void PushFront(T item)
+	/// <summary>
+	/// Pushes a new element to the back of the buffer. Back()/this[Size-1]
+	/// will now return this element.
+	/// 
+	/// When the buffer is full, the element at Front()/this[0] will be 
+	/// popped to allow for this new element to fit.
+	/// </summary>
+	/// <param name="item">Item to push to the back of the buffer</param>
+	public virtual void PushBack(T item)
+	{
+		if (IsFull)
 		{
-			if (IsFull)
-			{
-				Decrement(ref _start);
-				_end = _start;
-				_buffer[_start] = item;
-			}
-			else
-			{
-				Decrement(ref _start);
-				_buffer[_start] = item;
-				++_count;
-			}
+			_buffer[_end] = item;
+			Increment(ref _end);
+			_start = _end;
 		}
-
-		/// <summary>
-		/// Removes the element at the back of the buffer. Decreasing the 
-		/// Buffer size by 1.
-		/// </summary>
-		public void PopBack()
+		else
 		{
-			ThrowIfEmpty("Cannot take elements from an empty buffer.");
-			Decrement(ref _end);
-			_buffer[_end] = default;
-			--_count;
+			_buffer[_end] = item;
+			Increment(ref _end);
+			++_count;
 		}
+	}
 
-		/// <summary>
-		/// Removes the element at the front of the buffer. Decreasing the 
-		/// Buffer size by 1.
-		/// </summary>
-		public void PopFront()
+	/// <summary>
+	/// Pushes a new element to the front of the buffer. Front()/this[0]
+	/// will now return this element.
+	/// 
+	/// When the buffer is full, the element at Back()/this[Size-1] will be 
+	/// popped to allow for this new element to fit.
+	/// </summary>
+	/// <param name="item">Item to push to the front of the buffer</param>
+	public void PushFront(T item)
+	{
+		if (IsFull)
+		{
+			Decrement(ref _start);
+			_end = _start;
+			_buffer[_start] = item;
+		}
+		else
 		{
-			ThrowIfEmpty("Cannot take elements from an empty buffer.");
-			_buffer[_start] = default;
-			Increment(ref _start);
-			--_count;
+			Decrement(ref _start);
+			_buffer[_start] = item;
+			++_count;
 		}
+	}
 
-		/// <summary>
-		/// Clears the contents of the array. Size = 0, Capacity is unchanged.
-		/// </summary>
-		/// <exception cref="NotImplementedException"></exception>
-		public virtual void Clear()
+	/// <summary>
+	/// Removes the element at the back of the buffer. Decreasing the 
+	/// Buffer size by 1.
+	/// </summary>
+	public void PopBack()
+	{
+		ThrowIfEmpty("Cannot take elements from an empty buffer.");
+		Decrement(ref _end);
+		_buffer[_end] = default;
+		--_count;
+	}
+
+	/// <summary>
+	/// Removes the element at the front of the buffer. Decreasing the 
+	/// Buffer size by 1.
+	/// </summary>
+	public void PopFront()
+	{
+		ThrowIfEmpty("Cannot take elements from an empty buffer.");
+		_buffer[_start] = default;
+		Increment(ref _start);
+		--_count;
+	}
+
+	/// <summary>
+	/// Clears the contents of the array. Size = 0, Capacity is unchanged.
+	/// </summary>
+	/// <exception cref="NotImplementedException"></exception>
+	public virtual void Clear()
+	{
+		// to clear we just reset everything.
+		_start = 0;
+		_end = 0;
+		_count = 0;
+		Array.Clear(_buffer, 0, _buffer.Length);
+	}
+
+	/// <summary>
+	/// Copies the buffer contents to an array, according to the logical
+	/// contents of the buffer (i.e. independent of the internal 
+	/// order/contents)
+	/// </summary>
+	/// <returns>A new array with a copy of the buffer contents.</returns>
+	public T[] ToArray()
+	{
+		T[] newArray = new T[Count];
+		int newArrayOffset = 0;
+		var segments = ToArraySegments();
+		foreach (var segment in segments)
 		{
-			// to clear we just reset everything.
-			_start = 0;
-			_end = 0;
-			_count = 0;
-			Array.Clear(_buffer, 0, _buffer.Length);
+			Array.Copy(segment.Array, segment.Offset, newArray, newArrayOffset, segment.Count);
+			newArrayOffset += segment.Count;
 		}
+		return newArray;
+	}
 
-		/// <summary>
-		/// Copies the buffer contents to an array, according to the logical
-		/// contents of the buffer (i.e. independent of the internal 
-		/// order/contents)
-		/// </summary>
-		/// <returns>A new array with a copy of the buffer contents.</returns>
-		public T[] ToArray()
+	/// <summary>
+	/// Get the contents of the buffer as 2 ArraySegments.
+	/// Respects the logical contents of the buffer, where
+	/// each segment and items in each segment are ordered
+	/// according to insertion.
+	///
+	/// Fast: does not copy the array elements.
+	/// Useful for methods like <c>Send(IList&lt;ArraySegment&lt;Byte&gt;&gt;)</c>.
+	/// 
+	/// <remarks>Segments may be empty.</remarks>
+	/// </summary>
+	/// <returns>An IList with 2 segments corresponding to the buffer content.</returns>
+	public IList<ArraySegment<T>> ToArraySegments()
+	{
+		return [ArrayOne(), ArrayTwo()];
+	}
+
+	#region IEnumerable<T> implementation
+	/// <summary>
+	/// Returns an enumerator that iterates through this buffer.
+	/// </summary>
+	/// <returns>An enumerator that can be used to iterate this collection.</returns>
+	public IEnumerator<T> GetEnumerator()
+	{
+		var segments = ToArraySegments();
+		foreach (var segment in segments)
 		{
-			T[] newArray = new T[Count];
-			int newArrayOffset = 0;
-			var segments = ToArraySegments();
-			foreach (var segment in segments)
+			for (int i = 0; i < segment.Count; i++)
 			{
-				Array.Copy(segment.Array, segment.Offset, newArray, newArrayOffset, segment.Count);
-				newArrayOffset += segment.Count;
+				yield return segment.Array[segment.Offset + i];
 			}
-			return newArray;
 		}
+	}
+	#endregion
+	#region IEnumerable implementation
+	IEnumerator IEnumerable.GetEnumerator()
+	{
+		return GetEnumerator();
+	}
+	#endregion
 
-		/// <summary>
-		/// Get the contents of the buffer as 2 ArraySegments.
-		/// Respects the logical contents of the buffer, where
-		/// each segment and items in each segment are ordered
-		/// according to insertion.
-		///
-		/// Fast: does not copy the array elements.
-		/// Useful for methods like <c>Send(IList&lt;ArraySegment&lt;Byte&gt;&gt;)</c>.
-		/// 
-		/// <remarks>Segments may be empty.</remarks>
-		/// </summary>
-		/// <returns>An IList with 2 segments corresponding to the buffer content.</returns>
-		public IList<ArraySegment<T>> ToArraySegments()
+	private void ThrowIfEmpty(string message = "Cannot access an empty buffer.")
+	{
+		if (IsEmpty)
 		{
-			return [ArrayOne(), ArrayTwo()];
+			throw new InvalidOperationException(message);
 		}
+	}
 
-		#region IEnumerable<T> implementation
-		/// <summary>
-		/// Returns an enumerator that iterates through this buffer.
-		/// </summary>
-		/// <returns>An enumerator that can be used to iterate this collection.</returns>
-		public IEnumerator<T> GetEnumerator()
+	/// <summary>
+	/// Increments the provided index variable by one, wrapping
+	/// around if necessary.
+	/// </summary>
+	/// <param name="index"></param>
+	private void Increment(ref int index)
+	{
+		if (++index == Capacity)
 		{
-			var segments = ToArraySegments();
-			foreach (var segment in segments)
-			{
-				for (int i = 0; i < segment.Count; i++)
-				{
-					yield return segment.Array[segment.Offset + i];
-				}
-			}
+			index = 0;
 		}
-		#endregion
-		#region IEnumerable implementation
-		IEnumerator IEnumerable.GetEnumerator()
+	}
+
+	/// <summary>
+	/// Decrements the provided index variable by one, wrapping
+	/// around if necessary.
+	/// </summary>
+	/// <param name="index"></param>
+	private void Decrement(ref int index)
+	{
+		if (index == 0)
 		{
-			return GetEnumerator();
+			index = Capacity;
 		}
-		#endregion
+		index--;
+	}
 
-		private void ThrowIfEmpty(string message = "Cannot access an empty buffer.")
+	/// <summary>
+	/// Converts the index in the argument to an index in <code>_buffer</code>
+	/// </summary>
+	/// <returns>
+	/// The transformed index.
+	/// </returns>
+	/// <param name='index'>
+	/// External index.
+	/// </param>
+	private int InternalIndex(int index)
+	{
+		return _start + (index < (Capacity - _start) ? index : index - Capacity);
+	}
+
+	// doing ArrayOne and ArrayTwo methods returning ArraySegment<T> as seen here: 
+	// http://www.boost.org/doc/libs/1_37_0/libs/circular_buffer/doc/circular_buffer.html#classboost_1_1circular__buffer_1957cccdcb0c4ef7d80a34a990065818d
+	// http://www.boost.org/doc/libs/1_37_0/libs/circular_buffer/doc/circular_buffer.html#classboost_1_1circular__buffer_1f5081a54afbc2dfc1a7fb20329df7d5b
+	// should help a lot with the code.
+
+	#region Array items easy access.
+	// The array is composed by at most two non-contiguous segments, 
+	// the next two methods allow easy access to those.
+
+	private ArraySegment<T> ArrayOne()
+	{
+		if (IsEmpty)
 		{
-			if (IsEmpty)
-			{
-				throw new InvalidOperationException(message);
-			}
+			return new([]);
 		}
-
-		/// <summary>
-		/// Increments the provided index variable by one, wrapping
-		/// around if necessary.
-		/// </summary>
-		/// <param name="index"></param>
-		private void Increment(ref int index)
+		else if (_start < _end)
 		{
-			if (++index == Capacity)
-			{
-				index = 0;
-			}
+			return new(_buffer, _start, _end - _start);
 		}
-
-		/// <summary>
-		/// Decrements the provided index variable by one, wrapping
-		/// around if necessary.
-		/// </summary>
-		/// <param name="index"></param>
-		private void Decrement(ref int index)
+		else
 		{
-			if (index == 0)
-			{
-				index = Capacity;
-			}
-			index--;
+			return new(_buffer, _start, _buffer.Length - _start);
 		}
+	}
 
-		/// <summary>
-		/// Converts the index in the argument to an index in <code>_buffer</code>
-		/// </summary>
-		/// <returns>
-		/// The transformed index.
-		/// </returns>
-		/// <param name='index'>
-		/// External index.
-		/// </param>
-		private int InternalIndex(int index)
+	private ArraySegment<T> ArrayTwo()
+	{
+		if (IsEmpty)
 		{
-			return _start + (index < (Capacity - _start) ? index : index - Capacity);
+			return new([]);
 		}
-
-		// doing ArrayOne and ArrayTwo methods returning ArraySegment<T> as seen here: 
-		// http://www.boost.org/doc/libs/1_37_0/libs/circular_buffer/doc/circular_buffer.html#classboost_1_1circular__buffer_1957cccdcb0c4ef7d80a34a990065818d
-		// http://www.boost.org/doc/libs/1_37_0/libs/circular_buffer/doc/circular_buffer.html#classboost_1_1circular__buffer_1f5081a54afbc2dfc1a7fb20329df7d5b
-		// should help a lot with the code.
-
-		#region Array items easy access.
-		// The array is composed by at most two non-contiguous segments, 
-		// the next two methods allow easy access to those.
-
-		private ArraySegment<T> ArrayOne()
+		else if (_start < _end)
 		{
-			if (IsEmpty)
-			{
-				return new([]);
-			}
-			else if (_start < _end)
-			{
-				return new(_buffer, _start, _end - _start);
-			}
-			else
-			{
-				return new(_buffer, _start, _buffer.Length - _start);
-			}
+			return new(_buffer, _end, 0);
 		}
-
-		private ArraySegment<T> ArrayTwo()
+		else
 		{
-			if (IsEmpty)
-			{
-				return new([]);
-			}
-			else if (_start < _end)
-			{
-				return new(_buffer, _end, 0);
-			}
-			else
-			{
-				return new(_buffer, 0, _end);
-			}
+			return new(_buffer, 0, _end);
 		}
+	}
 
-		#endregion
+	#endregion
 
-		int IList<T>.IndexOf(T item) => throw new NotSupportedException();
-		void IList<T>.Insert(int index, T item) => throw new NotSupportedException();
-		void IList<T>.RemoveAt(int index) => throw new NotSupportedException();
-		bool ICollection<T>.IsReadOnly => false;
-		void ICollection<T>.Add(T item) => PushBack(item);
-		bool ICollection<T>.Contains(T item) => throw new NotSupportedException();
-		void ICollection<T>.CopyTo(T[] array, int arrayIndex) => throw new NotSupportedException();
-		bool ICollection<T>.Remove(T item) => throw new NotSupportedException();
-	}
+	int IList<T>.IndexOf(T item) => throw new NotSupportedException();
+	void IList<T>.Insert(int index, T item) => throw new NotSupportedException();
+	void IList<T>.RemoveAt(int index) => throw new NotSupportedException();
+	bool ICollection<T>.IsReadOnly => false;
+	void ICollection<T>.Add(T item) => PushBack(item);
+	bool ICollection<T>.Contains(T item) => throw new NotSupportedException();
+	void ICollection<T>.CopyTo(T[] array, int arrayIndex) => throw new NotSupportedException();
+	bool ICollection<T>.Remove(T item) => throw new NotSupportedException();
 }
\ No newline at end of file
diff --git a/Collections/CollectionHelper.cs b/Collections/CollectionHelper.cs
index 4578f1ae..484a3c12 100644
--- a/Collections/CollectionHelper.cs
+++ b/Collections/CollectionHelper.cs
@@ -1,2330 +1,2329 @@
-namespace Ecng.Collections
-{
-	using System;
-	using System.Collections;
-	using System.Collections.Generic;
-	using System.Linq;
-	using System.Threading;
-	using System.Threading.Tasks;
+namespace Ecng.Collections;
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 
-	using Nito.AsyncEx;
+using Nito.AsyncEx;
 
-	using Ecng.Common;
+using Ecng.Common;
 
+/// <summary>
+/// Provides extension methods and helper utilities for working with collections.
+/// </summary>
+public static class CollectionHelper
+{
 	/// <summary>
-	/// Provides extension methods and helper utilities for working with collections.
+	/// A private implementation of <see cref="IEqualityComparer{T}"/> using a custom equality comparison function.
 	/// </summary>
-	public static class CollectionHelper
+	/// <typeparam name="T">The type of objects to compare.</typeparam>
+	private sealed class EqualityComparer<T>(Func<T, T, bool> comparer) : IEqualityComparer<T>
 	{
+		private readonly Func<T, T, bool> _comparer = comparer ?? throw new ArgumentNullException(nameof(comparer));
+
 		/// <summary>
-		/// A private implementation of <see cref="IEqualityComparer{T}"/> using a custom equality comparison function.
+		/// Determines whether two objects are equal using the provided comparison function.
 		/// </summary>
-		/// <typeparam name="T">The type of objects to compare.</typeparam>
-		private sealed class EqualityComparer<T>(Func<T, T, bool> comparer) : IEqualityComparer<T>
-		{
-			private readonly Func<T, T, bool> _comparer = comparer ?? throw new ArgumentNullException(nameof(comparer));
-
-			/// <summary>
-			/// Determines whether two objects are equal using the provided comparison function.
-			/// </summary>
-			public bool Equals(T x, T y) => _comparer(x, y);
-
-			/// <summary>
-			/// Returns a hash code for the specified object.
-			/// </summary>
-			public int GetHashCode(T obj) => obj.GetHashCode();
-		}
+		public bool Equals(T x, T y) => _comparer(x, y);
 
 		/// <summary>
-		/// A private implementation of <see cref="IComparer{T}"/> using a custom comparison function.
+		/// Returns a hash code for the specified object.
 		/// </summary>
-		/// <typeparam name="T">The type of objects to compare.</typeparam>
-		private sealed class Comparer<T>(Func<T, T, int> comparer) : IComparer<T>
-		{
-			private readonly Func<T, T, int> _comparer = comparer ?? throw new ArgumentNullException(nameof(comparer));
+		public int GetHashCode(T obj) => obj.GetHashCode();
+	}
 
-			/// <summary>
-			/// Compares two objects and returns a value indicating their relative order.
-			/// </summary>
-			public int Compare(T x, T y) => _comparer(x, y);
-		}
+	/// <summary>
+	/// A private implementation of <see cref="IComparer{T}"/> using a custom comparison function.
+	/// </summary>
+	/// <typeparam name="T">The type of objects to compare.</typeparam>
+	private sealed class Comparer<T>(Func<T, T, int> comparer) : IComparer<T>
+	{
+		private readonly Func<T, T, int> _comparer = comparer ?? throw new ArgumentNullException(nameof(comparer));
 
 		/// <summary>
-		/// Converts a function to an <see cref="IEqualityComparer{T}"/> instance.
+		/// Compares two objects and returns a value indicating their relative order.
 		/// </summary>
-		/// <typeparam name="T">The type of objects to compare.</typeparam>
-		/// <param name="comparer">The function to determine equality between two objects.</param>
-		/// <returns>An <see cref="IEqualityComparer{T}"/> instance.</returns>
-		public static IEqualityComparer<T> ToComparer<T>(this Func<T, T, bool> comparer)
+		public int Compare(T x, T y) => _comparer(x, y);
+	}
+
+	/// <summary>
+	/// Converts a function to an <see cref="IEqualityComparer{T}"/> instance.
+	/// </summary>
+	/// <typeparam name="T">The type of objects to compare.</typeparam>
+	/// <param name="comparer">The function to determine equality between two objects.</param>
+	/// <returns>An <see cref="IEqualityComparer{T}"/> instance.</returns>
+	public static IEqualityComparer<T> ToComparer<T>(this Func<T, T, bool> comparer)
+	{
+		return new EqualityComparer<T>(comparer);
+	}
+
+	/// <summary>
+	/// Converts a function to an <see cref="IComparer{T}"/> instance.
+	/// </summary>
+	/// <typeparam name="T">The type of objects to compare.</typeparam>
+	/// <param name="comparer">The function to compare two objects.</param>
+	/// <returns>An <see cref="IComparer{T}"/> instance.</returns>
+	public static IComparer<T> ToComparer<T>(this Func<T, T, int> comparer)
+	{
+		return new Comparer<T>(comparer);
+	}
+
+	/// <summary>
+	/// Converts a <see cref="Comparison{T}"/> delegate to an <see cref="IComparer{T}"/> instance.
+	/// </summary>
+	/// <typeparam name="T">The type of objects to compare.</typeparam>
+	/// <param name="comparer">The comparison delegate.</param>
+	/// <returns>An <see cref="IComparer{T}"/> instance.</returns>
+	public static IComparer<T> ToComparer<T>(this Comparison<T> comparer)
+	{
+		return comparer.ToFunc().ToComparer();
+	}
+
+	/// <summary>
+	/// Converts a <see cref="Comparison{T}"/> delegate to a function.
+	/// </summary>
+	/// <typeparam name="T">The type of objects to compare.</typeparam>
+	/// <param name="comparer">The comparison delegate.</param>
+	/// <returns>A function that compares two objects.</returns>
+	public static Func<T, T, int> ToFunc<T>(this Comparison<T> comparer)
+	{
+		return (t1, t2) => comparer(t1, t2);
+	}
+
+	/// <summary>
+	/// Determines whether two sequences are equal using a custom equality comparer function.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the sequences.</typeparam>
+	/// <param name="first">The first sequence to compare.</param>
+	/// <param name="second">The second sequence to compare.</param>
+	/// <param name="comparer">The function to determine equality between elements.</param>
+	/// <returns>True if the sequences are equal; otherwise, false.</returns>
+	public static bool SequenceEqual<T>(this IEnumerable<T> first, IEnumerable<T> second, Func<T, T, bool> comparer)
+	{
+		return first.SequenceEqual(second, comparer.ToComparer());
+	}
+
+	/// <summary>
+	/// Sorts a collection using a <see cref="Comparison{T}"/> delegate.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the collection.</typeparam>
+	/// <param name="collection">The collection to sort.</param>
+	/// <param name="comparison">The comparison delegate to determine order.</param>
+	/// <returns>An ordered enumerable of the collection.</returns>
+	public static IOrderedEnumerable<T> OrderBy<T>(this IEnumerable<T> collection, Comparison<T> comparison)
+	{
+		return collection.OrderBy(item => item, comparison.ToComparer());
+	}
+
+	/// <summary>
+	/// Returns the index of the first element in a sequence that satisfies a specified condition.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the sequence.</typeparam>
+	/// <param name="source">The sequence to search.</param>
+	/// <param name="predicate">The condition to test each element against.</param>
+	/// <returns>The zero-based index of the first matching element, or -1 if no element is found.</returns>
+	public static int IndexOf<T>(this IEnumerable<T> source, Func<T, bool> predicate)
+	{
+		var index = 0;
+
+		foreach (var t in source)
 		{
-			return new EqualityComparer<T>(comparer);
+			if (predicate(t))
+				return index;
+
+			index++;
 		}
 
-		/// <summary>
-		/// Converts a function to an <see cref="IComparer{T}"/> instance.
-		/// </summary>
-		/// <typeparam name="T">The type of objects to compare.</typeparam>
-		/// <param name="comparer">The function to compare two objects.</param>
-		/// <returns>An <see cref="IComparer{T}"/> instance.</returns>
-		public static IComparer<T> ToComparer<T>(this Func<T, T, int> comparer)
+		return -1;
+	}
+
+	/// <summary>
+	/// Adds a range of values to a collection, ensuring no duplicates if the collection already contains them.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the collection.</typeparam>
+	/// <param name="collection">The collection to add values to.</param>
+	/// <param name="values">The values to add.</param>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="values"/> is null.</exception>
+	public static void TryAdd<T>(this ICollection<T> collection, IEnumerable<T> values)
+	{
+		if (values is null)
+			throw new ArgumentNullException(nameof(values));
+
+		void InternalTryAdd()
 		{
-			return new Comparer<T>(comparer);
+			foreach (var value in values)
+			{
+				if (!collection.Contains(value))
+					collection.Add(value);
+			}
 		}
 
-		/// <summary>
-		/// Converts a <see cref="Comparison{T}"/> delegate to an <see cref="IComparer{T}"/> instance.
-		/// </summary>
-		/// <typeparam name="T">The type of objects to compare.</typeparam>
-		/// <param name="comparer">The comparison delegate.</param>
-		/// <returns>An <see cref="IComparer{T}"/> instance.</returns>
-		public static IComparer<T> ToComparer<T>(this Comparison<T> comparer)
+		if (collection is ISynchronizedCollection sync)
 		{
-			return comparer.ToFunc().ToComparer();
+			lock (sync.SyncRoot)
+				InternalTryAdd();
 		}
-
-		/// <summary>
-		/// Converts a <see cref="Comparison{T}"/> delegate to a function.
-		/// </summary>
-		/// <typeparam name="T">The type of objects to compare.</typeparam>
-		/// <param name="comparer">The comparison delegate.</param>
-		/// <returns>A function that compares two objects.</returns>
-		public static Func<T, T, int> ToFunc<T>(this Comparison<T> comparer)
+		else
 		{
-			return (t1, t2) => comparer(t1, t2);
+			InternalTryAdd();
 		}
+	}
 
-		/// <summary>
-		/// Determines whether two sequences are equal using a custom equality comparer function.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the sequences.</typeparam>
-		/// <param name="first">The first sequence to compare.</param>
-		/// <param name="second">The second sequence to compare.</param>
-		/// <param name="comparer">The function to determine equality between elements.</param>
-		/// <returns>True if the sequences are equal; otherwise, false.</returns>
-		public static bool SequenceEqual<T>(this IEnumerable<T> first, IEnumerable<T> second, Func<T, T, bool> comparer)
+	/// <summary>
+	/// Adds a value to a collection if it does not already exist.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the collection.</typeparam>
+	/// <param name="collection">The collection to add the value to.</param>
+	/// <param name="value">The value to add.</param>
+	/// <returns>True if the value was added; false if it already existed.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="collection"/> is null.</exception>
+	public static bool TryAdd<T>(this ICollection<T> collection, T value)
+	{
+		if (collection is null)
+			throw new ArgumentNullException(nameof(collection));
+
+		bool InternalTryAdd()
 		{
-			return first.SequenceEqual(second, comparer.ToComparer());
+			if (collection.Contains(value))
+				return false;
+
+			collection.Add(value);
+			return true;
 		}
 
-		/// <summary>
-		/// Sorts a collection using a <see cref="Comparison{T}"/> delegate.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the collection.</typeparam>
-		/// <param name="collection">The collection to sort.</param>
-		/// <param name="comparison">The comparison delegate to determine order.</param>
-		/// <returns>An ordered enumerable of the collection.</returns>
-		public static IOrderedEnumerable<T> OrderBy<T>(this IEnumerable<T> collection, Comparison<T> comparison)
+		if (collection is ISynchronizedCollection sync)
 		{
-			return collection.OrderBy(item => item, comparison.ToComparer());
+			lock (sync.SyncRoot)
+				return InternalTryAdd();
 		}
 
-		/// <summary>
-		/// Returns the index of the first element in a sequence that satisfies a specified condition.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the sequence.</typeparam>
-		/// <param name="source">The sequence to search.</param>
-		/// <param name="predicate">The condition to test each element against.</param>
-		/// <returns>The zero-based index of the first matching element, or -1 if no element is found.</returns>
-		public static int IndexOf<T>(this IEnumerable<T> source, Func<T, bool> predicate)
-		{
-			var index = 0;
+		return InternalTryAdd();
+	}
 
-			foreach (var t in source)
-			{
-				if (predicate(t))
-					return index;
+	/// <summary>
+	/// Adds a key-value pair to a dictionary if the key does not already exist.
+	/// </summary>
+	/// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
+	/// <typeparam name="TValue">The type of values in the dictionary.</typeparam>
+	/// <param name="dict">The dictionary to add the pair to.</param>
+	/// <param name="key">The key to add.</param>
+	/// <param name="value">The value to add.</param>
+	/// <returns>True if the pair was added; false if the key already existed.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="dict"/> is null.</exception>
+	public static bool TryAdd2<TKey, TValue>(this IDictionary<TKey, TValue> dict, TKey key, TValue value)
+	{
+		if (dict is null)
+			throw new ArgumentNullException(nameof(dict));
 
-				index++;
-			}
+		bool InternalTryAdd()
+		{
+			if (dict.ContainsKey(key))
+				return false;
 
-			return -1;
+			dict.Add(key, value);
+			return true;
 		}
 
-		/// <summary>
-		/// Adds a range of values to a collection, ensuring no duplicates if the collection already contains them.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the collection.</typeparam>
-		/// <param name="collection">The collection to add values to.</param>
-		/// <param name="values">The values to add.</param>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="values"/> is null.</exception>
-		public static void TryAdd<T>(this ICollection<T> collection, IEnumerable<T> values)
+		if (dict is ISynchronizedCollection sync)
 		{
-			if (values is null)
-				throw new ArgumentNullException(nameof(values));
-
-			void InternalTryAdd()
-			{
-				foreach (var value in values)
-				{
-					if (!collection.Contains(value))
-						collection.Add(value);
-				}
-			}
-
-			if (collection is ISynchronizedCollection sync)
-			{
-				lock (sync.SyncRoot)
-					InternalTryAdd();
-			}
-			else
-			{
-				InternalTryAdd();
-			}
+			lock (sync.SyncRoot)
+				return InternalTryAdd();
 		}
 
-		/// <summary>
-		/// Adds a value to a collection if it does not already exist.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the collection.</typeparam>
-		/// <param name="collection">The collection to add the value to.</param>
-		/// <param name="value">The value to add.</param>
-		/// <returns>True if the value was added; false if it already existed.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="collection"/> is null.</exception>
-		public static bool TryAdd<T>(this ICollection<T> collection, T value)
-		{
-			if (collection is null)
-				throw new ArgumentNullException(nameof(collection));
+		return InternalTryAdd();
+	}
 
-			bool InternalTryAdd()
-			{
-				if (collection.Contains(value))
-					return false;
+	/// <summary>
+	/// Concatenates two collections of the same type into a new instance.
+	/// </summary>
+	/// <typeparam name="T">The type of the collection, which must implement <see cref="ICollection{TItem}"/> and have a parameterless constructor.</typeparam>
+	/// <typeparam name="TItem">The type of elements in the collection.</typeparam>
+	/// <param name="first">The first collection.</param>
+	/// <param name="second">The second collection.</param>
+	/// <returns>A new collection containing all elements from both input collections.</returns>
+	public static T ConcatEx<T, TItem>(this T first, T second)
+		where T : ICollection<TItem>, new()
+	{
+		var retVal = new T();
+		retVal.AddRange(first.Concat(second));
+		return retVal;
+	}
 
-				collection.Add(value);
-				return true;
-			}
+	/// <summary>
+	/// Adds a range of items to a collection, using optimized methods when available.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the collection.</typeparam>
+	/// <param name="source">The collection to add items to.</param>
+	/// <param name="items">The items to add.</param>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="source"/> or <paramref name="items"/> is null.</exception>
+	public static void AddRange<T>(this ICollection<T> source, IEnumerable<T> items)
+	{
+		if (source is null)
+			throw new ArgumentNullException(nameof(source));
 
-			if (collection is ISynchronizedCollection sync)
-			{
-				lock (sync.SyncRoot)
-					return InternalTryAdd();
-			}
+		if (items is null)
+			throw new ArgumentNullException(nameof(items));
 
-			return InternalTryAdd();
+		if (source is List<T> list)
+			list.AddRange(items);
+		else if (source is ICollectionEx<T> ex)
+			ex.AddRange(items);
+		else if (source is ISet<T> set)
+			set.UnionWith(items);
+		else
+		{
+			foreach (var item in items)
+				source.Add(item);
 		}
+	}
 
-		/// <summary>
-		/// Adds a key-value pair to a dictionary if the key does not already exist.
-		/// </summary>
-		/// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
-		/// <typeparam name="TValue">The type of values in the dictionary.</typeparam>
-		/// <param name="dict">The dictionary to add the pair to.</param>
-		/// <param name="key">The key to add.</param>
-		/// <param name="value">The value to add.</param>
-		/// <returns>True if the pair was added; false if the key already existed.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="dict"/> is null.</exception>
-		public static bool TryAdd2<TKey, TValue>(this IDictionary<TKey, TValue> dict, TKey key, TValue value)
-		{
-			if (dict is null)
-				throw new ArgumentNullException(nameof(dict));
+	/// <summary>
+	/// Removes a range of items from a collection, using optimized methods when available.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the collection.</typeparam>
+	/// <param name="source">The collection to remove items from.</param>
+	/// <param name="items">The items to remove.</param>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="items"/> is null.</exception>
+	public static void RemoveRange<T>(this ICollection<T> source, IEnumerable<T> items)
+	{
+		if (items is null)
+			throw new ArgumentNullException(nameof(items));
 
-			bool InternalTryAdd()
-			{
-				if (dict.ContainsKey(key))
-					return false;
+		if (source is ICollectionEx<T> ex)
+			ex.RemoveRange(items);
+		else
+			items.ForEach(i => source.Remove(i));
+	}
 
-				dict.Add(key, value);
-				return true;
-			}
+	/// <summary>
+	/// Removes items from a list that match a specified filter and adjusts the list size.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the list.</typeparam>
+	/// <param name="list">The list to remove items from.</param>
+	/// <param name="filter">The condition to identify items to remove.</param>
+	/// <returns>The number of items removed.</returns>
+	public static int RemoveWhere2<T>(this IList<T> list, Func<T, bool> filter)
+	{
+		// https://referencesource.microsoft.com/#mscorlib/system/collections/generic/list.cs,82567b42bbfc416e,references
 
-			if (dict is ISynchronizedCollection sync)
-			{
-				lock (sync.SyncRoot)
-					return InternalTryAdd();
-			}
+		var newLen = 0;
+		var len = list.Count;
 
-			return InternalTryAdd();
-		}
+		// Find the first item which needs to be removed.
+		while(newLen < len && !filter(list[newLen]))
+			newLen++;
 
-		/// <summary>
-		/// Concatenates two collections of the same type into a new instance.
-		/// </summary>
-		/// <typeparam name="T">The type of the collection, which must implement <see cref="ICollection{TItem}"/> and have a parameterless constructor.</typeparam>
-		/// <typeparam name="TItem">The type of elements in the collection.</typeparam>
-		/// <param name="first">The first collection.</param>
-		/// <param name="second">The second collection.</param>
-		/// <returns>A new collection containing all elements from both input collections.</returns>
-		public static T ConcatEx<T, TItem>(this T first, T second)
-			where T : ICollection<TItem>, new()
-		{
-			var retVal = new T();
-			retVal.AddRange(first.Concat(second));
-			return retVal;
-		}
+		if(newLen >= len)
+			return 0;
 
-		/// <summary>
-		/// Adds a range of items to a collection, using optimized methods when available.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the collection.</typeparam>
-		/// <param name="source">The collection to add items to.</param>
-		/// <param name="items">The items to add.</param>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="source"/> or <paramref name="items"/> is null.</exception>
-		public static void AddRange<T>(this ICollection<T> source, IEnumerable<T> items)
-		{
-			if (source is null)
-				throw new ArgumentNullException(nameof(source));
-
-			if (items is null)
-				throw new ArgumentNullException(nameof(items));
-
-			if (source is List<T> list)
-				list.AddRange(items);
-			else if (source is ICollectionEx<T> ex)
-				ex.AddRange(items);
-			else if (source is ISet<T> set)
-				set.UnionWith(items);
-			else
-			{
-				foreach (var item in items)
-					source.Add(item);
-			}
-		}
+		var current = newLen + 1;
 
-		/// <summary>
-		/// Removes a range of items from a collection, using optimized methods when available.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the collection.</typeparam>
-		/// <param name="source">The collection to remove items from.</param>
-		/// <param name="items">The items to remove.</param>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="items"/> is null.</exception>
-		public static void RemoveRange<T>(this ICollection<T> source, IEnumerable<T> items)
+		while(current < len)
 		{
-			if (items is null)
-				throw new ArgumentNullException(nameof(items));
+			// Find the first item which needs to be kept.
+			while(current < len && filter(list[current]))
+				current++;
 
-			if (source is ICollectionEx<T> ex)
-				ex.RemoveRange(items);
-			else
-				items.ForEach(i => source.Remove(i));
+			if(current < len) {
+				// copy item to the free slot.
+				list[newLen++] = list[current++];
+			}
 		}
 
-		/// <summary>
-		/// Removes items from a list that match a specified filter and adjusts the list size.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the list.</typeparam>
-		/// <param name="list">The list to remove items from.</param>
-		/// <param name="filter">The condition to identify items to remove.</param>
-		/// <returns>The number of items removed.</returns>
-		public static int RemoveWhere2<T>(this IList<T> list, Func<T, bool> filter)
-		{
-			// https://referencesource.microsoft.com/#mscorlib/system/collections/generic/list.cs,82567b42bbfc416e,references
+		while(list.Count > newLen)
+			list.RemoveAt(list.Count - 1);
 
-			var newLen = 0;
-			var len = list.Count;
+		return len - newLen;
+	}
 
-			// Find the first item which needs to be removed.
-			while(newLen < len && !filter(list[newLen]))
-				newLen++;
+	/// <summary>
+	/// Removes items from a collection that match a specified filter and returns the removed items.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the collection.</typeparam>
+	/// <param name="collection">The collection to remove items from.</param>
+	/// <param name="filter">The condition to identify items to remove.</param>
+	/// <returns>An enumerable of the removed items.</returns>
+	public static IEnumerable<T> RemoveWhere<T>(this ICollection<T> collection, Func<T, bool> filter)
+	{
+		var removingItems = collection.Where(filter).ToArray();
 
-			if(newLen >= len)
-				return 0;
+		foreach (var t in removingItems)
+			collection.Remove(t);
 
-			var current = newLen + 1;
+		return removingItems;
+	}
 
-			while(current < len)
-			{
-				// Find the first item which needs to be kept.
-				while(current < len && filter(list[current]))
-					current++;
+	/// <summary>
+	/// Flattens a sequence of sequences into a single sequence.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the sequences.</typeparam>
+	/// <param name="values">The sequence of sequences to flatten.</param>
+	/// <returns>A single sequence containing all elements from the input sequences.</returns>
+	public static IEnumerable<T> SelectMany<T>(this IEnumerable<IEnumerable<T>> values)
+	{
+		return values.SelectMany(value => value);
+	}
 
-				if(current < len) {
-					// copy item to the free slot.
-					list[newLen++] = list[current++];
-				}
-			}
+	/// <summary>
+	/// Orders a sequence of values in ascending order using the default comparer.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the sequence.</typeparam>
+	/// <param name="values">The sequence to order.</param>
+	/// <returns>An ordered sequence of the input values.</returns>
+	public static IEnumerable<T> OrderBy<T>(this IEnumerable<T> values)
+	{
+		return values.OrderBy(value => value);
+	}
 
-			while(list.Count > newLen)
-				list.RemoveAt(list.Count - 1);
+	/// <summary>
+	/// Orders a sequence of values in descending order using the default comparer.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the sequence.</typeparam>
+	/// <param name="values">The sequence to order.</param>
+	/// <returns>An ordered sequence of the input values in descending order.</returns>
+	public static IEnumerable<T> OrderByDescending<T>(this IEnumerable<T> values)
+	{
+		return values.OrderByDescending(value => value);
+	}
 
-			return len - newLen;
-		}
+	/// <summary>
+	/// Computes a hash code for a sequence of elements.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the sequence.</typeparam>
+	/// <param name="collection">The sequence to compute the hash code for.</param>
+	/// <returns>A hash code for the sequence.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="collection"/> is null.</exception>
+	public static int GetHashCodeEx<T>(this IEnumerable<T> collection)
+	{
+		if (collection is null)
+			throw new ArgumentNullException(nameof(collection));
 
-		/// <summary>
-		/// Removes items from a collection that match a specified filter and returns the removed items.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the collection.</typeparam>
-		/// <param name="collection">The collection to remove items from.</param>
-		/// <param name="filter">The condition to identify items to remove.</param>
-		/// <returns>An enumerable of the removed items.</returns>
-		public static IEnumerable<T> RemoveWhere<T>(this ICollection<T> collection, Func<T, bool> filter)
+		unchecked
 		{
-			var removingItems = collection.Where(filter).ToArray();
+			var hash = 0;
 
-			foreach (var t in removingItems)
-				collection.Remove(t);
+			var index = 0;
+			foreach (var item in collection)
+				hash ^= (31 ^ index++) * (item?.GetHashCode() ?? 0);
 
-			return removingItems;
+			hash %= 2 ^ 32;
+			return hash;
 		}
+	}
 
-		/// <summary>
-		/// Flattens a sequence of sequences into a single sequence.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the sequences.</typeparam>
-		/// <param name="values">The sequence of sequences to flatten.</param>
-		/// <returns>A single sequence containing all elements from the input sequences.</returns>
-		public static IEnumerable<T> SelectMany<T>(this IEnumerable<IEnumerable<T>> values)
-		{
-			return values.SelectMany(value => value);
-		}
+	/// <summary>
+	/// Determines whether a sequence contains any null items.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the sequence, which must be a reference type.</typeparam>
+	/// <param name="items">The sequence to check.</param>
+	/// <returns>True if the sequence contains null; otherwise, false.</returns>
+	public static bool HasNullItem<T>(this IEnumerable<T> items)
+		where T : class
+	{
+		return items.Contains(null);
+	}
 
-		/// <summary>
-		/// Orders a sequence of values in ascending order using the default comparer.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the sequence.</typeparam>
-		/// <param name="values">The sequence to order.</param>
-		/// <returns>An ordered sequence of the input values.</returns>
-		public static IEnumerable<T> OrderBy<T>(this IEnumerable<T> values)
+	/// <summary>
+	/// Copies all items from a collection to an array and clears the collection.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the collection.</typeparam>
+	/// <param name="items">The collection to copy and clear.</param>
+	/// <returns>An array containing the copied items.</returns>
+	public static T[] CopyAndClear<T>(this ICollection<T> items)
+	{
+		T[] InternalCopyAndClear()
 		{
-			return values.OrderBy(value => value);
+			var retVal = items.ToArray();
+			items.Clear();
+			return retVal;
 		}
 
-		/// <summary>
-		/// Orders a sequence of values in descending order using the default comparer.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the sequence.</typeparam>
-		/// <param name="values">The sequence to order.</param>
-		/// <returns>An ordered sequence of the input values in descending order.</returns>
-		public static IEnumerable<T> OrderByDescending<T>(this IEnumerable<T> values)
+		if (items is not ISynchronizedCollection sync) return InternalCopyAndClear();
+
+		lock (sync.SyncRoot)
+			return InternalCopyAndClear();
+	}
+
+	/// <summary>
+	/// Retrieves a value from a dictionary by key and removes the key-value pair.
+	/// </summary>
+	/// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
+	/// <typeparam name="TValue">The type of values in the dictionary.</typeparam>
+	/// <param name="dict">The dictionary to operate on.</param>
+	/// <param name="key">The key of the value to retrieve and remove.</param>
+	/// <returns>The value associated with the key.</returns>
+	public static TValue GetAndRemove<TKey, TValue>(this IDictionary<TKey, TValue> dict, TKey key)
+	{
+		TValue InternalGetAndRemove()
 		{
-			return values.OrderByDescending(value => value);
+			var value = dict[key];
+			dict.Remove(key);
+			return value;
 		}
 
-		/// <summary>
-		/// Computes a hash code for a sequence of elements.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the sequence.</typeparam>
-		/// <param name="collection">The sequence to compute the hash code for.</param>
-		/// <returns>A hash code for the sequence.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="collection"/> is null.</exception>
-		public static int GetHashCodeEx<T>(this IEnumerable<T> collection)
-		{
-			if (collection is null)
-				throw new ArgumentNullException(nameof(collection));
+		if (dict is not ISynchronizedCollection sync) return InternalGetAndRemove();
 
-			unchecked
-			{
-				var hash = 0;
+		lock (sync.SyncRoot)
+			return InternalGetAndRemove();
+	}
 
-				var index = 0;
-				foreach (var item in collection)
-					hash ^= (31 ^ index++) * (item?.GetHashCode() ?? 0);
+	/// <summary>
+	/// Attempts to retrieve a value from a dictionary by key and remove it, returning null if not found (for value types).
+	/// </summary>
+	/// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
+	/// <typeparam name="TValue">The type of values in the dictionary, which must be a value type.</typeparam>
+	/// <param name="dict">The dictionary to operate on.</param>
+	/// <param name="key">The key of the value to retrieve and remove.</param>
+	/// <returns>The value if found and removed; otherwise, null.</returns>
+	public static TValue? TryGetAndRemove2<TKey, TValue>(this IDictionary<TKey, TValue> dict, TKey key)
+		where TValue : struct
+	{
+		return dict.TryGetAndRemove(key, out var value) ? value : (TValue?)null;
+	}
 
-				hash %= 2 ^ 32;
-				return hash;
-			}
-		}
+	/// <summary>
+	/// Attempts to retrieve a value from a dictionary by key and remove it, returning the default value if not found.
+	/// </summary>
+	/// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
+	/// <typeparam name="TValue">The type of values in the dictionary.</typeparam>
+	/// <param name="dict">The dictionary to operate on.</param>
+	/// <param name="key">The key of the value to retrieve and remove.</param>
+	/// <returns>The value if found and removed; otherwise, the default value of <typeparamref name="TValue"/>.</returns>
+	public static TValue TryGetAndRemove<TKey, TValue>(this IDictionary<TKey, TValue> dict, TKey key)
+	{
+		return dict.TryGetAndRemove(key, out var value) ? value : default;
+	}
 
-		/// <summary>
-		/// Determines whether a sequence contains any null items.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the sequence, which must be a reference type.</typeparam>
-		/// <param name="items">The sequence to check.</param>
-		/// <returns>True if the sequence contains null; otherwise, false.</returns>
-		public static bool HasNullItem<T>(this IEnumerable<T> items)
-			where T : class
+	/// <summary>
+	/// Attempts to retrieve a value from a dictionary by key and remove it, indicating success.
+	/// </summary>
+	/// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
+	/// <typeparam name="TValue">The type of values in the dictionary.</typeparam>
+	/// <param name="dict">The dictionary to operate on.</param>
+	/// <param name="key">The key of the value to retrieve and remove.</param>
+	/// <param name="value">When this method returns, contains the value if found; otherwise, the default value.</param>
+	/// <returns>True if the value was found and removed; otherwise, false.</returns>
+	public static bool TryGetAndRemove<TKey, TValue>(this IDictionary<TKey, TValue> dict, TKey key, out TValue value)
+	{
+		bool InternalTryGetAndRemove(out TValue value2)
 		{
-			return items.Contains(null);
+			if (!dict.TryGetValue(key, out value2))
+				return false;
+
+			dict.Remove(key);
+			return true;
 		}
 
-		/// <summary>
-		/// Copies all items from a collection to an array and clears the collection.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the collection.</typeparam>
-		/// <param name="items">The collection to copy and clear.</param>
-		/// <returns>An array containing the copied items.</returns>
-		public static T[] CopyAndClear<T>(this ICollection<T> items)
+		if (dict is ISynchronizedCollection sync)
 		{
-			T[] InternalCopyAndClear()
-			{
-				var retVal = items.ToArray();
-				items.Clear();
-				return retVal;
-			}
-
-			if (items is not ISynchronizedCollection sync) return InternalCopyAndClear();
-
 			lock (sync.SyncRoot)
-				return InternalCopyAndClear();
+				return InternalTryGetAndRemove(out value);
 		}
 
-		/// <summary>
-		/// Retrieves a value from a dictionary by key and removes the key-value pair.
-		/// </summary>
-		/// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
-		/// <typeparam name="TValue">The type of values in the dictionary.</typeparam>
-		/// <param name="dict">The dictionary to operate on.</param>
-		/// <param name="key">The key of the value to retrieve and remove.</param>
-		/// <returns>The value associated with the key.</returns>
-		public static TValue GetAndRemove<TKey, TValue>(this IDictionary<TKey, TValue> dict, TKey key)
-		{
-			TValue InternalGetAndRemove()
-			{
-				var value = dict[key];
-				dict.Remove(key);
-				return value;
-			}
+		return InternalTryGetAndRemove(out value);
+	}
 
-			if (dict is not ISynchronizedCollection sync) return InternalGetAndRemove();
+	/// <summary>
+	/// Retrieves an element from a sequence counting from the end.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the sequence.</typeparam>
+	/// <param name="source">The sequence to query.</param>
+	/// <param name="index">The zero-based index from the end (0 is the last element).</param>
+	/// <returns>The element at the specified position from the end.</returns>
+	public static T ElementAtFromEnd<T>(this IEnumerable<T> source, int index)
+	{
+		return source.ElementAt(source.GetIndexFromEnd(index));
+	}
 
-			lock (sync.SyncRoot)
-				return InternalGetAndRemove();
-		}
+	/// <summary>
+	/// Retrieves an element from a sequence counting from the end, or the default value if out of range.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the sequence.</typeparam>
+	/// <param name="source">The sequence to query.</param>
+	/// <param name="index">The zero-based index from the end (0 is the last element).</param>
+	/// <returns>The element at the specified position from the end, or the default value if out of range.</returns>
+	public static T ElementAtFromEndOrDefault<T>(this IEnumerable<T> source, int index)
+	{
+		return source.ElementAtOrDefault(source.GetIndexFromEnd(index));
+	}
 
-		/// <summary>
-		/// Attempts to retrieve a value from a dictionary by key and remove it, returning null if not found (for value types).
-		/// </summary>
-		/// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
-		/// <typeparam name="TValue">The type of values in the dictionary, which must be a value type.</typeparam>
-		/// <param name="dict">The dictionary to operate on.</param>
-		/// <param name="key">The key of the value to retrieve and remove.</param>
-		/// <returns>The value if found and removed; otherwise, null.</returns>
-		public static TValue? TryGetAndRemove2<TKey, TValue>(this IDictionary<TKey, TValue> dict, TKey key)
-			where TValue : struct
-		{
-			return dict.TryGetAndRemove(key, out var value) ? value : (TValue?)null;
-		}
+	/// <summary>
+	/// Calculates the index from the start of a sequence given an index from the end.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the sequence.</typeparam>
+	/// <param name="source">The sequence to query.</param>
+	/// <param name="index">The zero-based index from the end.</param>
+	/// <returns>The zero-based index from the start.</returns>
+	private static int GetIndexFromEnd<T>(this IEnumerable<T> source, int index)
+	{
+		return source.Count() - 1 - index;
+	}
 
-		/// <summary>
-		/// Attempts to retrieve a value from a dictionary by key and remove it, returning the default value if not found.
-		/// </summary>
-		/// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
-		/// <typeparam name="TValue">The type of values in the dictionary.</typeparam>
-		/// <param name="dict">The dictionary to operate on.</param>
-		/// <param name="key">The key of the value to retrieve and remove.</param>
-		/// <returns>The value if found and removed; otherwise, the default value of <typeparamref name="TValue"/>.</returns>
-		public static TValue TryGetAndRemove<TKey, TValue>(this IDictionary<TKey, TValue> dict, TKey key)
-		{
-			return dict.TryGetAndRemove(key, out var value) ? value : default;
-		}
-
-		/// <summary>
-		/// Attempts to retrieve a value from a dictionary by key and remove it, indicating success.
-		/// </summary>
-		/// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
-		/// <typeparam name="TValue">The type of values in the dictionary.</typeparam>
-		/// <param name="dict">The dictionary to operate on.</param>
-		/// <param name="key">The key of the value to retrieve and remove.</param>
-		/// <param name="value">When this method returns, contains the value if found; otherwise, the default value.</param>
-		/// <returns>True if the value was found and removed; otherwise, false.</returns>
-		public static bool TryGetAndRemove<TKey, TValue>(this IDictionary<TKey, TValue> dict, TKey key, out TValue value)
-		{
-			bool InternalTryGetAndRemove(out TValue value2)
-			{
-				if (!dict.TryGetValue(key, out value2))
-					return false;
-
-				dict.Remove(key);
-				return true;
-			}
-
-			if (dict is ISynchronizedCollection sync)
-			{
-				lock (sync.SyncRoot)
-					return InternalTryGetAndRemove(out value);
-			}
-
-			return InternalTryGetAndRemove(out value);
-		}
-
-		/// <summary>
-		/// Retrieves an element from a sequence counting from the end.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the sequence.</typeparam>
-		/// <param name="source">The sequence to query.</param>
-		/// <param name="index">The zero-based index from the end (0 is the last element).</param>
-		/// <returns>The element at the specified position from the end.</returns>
-		public static T ElementAtFromEnd<T>(this IEnumerable<T> source, int index)
-		{
-			return source.ElementAt(source.GetIndexFromEnd(index));
-		}
+	/// <summary>
+	/// Retrieves an element from a linked list counting from the end.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the linked list.</typeparam>
+	/// <param name="list">The linked list to query.</param>
+	/// <param name="index">The zero-based index from the end (0 is the last element).</param>
+	/// <returns>The element at the specified position from the end.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="list"/> is null.</exception>
+	/// <exception cref="ArgumentOutOfRangeException">Thrown when the list is empty or the index is out of range.</exception>
+	public static T ElementAtFromEnd<T>(this LinkedList<T> list, int index)
+	{
+		if (list is null)
+			throw new ArgumentNullException(nameof(list));
 
-		/// <summary>
-		/// Retrieves an element from a sequence counting from the end, or the default value if out of range.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the sequence.</typeparam>
-		/// <param name="source">The sequence to query.</param>
-		/// <param name="index">The zero-based index from the end (0 is the last element).</param>
-		/// <returns>The element at the specified position from the end, or the default value if out of range.</returns>
-		public static T ElementAtFromEndOrDefault<T>(this IEnumerable<T> source, int index)
-		{
-			return source.ElementAtOrDefault(source.GetIndexFromEnd(index));
-		}
+		if (list.IsEmpty())
+			throw new ArgumentOutOfRangeException(nameof(list));
 
-		/// <summary>
-		/// Calculates the index from the start of a sequence given an index from the end.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the sequence.</typeparam>
-		/// <param name="source">The sequence to query.</param>
-		/// <param name="index">The zero-based index from the end.</param>
-		/// <returns>The zero-based index from the start.</returns>
-		private static int GetIndexFromEnd<T>(this IEnumerable<T> source, int index)
-		{
-			return source.Count() - 1 - index;
-		}
+		var curr = list.Last;
 
-		/// <summary>
-		/// Retrieves an element from a linked list counting from the end.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the linked list.</typeparam>
-		/// <param name="list">The linked list to query.</param>
-		/// <param name="index">The zero-based index from the end (0 is the last element).</param>
-		/// <returns>The element at the specified position from the end.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="list"/> is null.</exception>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown when the list is empty or the index is out of range.</exception>
-		public static T ElementAtFromEnd<T>(this LinkedList<T> list, int index)
+		while (index > 0)
 		{
-			if (list is null)
-				throw new ArgumentNullException(nameof(list));
+			curr = curr.Previous;
+			index--;
 
-			if (list.IsEmpty())
+			if (curr is null)
 				throw new ArgumentOutOfRangeException(nameof(list));
+		}
 
-			var curr = list.Last;
+		return curr.Value;
+	}
 
-			while (index > 0)
-			{
-				curr = curr.Previous;
-				index--;
+	/// <summary>
+	/// Retrieves an element from a synchronized linked list counting from the end.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the linked list.</typeparam>
+	/// <param name="list">The synchronized linked list to query.</param>
+	/// <param name="index">The zero-based index from the end (0 is the last element).</param>
+	/// <returns>The element at the specified position from the end.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="list"/> is null.</exception>
+	/// <exception cref="ArgumentOutOfRangeException">Thrown when the list is empty or the index is out of range.</exception>
+	public static T ElementAtFromEnd<T>(this SynchronizedLinkedList<T> list, int index)
+	{
+		if (list is null)
+			throw new ArgumentNullException(nameof(list));
 
-				if (curr is null)
-					throw new ArgumentOutOfRangeException(nameof(list));
-			}
+		if (list.IsEmpty())
+			throw new ArgumentOutOfRangeException(nameof(list));
 
-			return curr.Value;
-		}
+		var curr = list.Last;
 
-		/// <summary>
-		/// Retrieves an element from a synchronized linked list counting from the end.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the linked list.</typeparam>
-		/// <param name="list">The synchronized linked list to query.</param>
-		/// <param name="index">The zero-based index from the end (0 is the last element).</param>
-		/// <returns>The element at the specified position from the end.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="list"/> is null.</exception>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown when the list is empty or the index is out of range.</exception>
-		public static T ElementAtFromEnd<T>(this SynchronizedLinkedList<T> list, int index)
+		while (index > 0)
 		{
-			if (list is null)
-				throw new ArgumentNullException(nameof(list));
+			curr = curr.Previous;
+			index--;
 
-			if (list.IsEmpty())
+			if (curr is null)
 				throw new ArgumentOutOfRangeException(nameof(list));
+		}
 
-			var curr = list.Last;
+		return curr.Value;
+	}
 
-			while (index > 0)
-			{
-				curr = curr.Previous;
-				index--;
+	/// <summary>
+	/// Retrieves an element from a linked list counting from the end, or the default value if out of range.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the linked list.</typeparam>
+	/// <param name="list">The linked list to query.</param>
+	/// <param name="index">The zero-based index from the end (0 is the last element).</param>
+	/// <returns>The element at the specified position from the end, or the default value if out of range.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="list"/> is null.</exception>
+	public static T ElementAtFromEndOrDefault<T>(this LinkedList<T> list, int index)
+	{
+		if (list is null)
+			throw new ArgumentNullException(nameof(list));
 
-				if (curr is null)
-					throw new ArgumentOutOfRangeException(nameof(list));
-			}
+		var curr = list.Last;
 
-			return curr.Value;
+		while (index > 0 && curr != null)
+		{
+			curr = curr.Previous;
+			index--;
 		}
 
-		/// <summary>
-		/// Retrieves an element from a linked list counting from the end, or the default value if out of range.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the linked list.</typeparam>
-		/// <param name="list">The linked list to query.</param>
-		/// <param name="index">The zero-based index from the end (0 is the last element).</param>
-		/// <returns>The element at the specified position from the end, or the default value if out of range.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="list"/> is null.</exception>
-		public static T ElementAtFromEndOrDefault<T>(this LinkedList<T> list, int index)
-		{
-			if (list is null)
-				throw new ArgumentNullException(nameof(list));
+		return curr is null ? default : curr.Value;
+	}
 
-			var curr = list.Last;
+	/// <summary>
+	/// Retrieves an element from a synchronized linked list counting from the end, or the default value if out of range.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the linked list.</typeparam>
+	/// <param name="list">The synchronized linked list to query.</param>
+	/// <param name="index">The zero-based index from the end (0 is the last element).</param>
+	/// <returns>The element at the specified position from the end, or the default value if out of range.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="list"/> is null.</exception>
+	public static T ElementAtFromEndOrDefault<T>(this SynchronizedLinkedList<T> list, int index)
+	{
+		if (list is null)
+			throw new ArgumentNullException(nameof(list));
 
-			while (index > 0 && curr != null)
-			{
-				curr = curr.Previous;
-				index--;
-			}
+		var curr = list.Last;
 
-			return curr is null ? default : curr.Value;
+		while (index > 0 && curr != null)
+		{
+			curr = curr.Previous;
+			index--;
 		}
 
-		/// <summary>
-		/// Retrieves an element from a synchronized linked list counting from the end, or the default value if out of range.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the linked list.</typeparam>
-		/// <param name="list">The synchronized linked list to query.</param>
-		/// <param name="index">The zero-based index from the end (0 is the last element).</param>
-		/// <returns>The element at the specified position from the end, or the default value if out of range.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="list"/> is null.</exception>
-		public static T ElementAtFromEndOrDefault<T>(this SynchronizedLinkedList<T> list, int index)
-		{
-			if (list is null)
-				throw new ArgumentNullException(nameof(list));
+		return curr is null ? default : curr.Value;
+	}
 
-			var curr = list.Last;
+	/// <summary>
+	/// Converts a sequence of key-value pairs into a <see cref="PairSet{TKey, TValue}"/> with the default equality comparer.
+	/// </summary>
+	/// <typeparam name="TKey">The type of keys.</typeparam>
+	/// <typeparam name="TValue">The type of values.</typeparam>
+	/// <param name="source">The sequence of key-value pairs.</param>
+	/// <returns>A <see cref="PairSet{TKey, TValue}"/> containing the key-value pairs.</returns>
+	public static PairSet<TKey, TValue> ToPairSet<TKey, TValue>(this IEnumerable<KeyValuePair<TKey, TValue>> source)
+	{
+		return source.ToPairSet(System.Collections.Generic.EqualityComparer<TKey>.Default);
+	}
 
-			while (index > 0 && curr != null)
-			{
-				curr = curr.Previous;
-				index--;
-			}
+	/// <summary>
+	/// Converts a sequence of key-value pairs into a <see cref="PairSet{TKey, TValue}"/> with a specified equality comparer.
+	/// </summary>
+	/// <typeparam name="TKey">The type of keys.</typeparam>
+	/// <typeparam name="TValue">The type of values.</typeparam>
+	/// <param name="source">The sequence of key-value pairs.</param>
+	/// <param name="comparer">The equality comparer for keys.</param>
+	/// <returns>A <see cref="PairSet{TKey, TValue}"/> containing the key-value pairs.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="source"/> is null.</exception>
+	public static PairSet<TKey, TValue> ToPairSet<TKey, TValue>(this IEnumerable<KeyValuePair<TKey, TValue>> source, IEqualityComparer<TKey> comparer)
+	{
+		if (source is null)
+			throw new ArgumentNullException(nameof(source));
 
-			return curr is null ? default : curr.Value;
-		}
+		var set = new PairSet<TKey, TValue>(comparer);
 
-		/// <summary>
-		/// Converts a sequence of key-value pairs into a <see cref="PairSet{TKey, TValue}"/> with the default equality comparer.
-		/// </summary>
-		/// <typeparam name="TKey">The type of keys.</typeparam>
-		/// <typeparam name="TValue">The type of values.</typeparam>
-		/// <param name="source">The sequence of key-value pairs.</param>
-		/// <returns>A <see cref="PairSet{TKey, TValue}"/> containing the key-value pairs.</returns>
-		public static PairSet<TKey, TValue> ToPairSet<TKey, TValue>(this IEnumerable<KeyValuePair<TKey, TValue>> source)
+		foreach (var item in source)
 		{
-			return source.ToPairSet(System.Collections.Generic.EqualityComparer<TKey>.Default);
+			set.Add(item.Key, item.Value);
 		}
 
-		/// <summary>
-		/// Converts a sequence of key-value pairs into a <see cref="PairSet{TKey, TValue}"/> with a specified equality comparer.
-		/// </summary>
-		/// <typeparam name="TKey">The type of keys.</typeparam>
-		/// <typeparam name="TValue">The type of values.</typeparam>
-		/// <param name="source">The sequence of key-value pairs.</param>
-		/// <param name="comparer">The equality comparer for keys.</param>
-		/// <returns>A <see cref="PairSet{TKey, TValue}"/> containing the key-value pairs.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="source"/> is null.</exception>
-		public static PairSet<TKey, TValue> ToPairSet<TKey, TValue>(this IEnumerable<KeyValuePair<TKey, TValue>> source, IEqualityComparer<TKey> comparer)
-		{
-			if (source is null)
-				throw new ArgumentNullException(nameof(source));
+		return set;
+	}
 
-			var set = new PairSet<TKey, TValue>(comparer);
+	/// <summary>
+	/// Converts a sequence into a <see cref="PairSet{TKey, TValue}"/> using selector functions for keys and values.
+	/// </summary>
+	/// <typeparam name="TSource">The type of elements in the source sequence.</typeparam>
+	/// <typeparam name="TKey">The type of keys.</typeparam>
+	/// <typeparam name="TValue">The type of values.</typeparam>
+	/// <param name="source">The source sequence.</param>
+	/// <param name="keySelector">The function to extract keys from elements.</param>
+	/// <param name="valueSelector">The function to extract values from elements.</param>
+	/// <returns>A <see cref="PairSet{TKey, TValue}"/> containing the transformed key-value pairs.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="source"/>, <paramref name="keySelector"/>, or <paramref name="valueSelector"/> is null.</exception>
+	public static PairSet<TKey, TValue> ToPairSet<TSource, TKey, TValue>(this IEnumerable<TSource> source, Func<TSource, int, TKey> keySelector, Func<TSource, int, TValue> valueSelector)
+	{
+		if (source is null)
+			throw new ArgumentNullException(nameof(source));
 
-			foreach (var item in source)
-			{
-				set.Add(item.Key, item.Value);
-			}
+		if (keySelector is null)
+			throw new ArgumentNullException(nameof(keySelector));
 
-			return set;
-		}
+		if (valueSelector is null)
+			throw new ArgumentNullException(nameof(valueSelector));
 
-		/// <summary>
-		/// Converts a sequence into a <see cref="PairSet{TKey, TValue}"/> using selector functions for keys and values.
-		/// </summary>
-		/// <typeparam name="TSource">The type of elements in the source sequence.</typeparam>
-		/// <typeparam name="TKey">The type of keys.</typeparam>
-		/// <typeparam name="TValue">The type of values.</typeparam>
-		/// <param name="source">The source sequence.</param>
-		/// <param name="keySelector">The function to extract keys from elements.</param>
-		/// <param name="valueSelector">The function to extract values from elements.</param>
-		/// <returns>A <see cref="PairSet{TKey, TValue}"/> containing the transformed key-value pairs.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="source"/>, <paramref name="keySelector"/>, or <paramref name="valueSelector"/> is null.</exception>
-		public static PairSet<TKey, TValue> ToPairSet<TSource, TKey, TValue>(this IEnumerable<TSource> source, Func<TSource, int, TKey> keySelector, Func<TSource, int, TValue> valueSelector)
-		{
-			if (source is null)
-				throw new ArgumentNullException(nameof(source));
+		var set = new PairSet<TKey, TValue>();
 
-			if (keySelector is null)
-				throw new ArgumentNullException(nameof(keySelector));
+		var index = 0;
 
-			if (valueSelector is null)
-				throw new ArgumentNullException(nameof(valueSelector));
+		foreach (var item in source)
+		{
+			set.Add(keySelector(item, index), valueSelector(item, index));
+			index++;
+		}
 
-			var set = new PairSet<TKey, TValue>();
+		return set;
+	}
 
-			var index = 0;
+	#region Dictionary Methods
 
-			foreach (var item in source)
-			{
-				set.Add(keySelector(item, index), valueSelector(item, index));
-				index++;
-			}
+	/// <summary>
+	/// Copies key-value pairs from a sequence to a dictionary.
+	/// </summary>
+	/// <typeparam name="TKey">The type of keys.</typeparam>
+	/// <typeparam name="TValue">The type of values.</typeparam>
+	/// <param name="source">The sequence of key-value pairs.</param>
+	/// <param name="destination">The dictionary to copy to.</param>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="source"/> or <paramref name="destination"/> is null.</exception>
+	public static void CopyTo<TKey, TValue>(this IEnumerable<KeyValuePair<TKey, TValue>> source, IDictionary<TKey, TValue> destination)
+	{
+		if (source is null)
+			throw new ArgumentNullException(nameof(source));
 
-			return set;
-		}
+		if (destination is null)
+			throw new ArgumentNullException(nameof(destination));
 
-		#region Dictionary Methods
+		foreach (var pair in source)
+			destination.Add(pair);
+	}
 
-		/// <summary>
-		/// Copies key-value pairs from a sequence to a dictionary.
-		/// </summary>
-		/// <typeparam name="TKey">The type of keys.</typeparam>
-		/// <typeparam name="TValue">The type of values.</typeparam>
-		/// <param name="source">The sequence of key-value pairs.</param>
-		/// <param name="destination">The dictionary to copy to.</param>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="source"/> or <paramref name="destination"/> is null.</exception>
-		public static void CopyTo<TKey, TValue>(this IEnumerable<KeyValuePair<TKey, TValue>> source, IDictionary<TKey, TValue> destination)
-		{
-			if (source is null)
-				throw new ArgumentNullException(nameof(source));
+	/// <summary>
+	/// Converts a non-generic dictionary to a strongly-typed dictionary.
+	/// </summary>
+	/// <typeparam name="TKey">The type of keys.</typeparam>
+	/// <typeparam name="TValue">The type of values.</typeparam>
+	/// <param name="dictionary">The non-generic dictionary.</param>
+	/// <returns>A strongly-typed dictionary with the same key-value pairs.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="dictionary"/> is null.</exception>
+	public static IDictionary<TKey, TValue> TypedAs<TKey, TValue>(this IDictionary dictionary)
+	{
+		if (dictionary is null)
+			throw new ArgumentNullException(nameof(dictionary));
 
-			if (destination is null)
-				throw new ArgumentNullException(nameof(destination));
+		return dictionary.Cast<DictionaryEntry>().ToDictionary(item => item.Key.To<TKey>(), item => item.Value.To<TValue>());
+	}
 
-			foreach (var pair in source)
-				destination.Add(pair);
-		}
+	/// <summary>
+	/// Converts a sequence of key-value pairs to a dictionary using the default equality comparer.
+	/// </summary>
+	/// <typeparam name="TKey">The type of keys.</typeparam>
+	/// <typeparam name="TValue">The type of values.</typeparam>
+	/// <param name="source">The sequence of key-value pairs.</param>
+	/// <returns>A dictionary containing the key-value pairs.</returns>
+	public static IDictionary<TKey, TValue> ToDictionary<TKey, TValue>(this IEnumerable<KeyValuePair<TKey, TValue>> source)
+	{
+		return source.ToDictionary(pair => pair.Key, pair => pair.Value);
+	}
 
-		/// <summary>
-		/// Converts a non-generic dictionary to a strongly-typed dictionary.
-		/// </summary>
-		/// <typeparam name="TKey">The type of keys.</typeparam>
-		/// <typeparam name="TValue">The type of values.</typeparam>
-		/// <param name="dictionary">The non-generic dictionary.</param>
-		/// <returns>A strongly-typed dictionary with the same key-value pairs.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="dictionary"/> is null.</exception>
-		public static IDictionary<TKey, TValue> TypedAs<TKey, TValue>(this IDictionary dictionary)
-		{
-			if (dictionary is null)
-				throw new ArgumentNullException(nameof(dictionary));
+	/// <summary>
+	/// Converts a sequence of key-value pairs to a dictionary with a specified equality comparer.
+	/// </summary>
+	/// <typeparam name="TKey">The type of keys.</typeparam>
+	/// <typeparam name="TValue">The type of values.</typeparam>
+	/// <param name="source">The sequence of key-value pairs.</param>
+	/// <param name="comparer">The equality comparer for keys.</param>
+	/// <returns>A dictionary containing the key-value pairs.</returns>
+	public static IDictionary<TKey, TValue> ToDictionary<TKey, TValue>(this IEnumerable<KeyValuePair<TKey, TValue>> source, IEqualityComparer<TKey> comparer)
+	{
+		return source.ToDictionary(pair => pair.Key, pair => pair.Value, comparer);
+	}
 
-			return dictionary.Cast<DictionaryEntry>().ToDictionary(item => item.Key.To<TKey>(), item => item.Value.To<TValue>());
-		}
+	/// <summary>
+	/// Converts a sequence of tuples to a dictionary using the default equality comparer.
+	/// </summary>
+	/// <typeparam name="TKey">The type of keys.</typeparam>
+	/// <typeparam name="TValue">The type of values.</typeparam>
+	/// <param name="source">The sequence of tuples.</param>
+	/// <returns>A dictionary containing the key-value pairs from the tuples.</returns>
+	public static IDictionary<TKey, TValue> ToDictionary<TKey, TValue>(this IEnumerable<Tuple<TKey, TValue>> source)
+	{
+		return source.ToDictionary(pair => pair.Item1, pair => pair.Item2);
+	}
 
-		/// <summary>
-		/// Converts a sequence of key-value pairs to a dictionary using the default equality comparer.
-		/// </summary>
-		/// <typeparam name="TKey">The type of keys.</typeparam>
-		/// <typeparam name="TValue">The type of values.</typeparam>
-		/// <param name="source">The sequence of key-value pairs.</param>
-		/// <returns>A dictionary containing the key-value pairs.</returns>
-		public static IDictionary<TKey, TValue> ToDictionary<TKey, TValue>(this IEnumerable<KeyValuePair<TKey, TValue>> source)
-		{
-			return source.ToDictionary(pair => pair.Key, pair => pair.Value);
-		}
+	/// <summary>
+	/// Converts a sequence of tuples to a dictionary with a specified equality comparer.
+	/// </summary>
+	/// <typeparam name="TKey">The type of keys.</typeparam>
+	/// <typeparam name="TValue">The type of values.</typeparam>
+	/// <param name="source">The sequence of tuples.</param>
+	/// <param name="comparer">The equality comparer for keys.</param>
+	/// <returns>A dictionary containing the key-value pairs from the tuples.</returns>
+	public static IDictionary<TKey, TValue> ToDictionary<TKey, TValue>(this IEnumerable<Tuple<TKey, TValue>> source, IEqualityComparer<TKey> comparer)
+	{
+		return source.ToDictionary(pair => pair.Item1, pair => pair.Item2, comparer);
+	}
 
-		/// <summary>
-		/// Converts a sequence of key-value pairs to a dictionary with a specified equality comparer.
-		/// </summary>
-		/// <typeparam name="TKey">The type of keys.</typeparam>
-		/// <typeparam name="TValue">The type of values.</typeparam>
-		/// <param name="source">The sequence of key-value pairs.</param>
-		/// <param name="comparer">The equality comparer for keys.</param>
-		/// <returns>A dictionary containing the key-value pairs.</returns>
-		public static IDictionary<TKey, TValue> ToDictionary<TKey, TValue>(this IEnumerable<KeyValuePair<TKey, TValue>> source, IEqualityComparer<TKey> comparer)
-		{
-			return source.ToDictionary(pair => pair.Key, pair => pair.Value, comparer);
-		}
+	/// <summary>
+	/// Converts a key-value pair to a tuple.
+	/// </summary>
+	/// <typeparam name="TKey">The type of the key.</typeparam>
+	/// <typeparam name="TValue">The type of the value.</typeparam>
+	/// <param name="pair">The key-value pair to convert.</param>
+	/// <returns>A tuple containing the key and value.</returns>
+	public static Tuple<TKey, TValue> ToTuple<TKey, TValue>(this KeyValuePair<TKey, TValue> pair)
+	{
+		return Tuple.Create(pair.Key, pair.Value);
+	}
 
-		/// <summary>
-		/// Converts a sequence of tuples to a dictionary using the default equality comparer.
-		/// </summary>
-		/// <typeparam name="TKey">The type of keys.</typeparam>
-		/// <typeparam name="TValue">The type of values.</typeparam>
-		/// <param name="source">The sequence of tuples.</param>
-		/// <returns>A dictionary containing the key-value pairs from the tuples.</returns>
-		public static IDictionary<TKey, TValue> ToDictionary<TKey, TValue>(this IEnumerable<Tuple<TKey, TValue>> source)
-		{
-			return source.ToDictionary(pair => pair.Item1, pair => pair.Item2);
-		}
+	/// <summary>
+	/// Converts a tuple to a key-value pair.
+	/// </summary>
+	/// <typeparam name="TKey">The type of the key.</typeparam>
+	/// <typeparam name="TValue">The type of the value.</typeparam>
+	/// <param name="pair">The tuple to convert.</param>
+	/// <returns>A key-value pair containing the tuple's items.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="pair"/> is null.</exception>
+	public static KeyValuePair<TKey, TValue> ToPair<TKey, TValue>(this Tuple<TKey, TValue> pair)
+	{
+		if (pair is null)
+			throw new ArgumentNullException(nameof(pair));
 
-		/// <summary>
-		/// Converts a sequence of tuples to a dictionary with a specified equality comparer.
-		/// </summary>
-		/// <typeparam name="TKey">The type of keys.</typeparam>
-		/// <typeparam name="TValue">The type of values.</typeparam>
-		/// <param name="source">The sequence of tuples.</param>
-		/// <param name="comparer">The equality comparer for keys.</param>
-		/// <returns>A dictionary containing the key-value pairs from the tuples.</returns>
-		public static IDictionary<TKey, TValue> ToDictionary<TKey, TValue>(this IEnumerable<Tuple<TKey, TValue>> source, IEqualityComparer<TKey> comparer)
-		{
-			return source.ToDictionary(pair => pair.Item1, pair => pair.Item2, comparer);
-		}
+		return new KeyValuePair<TKey, TValue>(pair.Item1, pair.Item2);
+	}
 
-		/// <summary>
-		/// Converts a key-value pair to a tuple.
-		/// </summary>
-		/// <typeparam name="TKey">The type of the key.</typeparam>
-		/// <typeparam name="TValue">The type of the value.</typeparam>
-		/// <param name="pair">The key-value pair to convert.</param>
-		/// <returns>A tuple containing the key and value.</returns>
-		public static Tuple<TKey, TValue> ToTuple<TKey, TValue>(this KeyValuePair<TKey, TValue> pair)
-		{
-			return Tuple.Create(pair.Key, pair.Value);
-		}
+	/// <summary>
+	/// Converts a sequence into a dictionary using selector functions for keys and values.
+	/// </summary>
+	/// <typeparam name="TSource">The type of elements in the source sequence.</typeparam>
+	/// <typeparam name="TKey">The type of keys.</typeparam>
+	/// <typeparam name="TValue">The type of values.</typeparam>
+	/// <param name="source">The source sequence.</param>
+	/// <param name="keySelector">The function to extract keys from elements.</param>
+	/// <param name="valueSelector">The function to extract values from elements.</param>
+	/// <returns>A dictionary containing the transformed key-value pairs.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="source"/>, <paramref name="keySelector"/>, or <paramref name="valueSelector"/> is null.</exception>
+	public static IDictionary<TKey, TValue> ToDictionary<TSource, TKey, TValue>(this IEnumerable<TSource> source, Func<TSource, int, TKey> keySelector, Func<TSource, int, TValue> valueSelector)
+	{
+		if (source is null)
+			throw new ArgumentNullException(nameof(source));
 
-		/// <summary>
-		/// Converts a tuple to a key-value pair.
-		/// </summary>
-		/// <typeparam name="TKey">The type of the key.</typeparam>
-		/// <typeparam name="TValue">The type of the value.</typeparam>
-		/// <param name="pair">The tuple to convert.</param>
-		/// <returns>A key-value pair containing the tuple's items.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="pair"/> is null.</exception>
-		public static KeyValuePair<TKey, TValue> ToPair<TKey, TValue>(this Tuple<TKey, TValue> pair)
-		{
-			if (pair is null)
-				throw new ArgumentNullException(nameof(pair));
+		if (keySelector is null)
+			throw new ArgumentNullException(nameof(keySelector));
 
-			return new KeyValuePair<TKey, TValue>(pair.Item1, pair.Item2);
-		}
+		if (valueSelector is null)
+			throw new ArgumentNullException(nameof(valueSelector));
 
-		/// <summary>
-		/// Converts a sequence into a dictionary using selector functions for keys and values.
-		/// </summary>
-		/// <typeparam name="TSource">The type of elements in the source sequence.</typeparam>
-		/// <typeparam name="TKey">The type of keys.</typeparam>
-		/// <typeparam name="TValue">The type of values.</typeparam>
-		/// <param name="source">The source sequence.</param>
-		/// <param name="keySelector">The function to extract keys from elements.</param>
-		/// <param name="valueSelector">The function to extract values from elements.</param>
-		/// <returns>A dictionary containing the transformed key-value pairs.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="source"/>, <paramref name="keySelector"/>, or <paramref name="valueSelector"/> is null.</exception>
-		public static IDictionary<TKey, TValue> ToDictionary<TSource, TKey, TValue>(this IEnumerable<TSource> source, Func<TSource, int, TKey> keySelector, Func<TSource, int, TValue> valueSelector)
-		{
-			if (source is null)
-				throw new ArgumentNullException(nameof(source));
+		var dict = new Dictionary<TKey, TValue>();
 
-			if (keySelector is null)
-				throw new ArgumentNullException(nameof(keySelector));
+		var index = 0;
 
-			if (valueSelector is null)
-				throw new ArgumentNullException(nameof(valueSelector));
+		foreach (var item in source)
+		{
+			dict.Add(keySelector(item, index), valueSelector(item, index));
+			index++;
+		}
 
-			var dict = new Dictionary<TKey, TValue>();
+		return dict;
+	}
 
-			var index = 0;
+	/// <summary>
+	/// Converts a grouping into a dictionary where each key maps to its group of values.
+	/// </summary>
+	/// <typeparam name="TKey">The type of keys.</typeparam>
+	/// <typeparam name="TValue">The type of values.</typeparam>
+	/// <param name="grouping">The grouping to convert.</param>
+	/// <returns>A dictionary mapping keys to their groups.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="grouping"/> is null.</exception>
+	public static IDictionary<TKey, IEnumerable<TValue>> ToDictionary<TKey, TValue>(this IEnumerable<IGrouping<TKey, TValue>> grouping)
+	{
+		if (grouping is null)
+			throw new ArgumentNullException(nameof(grouping));
 
-			foreach (var item in source)
-			{
-				dict.Add(keySelector(item, index), valueSelector(item, index));
-				index++;
-			}
+		return grouping.ToDictionary(g => g.Key, g => (IEnumerable<TValue>)g);
+	}
 
-			return dict;
-		}
+	/// <summary>
+	/// Retrieves all keys in a dictionary that map to a specific value.
+	/// </summary>
+	/// <typeparam name="TKey">The type of keys.</typeparam>
+	/// <typeparam name="TValue">The type of values.</typeparam>
+	/// <param name="dictionary">The dictionary to query.</param>
+	/// <param name="value">The value to match.</param>
+	/// <returns>An enumerable of keys associated with the specified value.</returns>
+	public static IEnumerable<TKey> GetKeys<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TValue value)
+	{
+		return from pair in dictionary where pair.Value.Equals(value) select pair.Key;
+	}
 
-		/// <summary>
-		/// Converts a grouping into a dictionary where each key maps to its group of values.
-		/// </summary>
-		/// <typeparam name="TKey">The type of keys.</typeparam>
-		/// <typeparam name="TValue">The type of values.</typeparam>
-		/// <param name="grouping">The grouping to convert.</param>
-		/// <returns>A dictionary mapping keys to their groups.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="grouping"/> is null.</exception>
-		public static IDictionary<TKey, IEnumerable<TValue>> ToDictionary<TKey, TValue>(this IEnumerable<IGrouping<TKey, TValue>> grouping)
-		{
-			if (grouping is null)
-				throw new ArgumentNullException(nameof(grouping));
+	/// <summary>
+	/// Adds a new key to a dictionary with a default value if it doesn't exist, and returns the value.
+	/// </summary>
+	/// <typeparam name="TKey">The type of keys.</typeparam>
+	/// <typeparam name="TValue">The type of values.</typeparam>
+	/// <param name="dictionary">The dictionary to operate on.</param>
+	/// <param name="key">The key to add or retrieve.</param>
+	/// <returns>The existing or newly created value.</returns>
+	public static TValue SafeAdd<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key)
+	{
+		return dictionary.SafeAdd(key, out _);
+	}
 
-			return grouping.ToDictionary(g => g.Key, g => (IEnumerable<TValue>)g);
-		}
+	/// <summary>
+	/// A private cache class to provide fast activation of default instances for <see cref="SafeAdd{TKey, TValue}(IDictionary{TKey, TValue}, TKey, out bool)"/>.
+	/// </summary>
+	private static class FastActivatorCache<TKey, TValue>
+	{
+		public static readonly Func<TKey, TValue> Activator;
 
-		/// <summary>
-		/// Retrieves all keys in a dictionary that map to a specific value.
-		/// </summary>
-		/// <typeparam name="TKey">The type of keys.</typeparam>
-		/// <typeparam name="TValue">The type of values.</typeparam>
-		/// <param name="dictionary">The dictionary to query.</param>
-		/// <param name="value">The value to match.</param>
-		/// <returns>An enumerable of keys associated with the specified value.</returns>
-		public static IEnumerable<TKey> GetKeys<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TValue value)
+		static FastActivatorCache()
 		{
-			return from pair in dictionary where pair.Value.Equals(value) select pair.Key;
+			Activator = k => FastActivator<TValue>.CreateObject();
 		}
+	}
 
-		/// <summary>
-		/// Adds a new key to a dictionary with a default value if it doesn't exist, and returns the value.
-		/// </summary>
-		/// <typeparam name="TKey">The type of keys.</typeparam>
-		/// <typeparam name="TValue">The type of values.</typeparam>
-		/// <param name="dictionary">The dictionary to operate on.</param>
-		/// <param name="key">The key to add or retrieve.</param>
-		/// <returns>The existing or newly created value.</returns>
-		public static TValue SafeAdd<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key)
-		{
-			return dictionary.SafeAdd(key, out _);
-		}
+	/// <summary>
+	/// Adds a new key to a dictionary with a default value if it doesn't exist, indicating whether it was new.
+	/// </summary>
+	/// <typeparam name="TKey">The type of keys.</typeparam>
+	/// <typeparam name="TValue">The type of values.</typeparam>
+	/// <param name="dictionary">The dictionary to operate on.</param>
+	/// <param name="key">The key to add or retrieve.</param>
+	/// <param name="isNew">When this method returns, indicates whether the key was newly added.</param>
+	/// <returns>The existing or newly created value.</returns>
+	public static TValue SafeAdd<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key, out bool isNew)
+	{
+		return dictionary.SafeAdd(key, FastActivatorCache<TKey,TValue>.Activator, out isNew);
+	}
 
-		/// <summary>
-		/// A private cache class to provide fast activation of default instances for <see cref="SafeAdd{TKey, TValue}(IDictionary{TKey, TValue}, TKey, out bool)"/>.
-		/// </summary>
-		private static class FastActivatorCache<TKey, TValue>
-		{
-			public static readonly Func<TKey, TValue> Activator;
+	/// <summary>
+	/// Adds a new key to a dictionary with a value generated by a handler if it doesn't exist.
+	/// </summary>
+	/// <typeparam name="TKey">The type of keys.</typeparam>
+	/// <typeparam name="TValue">The type of values.</typeparam>
+	/// <param name="dictionary">The dictionary to operate on.</param>
+	/// <param name="key">The key to add or retrieve.</param>
+	/// <param name="handler">The function to generate a value if the key is new.</param>
+	/// <returns>The existing or newly created value.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="dictionary"/> or <paramref name="handler"/> is null.</exception>
+	public static TValue SafeAdd<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key, Func<TKey, TValue> handler)
+	{
+		return dictionary.SafeAdd(key, handler, out _);
+	}
 
-			static FastActivatorCache()
-			{
-				Activator = k => FastActivator<TValue>.CreateObject();
-			}
-		}
+	/// <summary>
+	/// Adds a new key to a dictionary with a value generated by a handler if it doesn't exist, indicating whether it was new.
+	/// </summary>
+	/// <typeparam name="TKey">The type of keys.</typeparam>
+	/// <typeparam name="TValue">The type of values.</typeparam>
+	/// <param name="dictionary">The dictionary to operate on.</param>
+	/// <param name="key">The key to add or retrieve.</param>
+	/// <param name="handler">The function to generate a value if the key is new.</param>
+	/// <param name="isNew">When this method returns, indicates whether the key was newly added.</param>
+	/// <returns>The existing or newly created value.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="dictionary"/> or <paramref name="handler"/> is null.</exception>
+	public static TValue SafeAdd<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key, Func<TKey, TValue> handler, out bool isNew)
+	{
+		if (dictionary is null)
+			throw new ArgumentNullException(nameof(dictionary));
 
-		/// <summary>
-		/// Adds a new key to a dictionary with a default value if it doesn't exist, indicating whether it was new.
-		/// </summary>
-		/// <typeparam name="TKey">The type of keys.</typeparam>
-		/// <typeparam name="TValue">The type of values.</typeparam>
-		/// <param name="dictionary">The dictionary to operate on.</param>
-		/// <param name="key">The key to add or retrieve.</param>
-		/// <param name="isNew">When this method returns, indicates whether the key was newly added.</param>
-		/// <returns>The existing or newly created value.</returns>
-		public static TValue SafeAdd<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key, out bool isNew)
-		{
-			return dictionary.SafeAdd(key, FastActivatorCache<TKey,TValue>.Activator, out isNew);
-		}
+		if (handler is null)
+			throw new ArgumentNullException(nameof(handler));
 
-		/// <summary>
-		/// Adds a new key to a dictionary with a value generated by a handler if it doesn't exist.
-		/// </summary>
-		/// <typeparam name="TKey">The type of keys.</typeparam>
-		/// <typeparam name="TValue">The type of values.</typeparam>
-		/// <param name="dictionary">The dictionary to operate on.</param>
-		/// <param name="key">The key to add or retrieve.</param>
-		/// <param name="handler">The function to generate a value if the key is new.</param>
-		/// <returns>The existing or newly created value.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="dictionary"/> or <paramref name="handler"/> is null.</exception>
-		public static TValue SafeAdd<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key, Func<TKey, TValue> handler)
-		{
-			return dictionary.SafeAdd(key, handler, out _);
-		}
+		isNew = false;
 
-		/// <summary>
-		/// Adds a new key to a dictionary with a value generated by a handler if it doesn't exist, indicating whether it was new.
-		/// </summary>
-		/// <typeparam name="TKey">The type of keys.</typeparam>
-		/// <typeparam name="TValue">The type of values.</typeparam>
-		/// <param name="dictionary">The dictionary to operate on.</param>
-		/// <param name="key">The key to add or retrieve.</param>
-		/// <param name="handler">The function to generate a value if the key is new.</param>
-		/// <param name="isNew">When this method returns, indicates whether the key was newly added.</param>
-		/// <returns>The existing or newly created value.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="dictionary"/> or <paramref name="handler"/> is null.</exception>
-		public static TValue SafeAdd<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key, Func<TKey, TValue> handler, out bool isNew)
+		if (!dictionary.TryGetValue(key, out var value))
 		{
-			if (dictionary is null)
-				throw new ArgumentNullException(nameof(dictionary));
-
-			if (handler is null)
-				throw new ArgumentNullException(nameof(handler));
-
-			isNew = false;
+			var syncObj = (dictionary as ISynchronizedCollection)?.SyncRoot ?? (object)dictionary;
 
-			if (!dictionary.TryGetValue(key, out var value))
+			lock (syncObj)
 			{
-				var syncObj = (dictionary as ISynchronizedCollection)?.SyncRoot ?? (object)dictionary;
-
-				lock (syncObj)
+				if (!dictionary.TryGetValue(key, out value))
 				{
-					if (!dictionary.TryGetValue(key, out value))
-					{
-						value = handler(key);
-						dictionary.Add(key, value);
+					value = handler(key);
+					dictionary.Add(key, value);
 
-						isNew = true;
-					}
+					isNew = true;
 				}
 			}
-
-			return value;
 		}
 
-		/// <summary>
-		/// Asynchronously adds a new key to a dictionary with a value generated by a handler if it doesn't exist, using a reader-writer lock.
-		/// </summary>
-		/// <typeparam name="TKey">The type of keys.</typeparam>
-		/// <typeparam name="TValue">The type of values.</typeparam>
-		/// <param name="dictionary">The dictionary to operate on.</param>
-		/// <param name="sync">The reader-writer lock for synchronization.</param>
-		/// <param name="key">The key to add or retrieve.</param>
-		/// <param name="handler">The asynchronous function to generate a value if the key is new.</param>
-		/// <param name="cancellationToken">The cancellation token to cancel the operation.</param>
-		/// <returns>The existing or newly created value.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="dictionary"/>, <paramref name="sync"/>, or <paramref name="handler"/> is null.</exception>
-		[CLSCompliant(false)]
-		public static async Task<TValue> SafeAddAsync<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, AsyncReaderWriterLock sync, TKey key, Func<TKey, CancellationToken, Task<TValue>> handler, CancellationToken cancellationToken)
-		{
-			if (dictionary is null)
-				throw new ArgumentNullException(nameof(dictionary));
-
-			if (sync is null)
-				throw new ArgumentNullException(nameof(sync));
-
-			if (handler is null)
-				throw new ArgumentNullException(nameof(handler));
-
-			TValue value;
-
-			using (await sync.ReaderLockAsync(cancellationToken))
-			{
-				if (dictionary.TryGetValue(key, out value))
-					return value;
-			}
+		return value;
+	}
 
-			value = await handler(key, cancellationToken);
+	/// <summary>
+	/// Asynchronously adds a new key to a dictionary with a value generated by a handler if it doesn't exist, using a reader-writer lock.
+	/// </summary>
+	/// <typeparam name="TKey">The type of keys.</typeparam>
+	/// <typeparam name="TValue">The type of values.</typeparam>
+	/// <param name="dictionary">The dictionary to operate on.</param>
+	/// <param name="sync">The reader-writer lock for synchronization.</param>
+	/// <param name="key">The key to add or retrieve.</param>
+	/// <param name="handler">The asynchronous function to generate a value if the key is new.</param>
+	/// <param name="cancellationToken">The cancellation token to cancel the operation.</param>
+	/// <returns>The existing or newly created value.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="dictionary"/>, <paramref name="sync"/>, or <paramref name="handler"/> is null.</exception>
+	[CLSCompliant(false)]
+	public static async Task<TValue> SafeAddAsync<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, AsyncReaderWriterLock sync, TKey key, Func<TKey, CancellationToken, Task<TValue>> handler, CancellationToken cancellationToken)
+	{
+		if (dictionary is null)
+			throw new ArgumentNullException(nameof(dictionary));
 
-			using var _ = await sync.WriterLockAsync(cancellationToken);
+		if (sync is null)
+			throw new ArgumentNullException(nameof(sync));
 
-			if (dictionary.TryGetValue(key, out var temp))
-				return temp;
+		if (handler is null)
+			throw new ArgumentNullException(nameof(handler));
 
-			dictionary.Add(key, value);
+		TValue value;
 
-			return value;
+		using (await sync.ReaderLockAsync(cancellationToken))
+		{
+			if (dictionary.TryGetValue(key, out value))
+				return value;
 		}
 
-		/// <summary>
-		/// Asynchronously adds a new key to a dictionary of task completion sources, ensuring only one task is created per key, using a reader-writer lock.
-		/// </summary>
-		/// <typeparam name="TKey">The type of keys.</typeparam>
-		/// <typeparam name="TValue">The type of values.</typeparam>
-		/// <param name="dictionary">The dictionary mapping keys to task completion sources.</param>
-		/// <param name="sync">The reader-writer lock for synchronization.</param>
-		/// <param name="key">The key to add or retrieve.</param>
-		/// <param name="handler">The asynchronous function to generate a value if the key is new.</param>
-		/// <param name="cancellationToken">The cancellation token to cancel the operation.</param>
-		/// <returns>The task representing the value for the key.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="dictionary"/>, <paramref name="sync"/>, or <paramref name="handler"/> is null.</exception>
-		[CLSCompliant(false)]
-		public static async Task<TValue> SafeAddAsync<TKey, TValue>(this IDictionary<TKey, TaskCompletionSource<TValue>> dictionary, AsyncReaderWriterLock sync, TKey key, Func<TKey, CancellationToken, Task<TValue>> handler, CancellationToken cancellationToken)
-		{
-			if (dictionary is null)
-				throw new ArgumentNullException(nameof(dictionary));
+		value = await handler(key, cancellationToken);
 
-			if (sync is null)
-				throw new ArgumentNullException(nameof(sync));
+		using var _ = await sync.WriterLockAsync(cancellationToken);
 
-			if (handler is null)
-				throw new ArgumentNullException(nameof(handler));
+		if (dictionary.TryGetValue(key, out var temp))
+			return temp;
 
-			async Task<Task<TValue>> InternalSafeAddAsync()
-			{
-				TaskCompletionSource<TValue> source;
+		dictionary.Add(key, value);
 
-				using (await sync.ReaderLockAsync(cancellationToken))
-				{
-					if (dictionary.TryGetValue(key, out source))
-						return source.Task;
-				}
+		return value;
+	}
 
-				using (await sync.WriterLockAsync(cancellationToken))
-				{
-					if (dictionary.TryGetValue(key, out source))
-						return source.Task;
+	/// <summary>
+	/// Asynchronously adds a new key to a dictionary of task completion sources, ensuring only one task is created per key, using a reader-writer lock.
+	/// </summary>
+	/// <typeparam name="TKey">The type of keys.</typeparam>
+	/// <typeparam name="TValue">The type of values.</typeparam>
+	/// <param name="dictionary">The dictionary mapping keys to task completion sources.</param>
+	/// <param name="sync">The reader-writer lock for synchronization.</param>
+	/// <param name="key">The key to add or retrieve.</param>
+	/// <param name="handler">The asynchronous function to generate a value if the key is new.</param>
+	/// <param name="cancellationToken">The cancellation token to cancel the operation.</param>
+	/// <returns>The task representing the value for the key.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="dictionary"/>, <paramref name="sync"/>, or <paramref name="handler"/> is null.</exception>
+	[CLSCompliant(false)]
+	public static async Task<TValue> SafeAddAsync<TKey, TValue>(this IDictionary<TKey, TaskCompletionSource<TValue>> dictionary, AsyncReaderWriterLock sync, TKey key, Func<TKey, CancellationToken, Task<TValue>> handler, CancellationToken cancellationToken)
+	{
+		if (dictionary is null)
+			throw new ArgumentNullException(nameof(dictionary));
 
-					source = new TaskCompletionSource<TValue>();
-					_ = Task.Factory.StartNew(async () => source.SetResult(await handler(key, cancellationToken)));
+		if (sync is null)
+			throw new ArgumentNullException(nameof(sync));
 
-					dictionary.Add(key, source);
-					return source.Task;
-				}
-			}
+		if (handler is null)
+			throw new ArgumentNullException(nameof(handler));
 
-			return await (await InternalSafeAddAsync());
-		}
-
-		/// <summary>
-		/// Asynchronously adds a new key to a dictionary of task completion sources, ensuring only one task is created per key, using synchronized locking.
-		/// </summary>
-		/// <typeparam name="TKey">The type of keys.</typeparam>
-		/// <typeparam name="TValue">The type of values.</typeparam>
-		/// <param name="dictionary">The dictionary mapping keys to task completion sources.</param>
-		/// <param name="key">The key to add or retrieve.</param>
-		/// <param name="handler">The asynchronous function to generate a value if the key is new.</param>
-		/// <param name="cancellationToken">The cancellation token to cancel the operation.</param>
-		/// <returns>The task representing the value for the key.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="dictionary"/> or <paramref name="handler"/> is null.</exception>
-		public static Task<TValue> SafeAddAsync<TKey, TValue>(this IDictionary<TKey, TaskCompletionSource<TValue>> dictionary, TKey key, Func<TKey, CancellationToken, Task<TValue>> handler, CancellationToken cancellationToken)
+		async Task<Task<TValue>> InternalSafeAddAsync()
 		{
-			if (dictionary is null)
-				throw new ArgumentNullException(nameof(dictionary));
-
-			if (handler is null)
-				throw new ArgumentNullException(nameof(handler));
-
-			var syncObj = (dictionary as ISynchronizedCollection)?.SyncRoot ?? (object)dictionary;
-
 			TaskCompletionSource<TValue> source;
 
-			lock (syncObj)
+			using (await sync.ReaderLockAsync(cancellationToken))
 			{
 				if (dictionary.TryGetValue(key, out source))
 					return source.Task;
-
-				source = new();
-				dictionary.Add(key, source);
 			}
 
-			void remove()
+			using (await sync.WriterLockAsync(cancellationToken))
 			{
-				lock (syncObj)
-					dictionary.Remove(key);
+				if (dictionary.TryGetValue(key, out source))
+					return source.Task;
+
+				source = new TaskCompletionSource<TValue>();
+				_ = Task.Factory.StartNew(async () => source.SetResult(await handler(key, cancellationToken)));
+
+				dictionary.Add(key, source);
+				return source.Task;
 			}
+		}
 
-			try
-			{
-				handler(key, cancellationToken).ContinueWith(t =>
-				{
-					if (t.IsFaulted || t.IsCanceled)
-						remove();
+		return await (await InternalSafeAddAsync());
+	}
 
-					source.TryCompleteFromCompletedTask(t);
+	/// <summary>
+	/// Asynchronously adds a new key to a dictionary of task completion sources, ensuring only one task is created per key, using synchronized locking.
+	/// </summary>
+	/// <typeparam name="TKey">The type of keys.</typeparam>
+	/// <typeparam name="TValue">The type of values.</typeparam>
+	/// <param name="dictionary">The dictionary mapping keys to task completion sources.</param>
+	/// <param name="key">The key to add or retrieve.</param>
+	/// <param name="handler">The asynchronous function to generate a value if the key is new.</param>
+	/// <param name="cancellationToken">The cancellation token to cancel the operation.</param>
+	/// <returns>The task representing the value for the key.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="dictionary"/> or <paramref name="handler"/> is null.</exception>
+	public static Task<TValue> SafeAddAsync<TKey, TValue>(this IDictionary<TKey, TaskCompletionSource<TValue>> dictionary, TKey key, Func<TKey, CancellationToken, Task<TValue>> handler, CancellationToken cancellationToken)
+	{
+		if (dictionary is null)
+			throw new ArgumentNullException(nameof(dictionary));
 
-				}, TaskContinuationOptions.ExecuteSynchronously);
-			}
-			catch
-			{
-				remove();
-				throw;
-			}
+		if (handler is null)
+			throw new ArgumentNullException(nameof(handler));
 
-			return source.Task;
-		}
+		var syncObj = (dictionary as ISynchronizedCollection)?.SyncRoot ?? (object)dictionary;
 
-		/// <summary>
-		/// Attempts to retrieve a value from a dictionary by key, returning the default value if not found.
-		/// </summary>
-		/// <typeparam name="TKey">The type of keys.</typeparam>
-		/// <typeparam name="TValue">The type of values.</typeparam>
-		/// <param name="dict">The dictionary to query.</param>
-		/// <param name="key">The key to look up.</param>
-		/// <returns>The value if found; otherwise, the default value of <typeparamref name="TValue"/>.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="dict"/> is null.</exception>
-		public static TValue TryGetValue<TKey, TValue>(this IDictionary<TKey, TValue> dict, TKey key)
-			//where V : class
+		TaskCompletionSource<TValue> source;
+
+		lock (syncObj)
 		{
-			if (dict is null)
-				throw new ArgumentNullException(nameof(dict));
+			if (dictionary.TryGetValue(key, out source))
+				return source.Task;
 
-			dict.TryGetValue(key, out var value);
-			return value;
+			source = new();
+			dictionary.Add(key, source);
 		}
 
-		/// <summary>
-		/// Attempts to retrieve a value from a dictionary by key, returning null if not found (for value types).
-		/// </summary>
-		/// <typeparam name="TKey">The type of keys.</typeparam>
-		/// <typeparam name="TValue">The type of values, which must be a value type.</typeparam>
-		/// <param name="dict">The dictionary to query.</param>
-		/// <param name="key">The key to look up.</param>
-		/// <returns>The value if found; otherwise, null.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="dict"/> is null.</exception>
-		public static TValue? TryGetValue2<TKey, TValue>(this IDictionary<TKey, TValue> dict, TKey key)
-			where TValue : struct
+		void remove()
 		{
-			if (dict is null)
-				throw new ArgumentNullException(nameof(dict));
-
-			if (dict.TryGetValue(key, out var value))
-				return value;
-			else
-				return null;
+			lock (syncObj)
+				dictionary.Remove(key);
 		}
 
-		/// <summary>
-		/// Attempts to retrieve a key from a pair set by value, returning the default value if not found.
-		/// </summary>
-		/// <typeparam name="TKey">The type of keys.</typeparam>
-		/// <typeparam name="TValue">The type of values.</typeparam>
-		/// <param name="pairSet">The pair set to query.</param>
-		/// <param name="value">The value to look up.</param>
-		/// <returns>The key if found; otherwise, the default value of <typeparamref name="TKey"/>.</returns>
-		public static TKey TryGetKey<TKey, TValue>(this PairSet<TKey, TValue> pairSet, TValue value)
+		try
 		{
-			pairSet.TryGetKey(value, out var key);
-			return key;
-		}
+			handler(key, cancellationToken).ContinueWith(t =>
+			{
+				if (t.IsFaulted || t.IsCanceled)
+					remove();
 
-		/// <summary>
-		/// Attempts to retrieve a key from a pair set by value, returning null if not found (for value-type keys).
-		/// </summary>
-		/// <typeparam name="TKey">The type of keys, which must be a value type.</typeparam>
-		/// <typeparam name="TValue">The type of values.</typeparam>
-		/// <param name="pairSet">The pair set to query.</param>
-		/// <param name="value">The value to look up.</param>
-		/// <returns>The key if found; otherwise, null.</returns>
-		public static TKey? TryGetKey2<TKey, TValue>(this PairSet<TKey, TValue> pairSet, TValue value)
-			where TKey : struct
+				source.TryCompleteFromCompletedTask(t);
+
+			}, TaskContinuationOptions.ExecuteSynchronously);
+		}
+		catch
 		{
-			if (pairSet.TryGetKey(value, out var key))
-				return key;
-			else
-				return null;
+			remove();
+			throw;
 		}
 
-		#endregion
+		return source.Task;
+	}
 
-		/// <summary>
-		/// Executes a function on a synchronized collection with thread-safe access.
-		/// </summary>
-		/// <typeparam name="TCollection">The type of the synchronized collection.</typeparam>
-		/// <typeparam name="TResult">The type of the result.</typeparam>
-		/// <param name="collection">The synchronized collection to operate on.</param>
-		/// <param name="func">The function to execute.</param>
-		/// <returns>The result of the function.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="collection"/> or <paramref name="func"/> is null.</exception>
-		public static TResult SyncGet<TCollection, TResult>(this TCollection collection, Func<TCollection, TResult> func)
-			where TCollection : class, ISynchronizedCollection
-		{
-			if (collection is null)
-				throw new ArgumentNullException(nameof(collection));
+	/// <summary>
+	/// Attempts to retrieve a value from a dictionary by key, returning the default value if not found.
+	/// </summary>
+	/// <typeparam name="TKey">The type of keys.</typeparam>
+	/// <typeparam name="TValue">The type of values.</typeparam>
+	/// <param name="dict">The dictionary to query.</param>
+	/// <param name="key">The key to look up.</param>
+	/// <returns>The value if found; otherwise, the default value of <typeparamref name="TValue"/>.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="dict"/> is null.</exception>
+	public static TValue TryGetValue<TKey, TValue>(this IDictionary<TKey, TValue> dict, TKey key)
+		//where V : class
+	{
+		if (dict is null)
+			throw new ArgumentNullException(nameof(dict));
 
-			if (func is null)
-				throw new ArgumentNullException(nameof(func));
+		dict.TryGetValue(key, out var value);
+		return value;
+	}
 
-			lock (collection.SyncRoot)
-				return func(collection);
-		}
+	/// <summary>
+	/// Attempts to retrieve a value from a dictionary by key, returning null if not found (for value types).
+	/// </summary>
+	/// <typeparam name="TKey">The type of keys.</typeparam>
+	/// <typeparam name="TValue">The type of values, which must be a value type.</typeparam>
+	/// <param name="dict">The dictionary to query.</param>
+	/// <param name="key">The key to look up.</param>
+	/// <returns>The value if found; otherwise, null.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="dict"/> is null.</exception>
+	public static TValue? TryGetValue2<TKey, TValue>(this IDictionary<TKey, TValue> dict, TKey key)
+		where TValue : struct
+	{
+		if (dict is null)
+			throw new ArgumentNullException(nameof(dict));
 
-		/// <summary>
-		/// Executes an action on a synchronized collection with thread-safe access.
-		/// </summary>
-		/// <typeparam name="TCollection">The type of the synchronized collection.</typeparam>
-		/// <param name="collection">The synchronized collection to operate on.</param>
-		/// <param name="action">The action to execute.</param>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="collection"/> or <paramref name="action"/> is null.</exception>
-		public static void SyncDo<TCollection>(this TCollection collection, Action<TCollection> action)
-			where TCollection : class, ISynchronizedCollection
-		{
-			if (collection is null)
-				throw new ArgumentNullException(nameof(collection));
+		if (dict.TryGetValue(key, out var value))
+			return value;
+		else
+			return null;
+	}
 
-			if (action is null)
-				throw new ArgumentNullException(nameof(action));
+	/// <summary>
+	/// Attempts to retrieve a key from a pair set by value, returning the default value if not found.
+	/// </summary>
+	/// <typeparam name="TKey">The type of keys.</typeparam>
+	/// <typeparam name="TValue">The type of values.</typeparam>
+	/// <param name="pairSet">The pair set to query.</param>
+	/// <param name="value">The value to look up.</param>
+	/// <returns>The key if found; otherwise, the default value of <typeparamref name="TKey"/>.</returns>
+	public static TKey TryGetKey<TKey, TValue>(this PairSet<TKey, TValue> pairSet, TValue value)
+	{
+		pairSet.TryGetKey(value, out var key);
+		return key;
+	}
 
-			lock (collection.SyncRoot)
-				action(collection);
-		}
+	/// <summary>
+	/// Attempts to retrieve a key from a pair set by value, returning null if not found (for value-type keys).
+	/// </summary>
+	/// <typeparam name="TKey">The type of keys, which must be a value type.</typeparam>
+	/// <typeparam name="TValue">The type of values.</typeparam>
+	/// <param name="pairSet">The pair set to query.</param>
+	/// <param name="value">The value to look up.</param>
+	/// <returns>The key if found; otherwise, null.</returns>
+	public static TKey? TryGetKey2<TKey, TValue>(this PairSet<TKey, TValue> pairSet, TValue value)
+		where TKey : struct
+	{
+		if (pairSet.TryGetKey(value, out var key))
+			return key;
+		else
+			return null;
+	}
 
-		/// <summary>
-		/// Retrieves all keys in a synchronized dictionary that map to a specific value.
-		/// </summary>
-		/// <typeparam name="TKey">The type of keys.</typeparam>
-		/// <typeparam name="TValue">The type of values.</typeparam>
-		/// <param name="dictionary">The synchronized dictionary to query.</param>
-		/// <param name="value">The value to match.</param>
-		/// <returns>An enumerable of keys associated with the specified value.</returns>
-		public static IEnumerable<TKey> GetKeys<TKey, TValue>(this SynchronizedDictionary<TKey, TValue> dictionary, TValue value)
-		{
-			lock (dictionary.SyncRoot)
-				return ((IDictionary<TKey, TValue>)dictionary).GetKeys(value);
-		}
+	#endregion
 
-		/// <summary>
-		/// Attempts to dequeue an item from a queue, returning null if the queue is empty (for reference types).
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the queue, which must be a reference type.</typeparam>
-		/// <param name="queue">The queue to dequeue from.</param>
-		/// <returns>The dequeued item if available; otherwise, null.</returns>
-		public static T TryDequeue<T>(this Queue<T> queue)
-			where T : class
-		{
+	/// <summary>
+	/// Executes a function on a synchronized collection with thread-safe access.
+	/// </summary>
+	/// <typeparam name="TCollection">The type of the synchronized collection.</typeparam>
+	/// <typeparam name="TResult">The type of the result.</typeparam>
+	/// <param name="collection">The synchronized collection to operate on.</param>
+	/// <param name="func">The function to execute.</param>
+	/// <returns>The result of the function.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="collection"/> or <paramref name="func"/> is null.</exception>
+	public static TResult SyncGet<TCollection, TResult>(this TCollection collection, Func<TCollection, TResult> func)
+		where TCollection : class, ISynchronizedCollection
+	{
+		if (collection is null)
+			throw new ArgumentNullException(nameof(collection));
+
+		if (func is null)
+			throw new ArgumentNullException(nameof(func));
+
+		lock (collection.SyncRoot)
+			return func(collection);
+	}
+
+	/// <summary>
+	/// Executes an action on a synchronized collection with thread-safe access.
+	/// </summary>
+	/// <typeparam name="TCollection">The type of the synchronized collection.</typeparam>
+	/// <param name="collection">The synchronized collection to operate on.</param>
+	/// <param name="action">The action to execute.</param>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="collection"/> or <paramref name="action"/> is null.</exception>
+	public static void SyncDo<TCollection>(this TCollection collection, Action<TCollection> action)
+		where TCollection : class, ISynchronizedCollection
+	{
+		if (collection is null)
+			throw new ArgumentNullException(nameof(collection));
+
+		if (action is null)
+			throw new ArgumentNullException(nameof(action));
+
+		lock (collection.SyncRoot)
+			action(collection);
+	}
+
+	/// <summary>
+	/// Retrieves all keys in a synchronized dictionary that map to a specific value.
+	/// </summary>
+	/// <typeparam name="TKey">The type of keys.</typeparam>
+	/// <typeparam name="TValue">The type of values.</typeparam>
+	/// <param name="dictionary">The synchronized dictionary to query.</param>
+	/// <param name="value">The value to match.</param>
+	/// <returns>An enumerable of keys associated with the specified value.</returns>
+	public static IEnumerable<TKey> GetKeys<TKey, TValue>(this SynchronizedDictionary<TKey, TValue> dictionary, TValue value)
+	{
+		lock (dictionary.SyncRoot)
+			return ((IDictionary<TKey, TValue>)dictionary).GetKeys(value);
+	}
+
+	/// <summary>
+	/// Attempts to dequeue an item from a queue, returning null if the queue is empty (for reference types).
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the queue, which must be a reference type.</typeparam>
+	/// <param name="queue">The queue to dequeue from.</param>
+	/// <returns>The dequeued item if available; otherwise, null.</returns>
+	public static T TryDequeue<T>(this Queue<T> queue)
+		where T : class
+	{
+		return queue.IsEmpty() ? null : queue.Dequeue();
+	}
+
+	/// <summary>
+	/// Attempts to dequeue an item from a queue, returning null if the queue is empty (for value types).
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the queue, which must be a value type.</typeparam>
+	/// <param name="queue">The queue to dequeue from.</param>
+	/// <returns>The dequeued item if available; otherwise, null.</returns>
+	public static T? TryDequeue2<T>(this Queue<T> queue)
+		where T : struct
+	{
+		return queue.IsEmpty() ? (T?)null : queue.Dequeue();
+	}
+
+	/// <summary>
+	/// Attempts to dequeue an item from a synchronized queue, returning null if the queue is empty (for reference types).
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the queue, which must be a reference type.</typeparam>
+	/// <param name="queue">The synchronized queue to dequeue from.</param>
+	/// <returns>The dequeued item if available; otherwise, null.</returns>
+	public static T TryDequeue<T>(this SynchronizedQueue<T> queue)
+		where T : class
+	{
+		lock (queue.SyncRoot)
 			return queue.IsEmpty() ? null : queue.Dequeue();
-		}
+	}
 
-		/// <summary>
-		/// Attempts to dequeue an item from a queue, returning null if the queue is empty (for value types).
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the queue, which must be a value type.</typeparam>
-		/// <param name="queue">The queue to dequeue from.</param>
-		/// <returns>The dequeued item if available; otherwise, null.</returns>
-		public static T? TryDequeue2<T>(this Queue<T> queue)
-			where T : struct
-		{
+	/// <summary>
+	/// Attempts to dequeue an item from a synchronized queue, returning null if the queue is empty (for value types).
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the queue, which must be a value type.</typeparam>
+	/// <param name="queue">The synchronized queue to dequeue from.</param>
+	/// <returns>The dequeued item if available; otherwise, null.</returns>
+	public static T? TryDequeue2<T>(this SynchronizedQueue<T> queue)
+		where T : struct
+	{
+		lock (queue.SyncRoot)
 			return queue.IsEmpty() ? (T?)null : queue.Dequeue();
-		}
+	}
 
-		/// <summary>
-		/// Attempts to dequeue an item from a synchronized queue, returning null if the queue is empty (for reference types).
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the queue, which must be a reference type.</typeparam>
-		/// <param name="queue">The synchronized queue to dequeue from.</param>
-		/// <returns>The dequeued item if available; otherwise, null.</returns>
-		public static T TryDequeue<T>(this SynchronizedQueue<T> queue)
-			where T : class
-		{
-			lock (queue.SyncRoot)
-				return queue.IsEmpty() ? null : queue.Dequeue();
-		}
+	/// <summary>
+	/// Attempts to peek at the next item in a queue, returning null if the queue is empty (for reference types).
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the queue, which must be a reference type.</typeparam>
+	/// <param name="queue">The queue to peek into.</param>
+	/// <returns>The next item if available; otherwise, null.</returns>
+	public static T TryPeek<T>(this Queue<T> queue)
+		where T : class
+	{
+		return queue.IsEmpty() ? null : queue.Peek();
+	}
 
-		/// <summary>
-		/// Attempts to dequeue an item from a synchronized queue, returning null if the queue is empty (for value types).
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the queue, which must be a value type.</typeparam>
-		/// <param name="queue">The synchronized queue to dequeue from.</param>
-		/// <returns>The dequeued item if available; otherwise, null.</returns>
-		public static T? TryDequeue2<T>(this SynchronizedQueue<T> queue)
-			where T : struct
-		{
-			lock (queue.SyncRoot)
-				return queue.IsEmpty() ? (T?)null : queue.Dequeue();
-		}
+	/// <summary>
+	/// Attempts to peek at the next item in a queue, returning null if the queue is empty (for value types).
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the queue, which must be a value type.</typeparam>
+	/// <param name="queue">The queue to peek into.</param>
+	/// <returns>The next item if available; otherwise, null.</returns>
+	public static T? TryPeek2<T>(this Queue<T> queue)
+		where T : struct
+	{
+		return queue.IsEmpty() ? (T?)null : queue.Peek();
+	}
 
-		/// <summary>
-		/// Attempts to peek at the next item in a queue, returning null if the queue is empty (for reference types).
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the queue, which must be a reference type.</typeparam>
-		/// <param name="queue">The queue to peek into.</param>
-		/// <returns>The next item if available; otherwise, null.</returns>
-		public static T TryPeek<T>(this Queue<T> queue)
-			where T : class
-		{
+	/// <summary>
+	/// Attempts to peek at the next item in a synchronized queue, returning null if the queue is empty (for reference types).
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the queue, which must be a reference type.</typeparam>
+	/// <param name="queue">The synchronized queue to peek into.</param>
+	/// <returns>The next item if available; otherwise, null.</returns>
+	public static T TryPeek<T>(this SynchronizedQueue<T> queue)
+		where T : class
+	{
+		lock (queue.SyncRoot)
 			return queue.IsEmpty() ? null : queue.Peek();
-		}
+	}
 
-		/// <summary>
-		/// Attempts to peek at the next item in a queue, returning null if the queue is empty (for value types).
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the queue, which must be a value type.</typeparam>
-		/// <param name="queue">The queue to peek into.</param>
-		/// <returns>The next item if available; otherwise, null.</returns>
-		public static T? TryPeek2<T>(this Queue<T> queue)
-			where T : struct
-		{
+	/// <summary>
+	/// Attempts to peek at the next item in a synchronized queue, returning null if the queue is empty (for value types).
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the queue, which must be a value type.</typeparam>
+	/// <param name="queue">The synchronized queue to peek into.</param>
+	/// <returns>The next item if available; otherwise, null.</returns>
+	public static T? TryPeek2<T>(this SynchronizedQueue<T> queue)
+		where T : struct
+	{
+		lock (queue.SyncRoot)
 			return queue.IsEmpty() ? (T?)null : queue.Peek();
-		}
+	}
 
-		/// <summary>
-		/// Attempts to peek at the next item in a synchronized queue, returning null if the queue is empty (for reference types).
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the queue, which must be a reference type.</typeparam>
-		/// <param name="queue">The synchronized queue to peek into.</param>
-		/// <returns>The next item if available; otherwise, null.</returns>
-		public static T TryPeek<T>(this SynchronizedQueue<T> queue)
-			where T : class
-		{
-			lock (queue.SyncRoot)
-				return queue.IsEmpty() ? null : queue.Peek();
-		}
+	/// <summary>
+	/// Returns the first element of a sequence, or a specified alternate value if the sequence is empty.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the sequence.</typeparam>
+	/// <param name="source">The sequence to query.</param>
+	/// <param name="alternate">The value to return if the sequence is empty.</param>
+	/// <returns>The first element, or <paramref name="alternate"/> if the sequence is empty.</returns>
+	public static T FirstOr<T>(this IEnumerable<T> source, T alternate)
+	{
+		foreach (var t in source)
+			return t;
 
-		/// <summary>
-		/// Attempts to peek at the next item in a synchronized queue, returning null if the queue is empty (for value types).
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the queue, which must be a value type.</typeparam>
-		/// <param name="queue">The synchronized queue to peek into.</param>
-		/// <returns>The next item if available; otherwise, null.</returns>
-		public static T? TryPeek2<T>(this SynchronizedQueue<T> queue)
-			where T : struct
-		{
-			lock (queue.SyncRoot)
-				return queue.IsEmpty() ? (T?)null : queue.Peek();
-		}
+		return alternate;
+	}
 
-		/// <summary>
-		/// Returns the first element of a sequence, or a specified alternate value if the sequence is empty.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the sequence.</typeparam>
-		/// <param name="source">The sequence to query.</param>
-		/// <param name="alternate">The value to return if the sequence is empty.</param>
-		/// <returns>The first element, or <paramref name="alternate"/> if the sequence is empty.</returns>
-		public static T FirstOr<T>(this IEnumerable<T> source, T alternate)
-		{
-			foreach (var t in source)
-				return t;
+	/// <summary>
+	/// Returns the first element of a sequence, or null if the sequence is empty (for value types).
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the sequence, which must be a value type.</typeparam>
+	/// <param name="source">The sequence to query.</param>
+	/// <returns>The first element, or null if the sequence is empty.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="source"/> is null.</exception>
+	public static T? FirstOr<T>(this IEnumerable<T> source)
+		where T : struct
+	{
+		if (source is null)
+			throw new ArgumentNullException(nameof(source));
 
-			return alternate;
-		}
+		foreach (var t in source)
+			return t;
 
-		/// <summary>
-		/// Returns the first element of a sequence, or null if the sequence is empty (for value types).
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the sequence, which must be a value type.</typeparam>
-		/// <param name="source">The sequence to query.</param>
-		/// <returns>The first element, or null if the sequence is empty.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="source"/> is null.</exception>
-		public static T? FirstOr<T>(this IEnumerable<T> source)
-			where T : struct
+		return null;
+	}
+
+	/// <summary>
+	/// Returns the last element of a sequence, or null if the sequence is empty (for value types).
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the sequence, which must be a value type.</typeparam>
+	/// <param name="source">The sequence to query.</param>
+	/// <returns>The last element, or null if the sequence is empty.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="source"/> is null.</exception>
+	public static T? LastOr<T>(this IEnumerable<T> source)
+		where T : struct
+	{
+		if (source is null)
+			throw new ArgumentNullException(nameof(source));
+
+		if (source is IList<T> list)
 		{
-			if (source is null)
-				throw new ArgumentNullException(nameof(source));
+			var count = list.Count;
 
-			foreach (var t in source)
-				return t;
+			if (count > 0)
+				return list[count - 1];
 
 			return null;
 		}
 
-		/// <summary>
-		/// Returns the last element of a sequence, or null if the sequence is empty (for value types).
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the sequence, which must be a value type.</typeparam>
-		/// <param name="source">The sequence to query.</param>
-		/// <returns>The last element, or null if the sequence is empty.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="source"/> is null.</exception>
-		public static T? LastOr<T>(this IEnumerable<T> source)
-			where T : struct
-		{
-			if (source is null)
-				throw new ArgumentNullException(nameof(source));
-
-			if (source is IList<T> list)
-			{
-				var count = list.Count;
+		T? last = null;
 
-				if (count > 0)
-					return list[count - 1];
+		foreach (var t in source)
+			last = t;
 
-				return null;
-			}
+		return last;
+	}
 
-			T? last = null;
+	/// <summary>
+	/// Returns the element at a specified index in a sequence, or null if the index is out of range (for value types).
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the sequence, which must be a value type.</typeparam>
+	/// <param name="source">The sequence to query.</param>
+	/// <param name="index">The zero-based index of the element to retrieve.</param>
+	/// <returns>The element at the specified index, or null if the index is out of range.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="source"/> is null.</exception>
+	/// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="index"/> is negative.</exception>
+	public static T? ElementAtOr<T>(this IEnumerable<T> source, int index)
+		where T : struct
+	{
+		if (source is null)
+			throw new ArgumentNullException(nameof(source));
 
-			foreach (var t in source)
-				last = t;
+		if (index < 0)
+			throw new ArgumentOutOfRangeException(nameof(index));
 
-			return last;
+		if (source is IList<T> list)
+		{
+			if (index < list.Count)
+				return list[index];
 		}
-
-		/// <summary>
-		/// Returns the element at a specified index in a sequence, or null if the index is out of range (for value types).
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the sequence, which must be a value type.</typeparam>
-		/// <param name="source">The sequence to query.</param>
-		/// <param name="index">The zero-based index of the element to retrieve.</param>
-		/// <returns>The element at the specified index, or null if the index is out of range.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="source"/> is null.</exception>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="index"/> is negative.</exception>
-		public static T? ElementAtOr<T>(this IEnumerable<T> source, int index)
-			where T : struct
+		else
 		{
-			if (source is null)
-				throw new ArgumentNullException(nameof(source));
-
-			if (index < 0)
-				throw new ArgumentOutOfRangeException(nameof(index));
-
-			if (source is IList<T> list)
-			{
-				if (index < list.Count)
-					return list[index];
-			}
-			else
+			foreach (var i in source)
 			{
-				foreach (var i in source)
-				{
-					if (index == 0)
-						return i;
+				if (index == 0)
+					return i;
 
-					--index;
-				}
+				--index;
 			}
-
-			return null;
 		}
 
-		/// <summary>
-		/// Determines whether a sequence of characters is empty.
-		/// </summary>
-		/// <param name="source">The sequence of characters to check.</param>
-		/// <returns>True if the sequence is null or empty; otherwise, false.</returns>
-		[Obsolete("Use StringHelper.IsEmpty.")]
-		public static bool IsEmpty(this IEnumerable<char> source)
-			=> source is null || !source.Any();
+		return null;
+	}
 
-		/// <summary>
-		/// Determines whether a sequence is empty.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the sequence.</typeparam>
-		/// <param name="source">The sequence to check.</param>
-		/// <returns>True if the sequence is empty; otherwise, false.</returns>
-		public static bool IsEmpty<T>(this IEnumerable<T> source)
-		{
-			if (source is ICollection<T> col)
-				return col.Count == 0;
+	/// <summary>
+	/// Determines whether a sequence of characters is empty.
+	/// </summary>
+	/// <param name="source">The sequence of characters to check.</param>
+	/// <returns>True if the sequence is null or empty; otherwise, false.</returns>
+	[Obsolete("Use StringHelper.IsEmpty.")]
+	public static bool IsEmpty(this IEnumerable<char> source)
+		=> source is null || !source.Any();
 
-			if (source is ICollection col2)
-				return col2.Count == 0;
+	/// <summary>
+	/// Determines whether a sequence is empty.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the sequence.</typeparam>
+	/// <param name="source">The sequence to check.</param>
+	/// <returns>True if the sequence is empty; otherwise, false.</returns>
+	public static bool IsEmpty<T>(this IEnumerable<T> source)
+	{
+		if (source is ICollection<T> col)
+			return col.Count == 0;
 
-			if (source is IEnumerableEx ex)
-				return ex.Count == 0;
+		if (source is ICollection col2)
+			return col2.Count == 0;
 
-			return !source.Any();
-		}
+		if (source is IEnumerableEx ex)
+			return ex.Count == 0;
 
-		/// <summary>
-		/// Determines whether a sequence is empty based on a predicate.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the sequence.</typeparam>
-		/// <param name="source">The sequence to check.</param>
-		/// <param name="predicate">The condition to test each element against.</param>
-		/// <returns>True if no elements match the predicate; otherwise, false.</returns>
-		public static bool IsEmpty<T>(this IEnumerable<T> source, Func<T, bool> predicate)
-		{
-			return !source.Any(predicate);
-		}
+		return !source.Any();
+	}
 
-		/// <summary>
-		/// Determines whether a collection is empty.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the collection.</typeparam>
-		/// <param name="source">The collection to check.</param>
-		/// <returns>True if the collection is empty; otherwise, false.</returns>
-		public static bool IsEmpty<T>(this ICollection<T> source)
-		{
-			return source.Count == 0;
-		}
+	/// <summary>
+	/// Determines whether a sequence is empty based on a predicate.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the sequence.</typeparam>
+	/// <param name="source">The sequence to check.</param>
+	/// <param name="predicate">The condition to test each element against.</param>
+	/// <returns>True if no elements match the predicate; otherwise, false.</returns>
+	public static bool IsEmpty<T>(this IEnumerable<T> source, Func<T, bool> predicate)
+	{
+		return !source.Any(predicate);
+	}
 
-		/// <summary>
-		/// Determines whether an array is empty.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the array.</typeparam>
-		/// <param name="source">The array to check.</param>
-		/// <returns>True if the array is empty; otherwise, false.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="source"/> is null.</exception>
-		public static bool IsEmpty<T>(this T[] source)
-		{
-			if (source is null)
-				throw new ArgumentNullException(nameof(source));
+	/// <summary>
+	/// Determines whether a collection is empty.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the collection.</typeparam>
+	/// <param name="source">The collection to check.</param>
+	/// <returns>True if the collection is empty; otherwise, false.</returns>
+	public static bool IsEmpty<T>(this ICollection<T> source)
+	{
+		return source.Count == 0;
+	}
 
-			return source.Length == 0;
-		}
+	/// <summary>
+	/// Determines whether an array is empty.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the array.</typeparam>
+	/// <param name="source">The array to check.</param>
+	/// <returns>True if the array is empty; otherwise, false.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="source"/> is null.</exception>
+	public static bool IsEmpty<T>(this T[] source)
+	{
+		if (source is null)
+			throw new ArgumentNullException(nameof(source));
+
+		return source.Length == 0;
+	}
 
-		#region BitArray methods
+	#region BitArray methods
 
-		/// <summary>
-		/// Converts a double value to its binary representation as an array of bits.
-		/// </summary>
-		/// <param name="value">The double value to convert.</param>
-		/// <returns>An array of 64 bits representing the value.</returns>
-		public static bool[] ToBits(this double value)
-		{
-			return value.ToBits(64);
-		}
+	/// <summary>
+	/// Converts a double value to its binary representation as an array of bits.
+	/// </summary>
+	/// <param name="value">The double value to convert.</param>
+	/// <returns>An array of 64 bits representing the value.</returns>
+	public static bool[] ToBits(this double value)
+	{
+		return value.ToBits(64);
+	}
 
-		/// <summary>
-		/// Converts a double value to a specified number of bits.
-		/// </summary>
-		/// <param name="value">The double value to convert.</param>
-		/// <param name="count">The number of bits to return.</param>
-		/// <returns>An array of bits representing the value.</returns>
-		public static bool[] ToBits(this double value, int count)
-		{
-			return value.ToBits(0, count);
-		}
+	/// <summary>
+	/// Converts a double value to a specified number of bits.
+	/// </summary>
+	/// <param name="value">The double value to convert.</param>
+	/// <param name="count">The number of bits to return.</param>
+	/// <returns>An array of bits representing the value.</returns>
+	public static bool[] ToBits(this double value, int count)
+	{
+		return value.ToBits(0, count);
+	}
 
-		/// <summary>
-		/// Converts a double value to a specified range of bits.
-		/// </summary>
-		/// <param name="value">The double value to convert.</param>
-		/// <param name="startBit">The starting bit position (0-based).</param>
-		/// <param name="bitCount">The number of bits to return.</param>
-		/// <returns>An array of bits representing the specified range.</returns>
-		public static bool[] ToBits(this double value, int startBit, int bitCount)
-		{
-			return value.AsRaw().ToBits(startBit, bitCount);
-		}
+	/// <summary>
+	/// Converts a double value to a specified range of bits.
+	/// </summary>
+	/// <param name="value">The double value to convert.</param>
+	/// <param name="startBit">The starting bit position (0-based).</param>
+	/// <param name="bitCount">The number of bits to return.</param>
+	/// <returns>An array of bits representing the specified range.</returns>
+	public static bool[] ToBits(this double value, int startBit, int bitCount)
+	{
+		return value.AsRaw().ToBits(startBit, bitCount);
+	}
 
-		/// <summary>
-		/// Converts a float value to its binary representation as an array of bits.
-		/// </summary>
-		/// <param name="value">The float value to convert.</param>
-		/// <returns>An array of 32 bits representing the value.</returns>
-		public static bool[] ToBits(this float value)
-		{
-			return value.ToBits(32);
-		}
+	/// <summary>
+	/// Converts a float value to its binary representation as an array of bits.
+	/// </summary>
+	/// <param name="value">The float value to convert.</param>
+	/// <returns>An array of 32 bits representing the value.</returns>
+	public static bool[] ToBits(this float value)
+	{
+		return value.ToBits(32);
+	}
 
-		/// <summary>
-		/// Converts a float value to a specified number of bits.
-		/// </summary>
-		/// <param name="value">The float value to convert.</param>
-		/// <param name="bitCount">The number of bits to return.</param>
-		/// <returns>An array of bits representing the value.</returns>
-		public static bool[] ToBits(this float value, int bitCount)
-		{
-			return value.ToBits(0, bitCount);
-		}
+	/// <summary>
+	/// Converts a float value to a specified number of bits.
+	/// </summary>
+	/// <param name="value">The float value to convert.</param>
+	/// <param name="bitCount">The number of bits to return.</param>
+	/// <returns>An array of bits representing the value.</returns>
+	public static bool[] ToBits(this float value, int bitCount)
+	{
+		return value.ToBits(0, bitCount);
+	}
 
-		/// <summary>
-		/// Converts a float value to a specified range of bits.
-		/// </summary>
-		/// <param name="value">The float value to convert.</param>
-		/// <param name="startBit">The starting bit position (0-based).</param>
-		/// <param name="bitCount">The number of bits to return.</param>
-		/// <returns>An array of bits representing the specified range.</returns>
-		public static bool[] ToBits(this float value, int startBit, int bitCount)
-		{
-			return value.AsRaw().ToBits(startBit, bitCount);
-		}
+	/// <summary>
+	/// Converts a float value to a specified range of bits.
+	/// </summary>
+	/// <param name="value">The float value to convert.</param>
+	/// <param name="startBit">The starting bit position (0-based).</param>
+	/// <param name="bitCount">The number of bits to return.</param>
+	/// <returns>An array of bits representing the specified range.</returns>
+	public static bool[] ToBits(this float value, int startBit, int bitCount)
+	{
+		return value.AsRaw().ToBits(startBit, bitCount);
+	}
 
-		/// <summary>
-		/// Converts a long value to its binary representation as an array of bits.
-		/// </summary>
-		/// <param name="value">The long value to convert.</param>
-		/// <returns>An array of 64 bits representing the value.</returns>
-		public static bool[] ToBits(this long value)
-		{
-			return value.ToBits(64);
-		}
+	/// <summary>
+	/// Converts a long value to its binary representation as an array of bits.
+	/// </summary>
+	/// <param name="value">The long value to convert.</param>
+	/// <returns>An array of 64 bits representing the value.</returns>
+	public static bool[] ToBits(this long value)
+	{
+		return value.ToBits(64);
+	}
 
-		/// <summary>
-		/// Converts a long value to a specified number of bits.
-		/// </summary>
-		/// <param name="value">The long value to convert.</param>
-		/// <param name="bitCount">The number of bits to return.</param>
-		/// <returns>An array of bits representing the value.</returns>
-		public static bool[] ToBits(this long value, int bitCount)
-		{
-			//if (value > 2.Pow(bitCount - 1))
-			//	throw new ArgumentOutOfRangeException(nameof(value));
+	/// <summary>
+	/// Converts a long value to a specified number of bits.
+	/// </summary>
+	/// <param name="value">The long value to convert.</param>
+	/// <param name="bitCount">The number of bits to return.</param>
+	/// <returns>An array of bits representing the value.</returns>
+	public static bool[] ToBits(this long value, int bitCount)
+	{
+		//if (value > 2.Pow(bitCount - 1))
+		//	throw new ArgumentOutOfRangeException(nameof(value));
 
-			return value.ToBits(0, bitCount);
-		}
+		return value.ToBits(0, bitCount);
+	}
 
-		/// <summary>
-		/// Converts a long value to a specified range of bits.
-		/// </summary>
-		/// <param name="value">The long value to convert.</param>
-		/// <param name="startBit">The starting bit position (0-based).</param>
-		/// <param name="bitCount">The number of bits to return.</param>
-		/// <returns>An array of bits representing the specified range.</returns>
-		public static bool[] ToBits(this long value, int startBit, int bitCount)
-		{
-			var ints = value.GetParts();
+	/// <summary>
+	/// Converts a long value to a specified range of bits.
+	/// </summary>
+	/// <param name="value">The long value to convert.</param>
+	/// <param name="startBit">The starting bit position (0-based).</param>
+	/// <param name="bitCount">The number of bits to return.</param>
+	/// <returns>An array of bits representing the specified range.</returns>
+	public static bool[] ToBits(this long value, int startBit, int bitCount)
+	{
+		var ints = value.GetParts();
 
-			var bits = new List<bool>();
+		var bits = new List<bool>();
 
-			if (startBit < 32)
-				bits.AddRange(ints[0].ToBits(startBit, bitCount.Min(32 - startBit)));
+		if (startBit < 32)
+			bits.AddRange(ints[0].ToBits(startBit, bitCount.Min(32 - startBit)));
 
-			if ((startBit + bitCount) > 32)
-				bits.AddRange(ints[1].ToBits((startBit - 32).Max(0), (bitCount - 32)));
+		if ((startBit + bitCount) > 32)
+			bits.AddRange(ints[1].ToBits((startBit - 32).Max(0), (bitCount - 32)));
 
-			return [.. bits];
-		}
+		return [.. bits];
+	}
 
-		/// <summary>
-		/// Converts an int value to its binary representation as an array of bits.
-		/// </summary>
-		/// <param name="value">The int value to convert.</param>
-		/// <returns>An array of 32 bits representing the value.</returns>
-		public static bool[] ToBits(this int value)
-		{
-			return value.ToBits(32);
-		}
+	/// <summary>
+	/// Converts an int value to its binary representation as an array of bits.
+	/// </summary>
+	/// <param name="value">The int value to convert.</param>
+	/// <returns>An array of 32 bits representing the value.</returns>
+	public static bool[] ToBits(this int value)
+	{
+		return value.ToBits(32);
+	}
+
+	/// <summary>
+	/// Converts an int value to a specified number of bits.
+	/// </summary>
+	/// <param name="value">The int value to convert.</param>
+	/// <param name="bitCount">The number of bits to return.</param>
+	/// <returns>An array of bits representing the value.</returns>
+	public static bool[] ToBits(this int value, int bitCount)
+	{
+		//if (value > 2.Pow(bitCount - 1))
+		//	throw new ArgumentOutOfRangeException(nameof(value));
 
-		/// <summary>
-		/// Converts an int value to a specified number of bits.
-		/// </summary>
-		/// <param name="value">The int value to convert.</param>
-		/// <param name="bitCount">The number of bits to return.</param>
-		/// <returns>An array of bits representing the value.</returns>
-		public static bool[] ToBits(this int value, int bitCount)
-		{
-			//if (value > 2.Pow(bitCount - 1))
-			//	throw new ArgumentOutOfRangeException(nameof(value));
+		return value.ToBits(0, bitCount);
+	}
 
-			return value.ToBits(0, bitCount);
-		}
+	/// <summary>
+	/// Converts an int value to a specified range of bits.
+	/// </summary>
+	/// <param name="value">The int value to convert.</param>
+	/// <param name="startBit">The starting bit position (0-based).</param>
+	/// <param name="bitCount">The number of bits to return.</param>
+	/// <returns>An array of bits representing the specified range.</returns>
+	/// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="startBit"/> is outside [0, 31] or <paramref name="bitCount"/> is negative or exceeds 32 when added to <paramref name="startBit"/>.</exception>
+	public static bool[] ToBits(this int value, int startBit, int bitCount)
+	{
+		if (startBit > 31 || startBit < 0)
+			throw new ArgumentOutOfRangeException(nameof(startBit));
 
-		/// <summary>
-		/// Converts an int value to a specified range of bits.
-		/// </summary>
-		/// <param name="value">The int value to convert.</param>
-		/// <param name="startBit">The starting bit position (0-based).</param>
-		/// <param name="bitCount">The number of bits to return.</param>
-		/// <returns>An array of bits representing the specified range.</returns>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="startBit"/> is outside [0, 31] or <paramref name="bitCount"/> is negative or exceeds 32 when added to <paramref name="startBit"/>.</exception>
-		public static bool[] ToBits(this int value, int startBit, int bitCount)
-		{
-			if (startBit > 31 || startBit < 0)
-				throw new ArgumentOutOfRangeException(nameof(startBit));
+		if (bitCount < 0)
+			throw new ArgumentOutOfRangeException(nameof(bitCount));
 
-			if (bitCount < 0)
-				throw new ArgumentOutOfRangeException(nameof(bitCount));
+		if ((startBit + bitCount) > 32)
+			throw new ArgumentOutOfRangeException(nameof(bitCount));
 
-			if ((startBit + bitCount) > 32)
-				throw new ArgumentOutOfRangeException(nameof(bitCount));
+		var bits = new bool[bitCount];
 
-			var bits = new bool[bitCount];
+		for (var i = 0; i < bitCount; i++)
+			bits[i] = value.GetBit(startBit + i);
 
-			for (var i = 0; i < bitCount; i++)
-				bits[i] = value.GetBit(startBit + i);
+		return bits;
+	}
 
-			return bits;
-		}
+	/// <summary>
+	/// Converts an array of bits to an integer starting from the beginning.
+	/// </summary>
+	/// <param name="bits">The array of bits to convert.</param>
+	/// <returns>The integer value represented by the bits.</returns>
+	public static int FromBits(this bool[] bits)
+	{
+		return bits.FromBits(0);
+	}
 
-		/// <summary>
-		/// Converts an array of bits to an integer starting from the beginning.
-		/// </summary>
-		/// <param name="bits">The array of bits to convert.</param>
-		/// <returns>The integer value represented by the bits.</returns>
-		public static int FromBits(this bool[] bits)
-		{
-			return bits.FromBits(0);
-		}
+	/// <summary>
+	/// Converts an array of bits to an integer starting from a specified position.
+	/// </summary>
+	/// <param name="bits">The array of bits to convert.</param>
+	/// <param name="startBit">The starting bit position (0-based).</param>
+	/// <returns>The integer value represented by the bits.</returns>
+	public static int FromBits(this bool[] bits, int startBit)
+	{
+		return (int)bits.FromBits2(startBit);
+	}
 
-		/// <summary>
-		/// Converts an array of bits to an integer starting from a specified position.
-		/// </summary>
-		/// <param name="bits">The array of bits to convert.</param>
-		/// <param name="startBit">The starting bit position (0-based).</param>
-		/// <returns>The integer value represented by the bits.</returns>
-		public static int FromBits(this bool[] bits, int startBit)
-		{
-			return (int)bits.FromBits2(startBit);
-		}
+	/// <summary>
+	/// Converts an array of bits to a long integer starting from the beginning.
+	/// </summary>
+	/// <param name="bits">The array of bits to convert.</param>
+	/// <returns>The long integer value represented by the bits.</returns>
+	public static long FromBits2(this bool[] bits)
+	{
+		return bits.FromBits(0);
+	}
 
-		/// <summary>
-		/// Converts an array of bits to a long integer starting from the beginning.
-		/// </summary>
-		/// <param name="bits">The array of bits to convert.</param>
-		/// <returns>The long integer value represented by the bits.</returns>
-		public static long FromBits2(this bool[] bits)
-		{
-			return bits.FromBits(0);
-		}
+	/// <summary>
+	/// Converts an array of bits to a long integer starting from a specified position.
+	/// </summary>
+	/// <param name="bits">The array of bits to convert.</param>
+	/// <param name="startBit">The starting bit position (0-based).</param>
+	/// <returns>The long integer value represented by the bits.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="bits"/> is null.</exception>
+	/// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="startBit"/> is greater than or equal to the length of <paramref name="bits"/>.</exception>
+	public static long FromBits2(this bool[] bits, int startBit)
+	{
+		if (bits is null)
+			throw new ArgumentNullException(nameof(bits));
 
-		/// <summary>
-		/// Converts an array of bits to a long integer starting from a specified position.
-		/// </summary>
-		/// <param name="bits">The array of bits to convert.</param>
-		/// <param name="startBit">The starting bit position (0-based).</param>
-		/// <returns>The long integer value represented by the bits.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="bits"/> is null.</exception>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="startBit"/> is greater than or equal to the length of <paramref name="bits"/>.</exception>
-		public static long FromBits2(this bool[] bits, int startBit)
-		{
-			if (bits is null)
-				throw new ArgumentNullException(nameof(bits));
+		if (startBit >= bits.Length)
+			throw new ArgumentOutOfRangeException(nameof(startBit));
 
-			if (startBit >= bits.Length)
-				throw new ArgumentOutOfRangeException(nameof(startBit));
+		var value = 0L;
 
-			var value = 0L;
+		for (var i = 0; i < bits.Length; i++)
+			value = value.SetBit(i + startBit, bits[i]);
 
-			for (var i = 0; i < bits.Length; i++)
-				value = value.SetBit(i + startBit, bits[i]);
+		return value;
+	}
 
-			return value;
-		}
+	/// <summary>
+	/// Adds a range of bits to an existing <see cref="BitArray"/>.
+	/// </summary>
+	/// <param name="array">The <see cref="BitArray"/> to extend.</param>
+	/// <param name="bits">The bits to add.</param>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="array"/> or <paramref name="bits"/> is null.</exception>
+	public static void AddRange(this BitArray array, params bool[] bits)
+	{
+		if (array is null)
+			throw new ArgumentNullException(nameof(array));
 
-		/// <summary>
-		/// Adds a range of bits to an existing <see cref="BitArray"/>.
-		/// </summary>
-		/// <param name="array">The <see cref="BitArray"/> to extend.</param>
-		/// <param name="bits">The bits to add.</param>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="array"/> or <paramref name="bits"/> is null.</exception>
-		public static void AddRange(this BitArray array, params bool[] bits)
-		{
-			if (array is null)
-				throw new ArgumentNullException(nameof(array));
+		if (bits is null)
+			throw new ArgumentNullException(nameof(bits));
 
-			if (bits is null)
-				throw new ArgumentNullException(nameof(bits));
+		var arrayLength = array.Length;
 
-			var arrayLength = array.Length;
+		array.Length += bits.Length;
 
-			array.Length += bits.Length;
+		for (var i = 0; i < bits.Length; i++)
+			array[arrayLength + i] = bits[i];
+	}
 
-			for (var i = 0; i < bits.Length; i++)
-				array[arrayLength + i] = bits[i];
-		}
+	#endregion
 
-		#endregion
+	/// <summary>
+	/// A private implementation of <see cref="IEnumerableEx{T}"/> that wraps an enumerable with a predefined count.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the enumerable.</typeparam>
+	private sealed class EnumerableEx<T> : SimpleEnumerable<T>, IEnumerableEx<T>
+	{
+		private readonly int _count;
 
 		/// <summary>
-		/// A private implementation of <see cref="IEnumerableEx{T}"/> that wraps an enumerable with a predefined count.
+		/// Initializes a new instance of the <see cref="EnumerableEx{T}"/> class.
 		/// </summary>
-		/// <typeparam name="T">The type of elements in the enumerable.</typeparam>
-		private sealed class EnumerableEx<T> : SimpleEnumerable<T>, IEnumerableEx<T>
+		/// <param name="enumerable">The underlying enumerable to wrap.</param>
+		/// <param name="count">The predefined count of elements.</param>
+		/// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="count"/> is negative.</exception>
+		public EnumerableEx(IEnumerable<T> enumerable, int count)
+			: base(enumerable.GetEnumerator)
 		{
-			private readonly int _count;
-
-			/// <summary>
-			/// Initializes a new instance of the <see cref="EnumerableEx{T}"/> class.
-			/// </summary>
-			/// <param name="enumerable">The underlying enumerable to wrap.</param>
-			/// <param name="count">The predefined count of elements.</param>
-			/// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="count"/> is negative.</exception>
-			public EnumerableEx(IEnumerable<T> enumerable, int count)
-				: base(enumerable.GetEnumerator)
-			{
-				if (count < 0)
-					throw new ArgumentOutOfRangeException(nameof(count));
+			if (count < 0)
+				throw new ArgumentOutOfRangeException(nameof(count));
 
-				_count = count;
-			}
-
-			/// <summary>
-			/// Gets the predefined count of elements.
-			/// </summary>
-			int IEnumerableEx.Count => _count;
+			_count = count;
 		}
 
 		/// <summary>
-		/// Converts an enumerable to an <see cref="IEnumerableEx{T}"/> with a count determined by enumeration.
+		/// Gets the predefined count of elements.
 		/// </summary>
-		/// <typeparam name="T">The type of elements in the enumerable.</typeparam>
-		/// <param name="values">The enumerable to convert.</param>
-		/// <returns>An <see cref="IEnumerableEx{T}"/> with the specified count.</returns>
-		public static IEnumerableEx<T> ToEx<T>(this IEnumerable<T> values)
-		{
-			return values.ToEx(values.Count());
-		}
+		int IEnumerableEx.Count => _count;
+	}
 
-		/// <summary>
-		/// Converts an enumerable to an <see cref="IEnumerableEx{T}"/> with a specified count.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the enumerable.</typeparam>
-		/// <param name="values">The enumerable to convert.</param>
-		/// <param name="count">The predefined count of elements.</param>
-		/// <returns>An <see cref="IEnumerableEx{T}"/> with the specified count.</returns>
-		public static IEnumerableEx<T> ToEx<T>(this IEnumerable<T> values, int count)
-		{
-			return new EnumerableEx<T>(values, count);
-		}
+	/// <summary>
+	/// Converts an enumerable to an <see cref="IEnumerableEx{T}"/> with a count determined by enumeration.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the enumerable.</typeparam>
+	/// <param name="values">The enumerable to convert.</param>
+	/// <returns>An <see cref="IEnumerableEx{T}"/> with the specified count.</returns>
+	public static IEnumerableEx<T> ToEx<T>(this IEnumerable<T> values)
+	{
+		return values.ToEx(values.Count());
+	}
 
-		/// <summary>
-		/// Converts a list to a synchronized list, or returns it if already synchronized.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the list.</typeparam>
-		/// <param name="list">The list to synchronize.</param>
-		/// <returns>A <see cref="SynchronizedList{T}"/> containing the list's elements, or null if <paramref name="list"/> is null.</returns>
-		public static SynchronizedList<T> Sync<T>(this IList<T> list)
-		{
-			if (list is null)
-				return null;
+	/// <summary>
+	/// Converts an enumerable to an <see cref="IEnumerableEx{T}"/> with a specified count.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the enumerable.</typeparam>
+	/// <param name="values">The enumerable to convert.</param>
+	/// <param name="count">The predefined count of elements.</param>
+	/// <returns>An <see cref="IEnumerableEx{T}"/> with the specified count.</returns>
+	public static IEnumerableEx<T> ToEx<T>(this IEnumerable<T> values, int count)
+	{
+		return new EnumerableEx<T>(values, count);
+	}
 
-			if (list is not SynchronizedList<T> syncList)
-			{
-				syncList = [.. list];
-			}
+	/// <summary>
+	/// Converts a list to a synchronized list, or returns it if already synchronized.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the list.</typeparam>
+	/// <param name="list">The list to synchronize.</param>
+	/// <returns>A <see cref="SynchronizedList{T}"/> containing the list's elements, or null if <paramref name="list"/> is null.</returns>
+	public static SynchronizedList<T> Sync<T>(this IList<T> list)
+	{
+		if (list is null)
+			return null;
 
-			return syncList;
+		if (list is not SynchronizedList<T> syncList)
+		{
+			syncList = [.. list];
 		}
 
-		/// <summary>
-		/// Converts a dictionary to a synchronized dictionary, or returns it if already synchronized.
-		/// </summary>
-		/// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
-		/// <typeparam name="TValue">The type of values in the dictionary.</typeparam>
-		/// <param name="dict">The dictionary to synchronize.</param>
-		/// <returns>A <see cref="SynchronizedDictionary{TKey, TValue}"/> containing the dictionary's elements, or null if <paramref name="dict"/> is null.</returns>
-		public static SynchronizedDictionary<TKey, TValue> Sync<TKey, TValue>(this IDictionary<TKey, TValue> dict)
-		{
-			if (dict is null)
-				return null;
+		return syncList;
+	}
 
-			if (dict is not SynchronizedDictionary<TKey, TValue> syncDict)
-			{
-				var typedDict = dict as Dictionary<TKey, TValue>;
-				syncDict = new SynchronizedDictionary<TKey, TValue>(typedDict?.Comparer);
-				syncDict.AddRange(dict);
-			}
+	/// <summary>
+	/// Converts a dictionary to a synchronized dictionary, or returns it if already synchronized.
+	/// </summary>
+	/// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
+	/// <typeparam name="TValue">The type of values in the dictionary.</typeparam>
+	/// <param name="dict">The dictionary to synchronize.</param>
+	/// <returns>A <see cref="SynchronizedDictionary{TKey, TValue}"/> containing the dictionary's elements, or null if <paramref name="dict"/> is null.</returns>
+	public static SynchronizedDictionary<TKey, TValue> Sync<TKey, TValue>(this IDictionary<TKey, TValue> dict)
+	{
+		if (dict is null)
+			return null;
 
-			return syncDict;
+		if (dict is not SynchronizedDictionary<TKey, TValue> syncDict)
+		{
+			var typedDict = dict as Dictionary<TKey, TValue>;
+			syncDict = new SynchronizedDictionary<TKey, TValue>(typedDict?.Comparer);
+			syncDict.AddRange(dict);
 		}
 
-		/// <summary>
-		/// Converts a hash set to a synchronized set.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the set.</typeparam>
-		/// <param name="list">The hash set to synchronize.</param>
-		/// <returns>A <see cref="SynchronizedSet{T}"/> containing the set's elements, or null if <paramref name="list"/> is null.</returns>
-		public static SynchronizedSet<T> Sync<T>(this HashSet<T> list)
-		{
-			if (list is null)
-				return null;
+		return syncDict;
+	}
 
-			var syncList = new SynchronizedSet<T>();
-			syncList.AddRange(list);
-			return syncList;
-		}
+	/// <summary>
+	/// Converts a hash set to a synchronized set.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the set.</typeparam>
+	/// <param name="list">The hash set to synchronize.</param>
+	/// <returns>A <see cref="SynchronizedSet{T}"/> containing the set's elements, or null if <paramref name="list"/> is null.</returns>
+	public static SynchronizedSet<T> Sync<T>(this HashSet<T> list)
+	{
+		if (list is null)
+			return null;
 
-		/// <summary>
-		/// Filters a sequence based on a predicate that compares each element with its previous element.
-		/// </summary>
-		/// <typeparam name="TSource">The type of elements in the sequence.</typeparam>
-		/// <param name="source">The sequence to filter.</param>
-		/// <param name="predicate">The function to test each element against its previous element.</param>
-		/// <returns>An enumerable of elements where the predicate returns true when compared to the previous element.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="source"/> or <paramref name="predicate"/> is null.</exception>
-		public static IEnumerable<TSource> WhereWithPrevious<TSource>(this IEnumerable<TSource> source, Func<TSource, TSource, bool> predicate)
-		{
-			if (source is null)
-				throw new ArgumentNullException(nameof(source));
+		var syncList = new SynchronizedSet<T>();
+		syncList.AddRange(list);
+		return syncList;
+	}
 
-			if (predicate is null)
-				throw new ArgumentNullException(nameof(predicate));
+	/// <summary>
+	/// Filters a sequence based on a predicate that compares each element with its previous element.
+	/// </summary>
+	/// <typeparam name="TSource">The type of elements in the sequence.</typeparam>
+	/// <param name="source">The sequence to filter.</param>
+	/// <param name="predicate">The function to test each element against its previous element.</param>
+	/// <returns>An enumerable of elements where the predicate returns true when compared to the previous element.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="source"/> or <paramref name="predicate"/> is null.</exception>
+	public static IEnumerable<TSource> WhereWithPrevious<TSource>(this IEnumerable<TSource> source, Func<TSource, TSource, bool> predicate)
+	{
+		if (source is null)
+			throw new ArgumentNullException(nameof(source));
 
-			using var iterator = source.GetEnumerator();
-			if (!iterator.MoveNext())
-				yield break;
+		if (predicate is null)
+			throw new ArgumentNullException(nameof(predicate));
 
-			var previous = iterator.Current;
-			yield return previous;
+		using var iterator = source.GetEnumerator();
+		if (!iterator.MoveNext())
+			yield break;
 
-			while (iterator.MoveNext())
-			{
-				var current = iterator.Current;
+		var previous = iterator.Current;
+		yield return previous;
 
-				if (!predicate(previous, current))
-					continue;
+		while (iterator.MoveNext())
+		{
+			var current = iterator.Current;
 
-				yield return current;
-				previous = current;
-			}
+			if (!predicate(previous, current))
+				continue;
+
+			yield return current;
+			previous = current;
 		}
+	}
 
-		/// <summary>
-		/// Binds a source notifying list to a destination list, synchronizing additions, removals, insertions, and clear operations.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the lists.</typeparam>
-		/// <param name="source">The source list that notifies changes.</param>
-		/// <param name="destination">The destination list to synchronize with.</param>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="source"/> or <paramref name="destination"/> is null.</exception>
-		public static void Bind<T>(this INotifyList<T> source, IList<T> destination)
-		{
-			if (source is null)
-				throw new ArgumentNullException(nameof(source));
+	/// <summary>
+	/// Binds a source notifying list to a destination list, synchronizing additions, removals, insertions, and clear operations.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the lists.</typeparam>
+	/// <param name="source">The source list that notifies changes.</param>
+	/// <param name="destination">The destination list to synchronize with.</param>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="source"/> or <paramref name="destination"/> is null.</exception>
+	public static void Bind<T>(this INotifyList<T> source, IList<T> destination)
+	{
+		if (source is null)
+			throw new ArgumentNullException(nameof(source));
 
-			if (destination is null)
-				throw new ArgumentNullException(nameof(destination));
+		if (destination is null)
+			throw new ArgumentNullException(nameof(destination));
 
-			source.Added += destination.Add;
-			source.Removed += item => destination.Remove(item);
-			source.Inserted += destination.Insert;
-			source.Cleared += destination.Clear;
+		source.Added += destination.Add;
+		source.Removed += item => destination.Remove(item);
+		source.Inserted += destination.Insert;
+		source.Cleared += destination.Clear;
 
-			source.ForEach(destination.Add);
-		}
+		source.ForEach(destination.Add);
+	}
 
-		/// <summary>
-		/// Computes the Damerau-Levenshtein distance between two sequences, with a threshold to limit computation.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the sequences, which must implement <see cref="IEquatable{T}"/>.</typeparam>
-		/// <param name="source">The first sequence.</param>
-		/// <param name="target">The second sequence.</param>
-		/// <param name="threshold">The maximum distance to compute; returns int.MaxValue if exceeded.</param>
-		/// <returns>The Damerau-Levenshtein distance, or int.MaxValue if it exceeds the threshold.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="source"/> or <paramref name="target"/> is null.</exception>
-		// http://stackoverflow.com/a/9454016
-		public static int DamerauLevenshteinDistance<T>(T[] source, T[] target, int threshold)
-			where T : IEquatable<T>
-		{
-			if (source is null)
-				throw new ArgumentNullException(nameof(source));
+	/// <summary>
+	/// Computes the Damerau-Levenshtein distance between two sequences, with a threshold to limit computation.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the sequences, which must implement <see cref="IEquatable{T}"/>.</typeparam>
+	/// <param name="source">The first sequence.</param>
+	/// <param name="target">The second sequence.</param>
+	/// <param name="threshold">The maximum distance to compute; returns int.MaxValue if exceeded.</param>
+	/// <returns>The Damerau-Levenshtein distance, or int.MaxValue if it exceeds the threshold.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="source"/> or <paramref name="target"/> is null.</exception>
+	// http://stackoverflow.com/a/9454016
+	public static int DamerauLevenshteinDistance<T>(T[] source, T[] target, int threshold)
+		where T : IEquatable<T>
+	{
+		if (source is null)
+			throw new ArgumentNullException(nameof(source));
 
-			if (target is null)
-				throw new ArgumentNullException(nameof(target));
+		if (target is null)
+			throw new ArgumentNullException(nameof(target));
 
-			var length1 = source.Length;
-			var length2 = target.Length;
+		var length1 = source.Length;
+		var length2 = target.Length;
 
-			// Return trivial case - difference in string lengths exceeds threshold
-			if (Math.Abs(length1 - length2) > threshold)
-				return int.MaxValue;
+		// Return trivial case - difference in string lengths exceeds threshold
+		if (Math.Abs(length1 - length2) > threshold)
+			return int.MaxValue;
 
-			// Ensure arrays [i] / length1 use shorter length
-			if (length1 > length2)
-			{
-				(target, source) = (source, target);
-				(length1, length2) = (length2, length1);
-			}
+		// Ensure arrays [i] / length1 use shorter length
+		if (length1 > length2)
+		{
+			(target, source) = (source, target);
+			(length1, length2) = (length2, length1);
+		}
 
-			var maxi = length1;
-			var maxj = length2;
+		var maxi = length1;
+		var maxj = length2;
 
-			var dCurrent = new int[maxi + 1];
-			var dMinus1 = new int[maxi + 1];
-			var dMinus2 = new int[maxi + 1];
+		var dCurrent = new int[maxi + 1];
+		var dMinus1 = new int[maxi + 1];
+		var dMinus2 = new int[maxi + 1];
 
-			for (var i = 0; i <= maxi; i++)
-				dCurrent[i] = i;
+		for (var i = 0; i <= maxi; i++)
+			dCurrent[i] = i;
 
-			var jm1 = 0;
+		var jm1 = 0;
 
-			for (var j = 1; j <= maxj; j++)
-			{
-				// Rotate
-				var dSwap = dMinus2;
-				dMinus2 = dMinus1;
-				dMinus1 = dCurrent;
-				dCurrent = dSwap;
-
-				// Initialize
-				var minDistance = int.MaxValue;
-				dCurrent[0] = j;
-				var im1 = 0;
-				var im2 = -1;
-
-				for (var i = 1; i <= maxi; i++)
-				{
-					var cost = source[im1].Equals(target[jm1]) ? 0 : 1;
+		for (var j = 1; j <= maxj; j++)
+		{
+			// Rotate
+			var dSwap = dMinus2;
+			dMinus2 = dMinus1;
+			dMinus1 = dCurrent;
+			dCurrent = dSwap;
 
-					var del = dCurrent[im1] + 1;
-					var ins = dMinus1[i] + 1;
-					var sub = dMinus1[im1] + cost;
+			// Initialize
+			var minDistance = int.MaxValue;
+			dCurrent[0] = j;
+			var im1 = 0;
+			var im2 = -1;
 
-					// Fastest execution for min value of 3 integers
-					var min = (del > ins) ? (ins > sub ? sub : ins) : (del > sub ? sub : del);
+			for (var i = 1; i <= maxi; i++)
+			{
+				var cost = source[im1].Equals(target[jm1]) ? 0 : 1;
 
-					if (i > 1 && j > 1 && source[im2].Equals(target[jm1]) && source[im1].Equals(target[j - 2]))
-						min = Math.Min(min, dMinus2[im2] + cost);
+				var del = dCurrent[im1] + 1;
+				var ins = dMinus1[i] + 1;
+				var sub = dMinus1[im1] + cost;
 
-					dCurrent[i] = min;
+				// Fastest execution for min value of 3 integers
+				var min = (del > ins) ? (ins > sub ? sub : ins) : (del > sub ? sub : del);
 
-					if (min < minDistance)
-						minDistance = min;
+				if (i > 1 && j > 1 && source[im2].Equals(target[jm1]) && source[im1].Equals(target[j - 2]))
+					min = Math.Min(min, dMinus2[im2] + cost);
 
-					im1++;
-					im2++;
-				}
+				dCurrent[i] = min;
 
-				jm1++;
+				if (min < minDistance)
+					minDistance = min;
 
-				if (minDistance > threshold)
-					return int.MaxValue;
+				im1++;
+				im2++;
 			}
 
-			var result = dCurrent[maxi];
-			return result > threshold ? int.MaxValue : result;
+			jm1++;
+
+			if (minDistance > threshold)
+				return int.MaxValue;
 		}
 
-		/// <summary>
-		/// Converts a sequence to a set using the default equality comparer.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the sequence.</typeparam>
-		/// <param name="values">The sequence to convert.</param>
-		/// <returns>A set containing the unique elements from the sequence.</returns>
-		public static ISet<T> ToSet<T>(this IEnumerable<T> values)
-		{
+		var result = dCurrent[maxi];
+		return result > threshold ? int.MaxValue : result;
+	}
+
+	/// <summary>
+	/// Converts a sequence to a set using the default equality comparer.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the sequence.</typeparam>
+	/// <param name="values">The sequence to convert.</param>
+	/// <returns>A set containing the unique elements from the sequence.</returns>
+	public static ISet<T> ToSet<T>(this IEnumerable<T> values)
+	{
 #if NETSTANDARD2_0
-			return new HashSet<T>(values);
+		return new HashSet<T>(values);
 #else
-			return values.ToHashSet();
+		return values.ToHashSet();
 #endif
-		}
+	}
 
-		/// <summary>
-		/// Converts a sequence of strings to a case-insensitive set.
-		/// </summary>
-		/// <param name="values">The sequence of strings to convert.</param>
-		/// <returns>A set containing the unique strings, ignoring case.</returns>
-		public static ISet<string> ToIgnoreCaseSet(this IEnumerable<string> values)
-		{
+	/// <summary>
+	/// Converts a sequence of strings to a case-insensitive set.
+	/// </summary>
+	/// <param name="values">The sequence of strings to convert.</param>
+	/// <returns>A set containing the unique strings, ignoring case.</returns>
+	public static ISet<string> ToIgnoreCaseSet(this IEnumerable<string> values)
+	{
 #if NETSTANDARD2_0
-			return new HashSet<string>(values, StringComparer.InvariantCultureIgnoreCase);
+		return new HashSet<string>(values, StringComparer.InvariantCultureIgnoreCase);
 #else
-			return values.ToHashSet(StringComparer.InvariantCultureIgnoreCase);
+		return values.ToHashSet(StringComparer.InvariantCultureIgnoreCase);
 #endif
-		}
+	}
 
-		/// <summary>
-		/// Splits a sequence into batches of a specified size.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the sequence.</typeparam>
-		/// <param name="source">The sequence to batch.</param>
-		/// <param name="size">The size of each batch.</param>
-		/// <returns>An enumerable of arrays, each containing up to <paramref name="size"/> elements.</returns>
-		public static IEnumerable<T[]> Batch<T>(this IEnumerable<T> source, int size)
-		{
+	/// <summary>
+	/// Splits a sequence into batches of a specified size.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the sequence.</typeparam>
+	/// <param name="source">The sequence to batch.</param>
+	/// <param name="size">The size of each batch.</param>
+	/// <returns>An enumerable of arrays, each containing up to <paramref name="size"/> elements.</returns>
+	public static IEnumerable<T[]> Batch<T>(this IEnumerable<T> source, int size)
+	{
 #if NETSTANDARD2_0
-			return Batch<T, T[]>(source, size, source => [.. source], () => false);
+		return Batch<T, T[]>(source, size, source => [.. source], () => false);
 #else
-			return source.Chunk(size);
+		return source.Chunk(size);
 #endif
-		}
+	}
 
-		/// <summary>
-		/// Splits a sequence into batches with custom result selection and stopping condition.
-		/// </summary>
-		/// <typeparam name="TSource">The type of elements in the sequence.</typeparam>
-		/// <typeparam name="TResult">The type of the result for each batch.</typeparam>
-		/// <param name="source">The sequence to batch.</param>
-		/// <param name="size">The maximum size of each batch.</param>
-		/// <param name="resultSelector">The function to transform each batch into a result.</param>
-		/// <param name="needStop">The function to determine if batching should stop prematurely.</param>
-		/// <returns>An enumerable of results, each representing a batch.</returns>
-		public static IEnumerable<TResult> Batch<TSource, TResult>(this IEnumerable<TSource> source, int size,
-			Func<IEnumerable<TSource>, TResult> resultSelector, Func<bool> needStop)
-		{
-			TSource[] bucket = null;
-			var count = 0;
+	/// <summary>
+	/// Splits a sequence into batches with custom result selection and stopping condition.
+	/// </summary>
+	/// <typeparam name="TSource">The type of elements in the sequence.</typeparam>
+	/// <typeparam name="TResult">The type of the result for each batch.</typeparam>
+	/// <param name="source">The sequence to batch.</param>
+	/// <param name="size">The maximum size of each batch.</param>
+	/// <param name="resultSelector">The function to transform each batch into a result.</param>
+	/// <param name="needStop">The function to determine if batching should stop prematurely.</param>
+	/// <returns>An enumerable of results, each representing a batch.</returns>
+	public static IEnumerable<TResult> Batch<TSource, TResult>(this IEnumerable<TSource> source, int size,
+		Func<IEnumerable<TSource>, TResult> resultSelector, Func<bool> needStop)
+	{
+		TSource[] bucket = null;
+		var count = 0;
 
-			foreach (var item in source)
-			{
-				bucket ??= new TSource[size];
+		foreach (var item in source)
+		{
+			bucket ??= new TSource[size];
 
-				bucket[count++] = item;
+			bucket[count++] = item;
 
-				// The bucket is fully buffered before it's yielded
-				if (count != size)
-				{
-					if (needStop?.Invoke() != true)
-						continue;
-				}
+			// The bucket is fully buffered before it's yielded
+			if (count != size)
+			{
+				if (needStop?.Invoke() != true)
+					continue;
+			}
 
-				// Select is necessary so bucket contents are streamed too
-				yield return resultSelector(bucket);
+			// Select is necessary so bucket contents are streamed too
+			yield return resultSelector(bucket);
 
-				bucket = null;
-				count = 0;
-			}
+			bucket = null;
+			count = 0;
+		}
 
-			// Return the last bucket with all remaining elements
-			if (bucket != null && count > 0)
-			{
-				Array.Resize(ref bucket, count);
-				yield return resultSelector(bucket);
-			}
+		// Return the last bucket with all remaining elements
+		if (bucket != null && count > 0)
+		{
+			Array.Resize(ref bucket, count);
+			yield return resultSelector(bucket);
 		}
+	}
 
-		/// <summary>
-		/// Appends a single value to the end of a sequence.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the sequence.</typeparam>
-		/// <param name="values">The sequence to append to.</param>
-		/// <param name="value">The value to append.</param>
-		/// <returns>An enumerable with the value appended.</returns>
-		public static IEnumerable<T> Append2<T>(this IEnumerable<T> values, T value)
-			=> Enumerable.Append(values, value);
+	/// <summary>
+	/// Appends a single value to the end of a sequence.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the sequence.</typeparam>
+	/// <param name="values">The sequence to append to.</param>
+	/// <param name="value">The value to append.</param>
+	/// <returns>An enumerable with the value appended.</returns>
+	public static IEnumerable<T> Append2<T>(this IEnumerable<T> values, T value)
+		=> Enumerable.Append(values, value);
 
-		/// <summary>
-		/// Asynchronously flattens a sequence of tasks that each return a sequence into a single sequence.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the source sequence.</typeparam>
-		/// <typeparam name="T1">The type of elements in the resulting sequence.</typeparam>
-		/// <param name="enumeration">The source sequence of elements.</param>
-		/// <param name="func">The asynchronous function to transform each element into a sequence.</param>
-		/// <returns>A task that resolves to a flattened sequence of results.</returns>
-		// https://stackoverflow.com/a/35874937
-		public static async Task<IEnumerable<T1>> SelectManyAsync<T, T1>(this IEnumerable<T> enumeration, Func<T, Task<IEnumerable<T1>>> func)
-			=> (await Task.WhenAll(enumeration.Select(func))).SelectMany(s => s);
+	/// <summary>
+	/// Asynchronously flattens a sequence of tasks that each return a sequence into a single sequence.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the source sequence.</typeparam>
+	/// <typeparam name="T1">The type of elements in the resulting sequence.</typeparam>
+	/// <param name="enumeration">The source sequence of elements.</param>
+	/// <param name="func">The asynchronous function to transform each element into a sequence.</param>
+	/// <returns>A task that resolves to a flattened sequence of results.</returns>
+	// https://stackoverflow.com/a/35874937
+	public static async Task<IEnumerable<T1>> SelectManyAsync<T, T1>(this IEnumerable<T> enumeration, Func<T, Task<IEnumerable<T1>>> func)
+		=> (await Task.WhenAll(enumeration.Select(func))).SelectMany(s => s);
 
-		/// <summary>
-		/// Converts a value tuple to a key-value pair.
-		/// </summary>
-		/// <typeparam name="TKey">The type of the key.</typeparam>
-		/// <typeparam name="TValue">The type of the value.</typeparam>
-		/// <param name="_">The value tuple to convert.</param>
-		/// <returns>A <see cref="KeyValuePair{TKey, TValue}"/> containing the tuple's key and value.</returns>
-		public static KeyValuePair<TKey, TValue> ToPair<TKey, TValue>(this (TKey key, TValue value) _)
-			=> new(_.key, _.value);
+	/// <summary>
+	/// Converts a value tuple to a key-value pair.
+	/// </summary>
+	/// <typeparam name="TKey">The type of the key.</typeparam>
+	/// <typeparam name="TValue">The type of the value.</typeparam>
+	/// <param name="_">The value tuple to convert.</param>
+	/// <returns>A <see cref="KeyValuePair{TKey, TValue}"/> containing the tuple's key and value.</returns>
+	public static KeyValuePair<TKey, TValue> ToPair<TKey, TValue>(this (TKey key, TValue value) _)
+		=> new(_.key, _.value);
 
-		/// <summary>
-		/// Adds a value tuple as a key-value pair to a dictionary.
-		/// </summary>
-		/// <typeparam name="TKey">The type of the key.</typeparam>
-		/// <typeparam name="TValue">The type of the value.</typeparam>
-		/// <param name="dict">The dictionary to add to.</param>
-		/// <param name="tuple">The value tuple to add.</param>
-		public static void Add<TKey, TValue>(this IDictionary<TKey, TValue> dict, (TKey key, TValue value) tuple)
-			=> dict.Add(tuple.ToPair());
+	/// <summary>
+	/// Adds a value tuple as a key-value pair to a dictionary.
+	/// </summary>
+	/// <typeparam name="TKey">The type of the key.</typeparam>
+	/// <typeparam name="TValue">The type of the value.</typeparam>
+	/// <param name="dict">The dictionary to add to.</param>
+	/// <param name="tuple">The value tuple to add.</param>
+	public static void Add<TKey, TValue>(this IDictionary<TKey, TValue> dict, (TKey key, TValue value) tuple)
+		=> dict.Add(tuple.ToPair());
 
-		/// <summary>
-		/// Applies an action to each element in a sequence.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the sequence.</typeparam>
-		/// <param name="source">The sequence to iterate over.</param>
-		/// <param name="action">The action to apply to each element.</param>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="source"/> or <paramref name="action"/> is null.</exception>
-		public static void ForEach<T>(this IEnumerable<T> source, Action<T> action)
-		{
-			if (source is null)
-				throw new ArgumentNullException(nameof(source));
+	/// <summary>
+	/// Applies an action to each element in a sequence.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the sequence.</typeparam>
+	/// <param name="source">The sequence to iterate over.</param>
+	/// <param name="action">The action to apply to each element.</param>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="source"/> or <paramref name="action"/> is null.</exception>
+	public static void ForEach<T>(this IEnumerable<T> source, Action<T> action)
+	{
+		if (source is null)
+			throw new ArgumentNullException(nameof(source));
 
-			if (action is null)
-				throw new ArgumentNullException(nameof(action));
+		if (action is null)
+			throw new ArgumentNullException(nameof(action));
 
-			foreach (var item in source)
-				action(item);
-		}
+		foreach (var item in source)
+			action(item);
+	}
 
-		/// <summary>
-		/// Generates all possible permutations of values selected from keys.
-		/// </summary>
-		/// <typeparam name="TKey">The type of keys.</typeparam>
-		/// <typeparam name="TValue">The type of values.</typeparam>
-		/// <param name="keys">The sequence of keys.</param>
-		/// <param name="selector">The function to select possible values for each key.</param>
-		/// <returns>An enumerable of arrays representing all permutations.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="keys"/> or <paramref name="selector"/> is null.</exception>
-		// https://stackoverflow.com/a/27328512
-		public static IEnumerable<TValue[]> Permutations<TKey, TValue>(this IEnumerable<TKey> keys, Func<TKey, IEnumerable<TValue>> selector)
-		{
-			if (keys is null)
-				throw new ArgumentNullException(nameof(keys));
+	/// <summary>
+	/// Generates all possible permutations of values selected from keys.
+	/// </summary>
+	/// <typeparam name="TKey">The type of keys.</typeparam>
+	/// <typeparam name="TValue">The type of values.</typeparam>
+	/// <param name="keys">The sequence of keys.</param>
+	/// <param name="selector">The function to select possible values for each key.</param>
+	/// <returns>An enumerable of arrays representing all permutations.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="keys"/> or <paramref name="selector"/> is null.</exception>
+	// https://stackoverflow.com/a/27328512
+	public static IEnumerable<TValue[]> Permutations<TKey, TValue>(this IEnumerable<TKey> keys, Func<TKey, IEnumerable<TValue>> selector)
+	{
+		if (keys is null)
+			throw new ArgumentNullException(nameof(keys));
 
-			if (selector is null)
-				throw new ArgumentNullException(nameof(selector));
+		if (selector is null)
+			throw new ArgumentNullException(nameof(selector));
 
-			var keyArray = keys.ToArray();
+		var keyArray = keys.ToArray();
 
-			if (keyArray.Length < 1)
-				yield break;
+		if (keyArray.Length < 1)
+			yield break;
+
+		static IEnumerable<TValue[]> Permutations(TKey[] keys, int index, Func<TKey, IEnumerable<TValue>> selector, TValue[] values)
+		{
+			var key = keys[index];
 
-			static IEnumerable<TValue[]> Permutations(TKey[] keys, int index, Func<TKey, IEnumerable<TValue>> selector, TValue[] values)
+			foreach (var value in selector(key))
 			{
-				var key = keys[index];
+				values[index] = value;
 
-				foreach (var value in selector(key))
+				if (index < keys.Length - 1)
 				{
-					values[index] = value;
-
-					if (index < keys.Length - 1)
-					{
-						foreach (var array in Permutations(keys, index + 1, selector, values))
-							yield return array;
-					}
-					else
-					{
-						// Clone the array
-						yield return values.ToArray();
-					}
+					foreach (var array in Permutations(keys, index + 1, selector, values))
+						yield return array;
+				}
+				else
+				{
+					// Clone the array
+					yield return values.ToArray();
 				}
 			}
+		}
 
-			var values = new TValue[keyArray.Length];
+		var values = new TValue[keyArray.Length];
 
-			foreach (var array in Permutations(keyArray, 0, selector, values))
-				yield return array;
-		}
+		foreach (var array in Permutations(keyArray, 0, selector, values))
+			yield return array;
+	}
 
-		/// <summary>
-		/// Returns the single element of a sequence if it contains exactly one element, otherwise returns the default value.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the sequence.</typeparam>
-		/// <param name="source">The sequence to query.</param>
-		/// <returns>The single element if the sequence has exactly one; otherwise, the default value of <typeparamref name="T"/>.</returns>
-		public static T SingleWhenOnly<T>(this IEnumerable<T> source)
-		{
-			if (source is ICollection<T> coll)
-				return coll.Count == 1 ? coll.First() : default;
-			else
-				return source.Count() == 1 ? source.First() : default;
-		}
+	/// <summary>
+	/// Returns the single element of a sequence if it contains exactly one element, otherwise returns the default value.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the sequence.</typeparam>
+	/// <param name="source">The sequence to query.</param>
+	/// <returns>The single element if the sequence has exactly one; otherwise, the default value of <typeparamref name="T"/>.</returns>
+	public static T SingleWhenOnly<T>(this IEnumerable<T> source)
+	{
+		if (source is ICollection<T> coll)
+			return coll.Count == 1 ? coll.First() : default;
+		else
+			return source.Count() == 1 ? source.First() : default;
+	}
 
 #if NETSTANDARD2_0
-		/// <summary>
-		/// Returns all elements of a sequence except the last specified number of elements.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the sequence.</typeparam>
-		/// <param name="source">The sequence to process.</param>
-		/// <param name="count">The number of elements to skip from the end.</param>
-		/// <returns>An enumerable with the last <paramref name="count"/> elements omitted.</returns>
-		public static IEnumerable<T> SkipLast<T>(this IEnumerable<T> source, int count)
-			=> source.Take(source.Count() - count);
+	/// <summary>
+	/// Returns all elements of a sequence except the last specified number of elements.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the sequence.</typeparam>
+	/// <param name="source">The sequence to process.</param>
+	/// <param name="count">The number of elements to skip from the end.</param>
+	/// <returns>An enumerable with the last <paramref name="count"/> elements omitted.</returns>
+	public static IEnumerable<T> SkipLast<T>(this IEnumerable<T> source, int count)
+		=> source.Take(source.Count() - count);
 
-		/// <summary>
-		/// Clears all elements from a concurrent queue.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the queue.</typeparam>
-		/// <param name="queue">The concurrent queue to clear.</param>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="queue"/> is null.</exception>
-		// .NET Standard 2.0 doesn't has Clear
-		public static void Clear<T>(this System.Collections.Concurrent.ConcurrentQueue<T> queue)
-		{
-			if (queue is null)
-				throw new ArgumentNullException(nameof(queue));
+	/// <summary>
+	/// Clears all elements from a concurrent queue.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the queue.</typeparam>
+	/// <param name="queue">The concurrent queue to clear.</param>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="queue"/> is null.</exception>
+	// .NET Standard 2.0 doesn't has Clear
+	public static void Clear<T>(this System.Collections.Concurrent.ConcurrentQueue<T> queue)
+	{
+		if (queue is null)
+			throw new ArgumentNullException(nameof(queue));
 
-			while (queue.TryDequeue(out _)) { }
-		}
+		while (queue.TryDequeue(out _)) { }
+	}
 #endif
 
-		/// <summary>
-		/// Counts the number of elements in a non-generic sequence.
-		/// </summary>
-		/// <param name="source">The sequence to count.</param>
-		/// <returns>The number of elements in the sequence.</returns>
-		public static int Count2(this IEnumerable source)
-		{
-			if (source is IList list)
-				return list.Count;
-			else if (source is ICollection c)
-				return c.Count;
-			else
-				return source.Cast<object>().Count();
-		}
+	/// <summary>
+	/// Counts the number of elements in a non-generic sequence.
+	/// </summary>
+	/// <param name="source">The sequence to count.</param>
+	/// <returns>The number of elements in the sequence.</returns>
+	public static int Count2(this IEnumerable source)
+	{
+		if (source is IList list)
+			return list.Count;
+		else if (source is ICollection c)
+			return c.Count;
+		else
+			return source.Cast<object>().Count();
 	}
 }
diff --git a/Collections/IBlockingQueue.cs b/Collections/IBlockingQueue.cs
index 3c456ce4..f39ed8a3 100644
--- a/Collections/IBlockingQueue.cs
+++ b/Collections/IBlockingQueue.cs
@@ -1,81 +1,80 @@
-namespace Ecng.Collections
+namespace Ecng.Collections;
+
+/// <summary>
+/// Represents a blocking queue interface for managing items in a thread-safe manner.
+/// </summary>
+/// <typeparam name="T">The type of elements in the queue.</typeparam>
+public interface IBlockingQueue<T>
 {
 	/// <summary>
-	/// Represents a blocking queue interface for managing items in a thread-safe manner.
+	/// Gets the number of elements contained in the queue.
 	/// </summary>
-	/// <typeparam name="T">The type of elements in the queue.</typeparam>
-	public interface IBlockingQueue<T>
-	{
-		/// <summary>
-		/// Gets the number of elements contained in the queue.
-		/// </summary>
-		int Count { get; }
+	int Count { get; }
 
-		/// <summary>
-		/// Gets or sets the maximum number of elements that the queue can hold.
-		/// </summary>
-		int MaxSize { get; set; }
+	/// <summary>
+	/// Gets or sets the maximum number of elements that the queue can hold.
+	/// </summary>
+	int MaxSize { get; set; }
 
-		/// <summary>
-		/// Gets a value indicating whether the queue is closed.
-		/// </summary>
-		bool IsClosed { get; }
+	/// <summary>
+	/// Gets a value indicating whether the queue is closed.
+	/// </summary>
+	bool IsClosed { get; }
 
-		/// <summary>
-		/// Opens the queue, enabling enqueuing and dequeuing operations.
-		/// </summary>
-		void Open();
+	/// <summary>
+	/// Opens the queue, enabling enqueuing and dequeuing operations.
+	/// </summary>
+	void Open();
 
-		/// <summary>
-		/// Closes the queue to prevent further enqueuing operations.
-		/// </summary>
-		void Close();
+	/// <summary>
+	/// Closes the queue to prevent further enqueuing operations.
+	/// </summary>
+	void Close();
 
-		/// <summary>
-		/// Blocks the current thread until the queue becomes empty.
-		/// </summary>
-		void WaitUntilEmpty();
+	/// <summary>
+	/// Blocks the current thread until the queue becomes empty.
+	/// </summary>
+	void WaitUntilEmpty();
 
-		/// <summary>
-		/// Adds an item to the end of the queue.
-		/// </summary>
-		/// <param name="item">The item to add.</param>
-		/// <param name="force">If set to <c>true</c>, the item is enqueued even if the queue is at its maximum capacity.</param>
-		void Enqueue(T item, bool force = false);
+	/// <summary>
+	/// Adds an item to the end of the queue.
+	/// </summary>
+	/// <param name="item">The item to add.</param>
+	/// <param name="force">If set to <c>true</c>, the item is enqueued even if the queue is at its maximum capacity.</param>
+	void Enqueue(T item, bool force = false);
 
-		/// <summary>
-		/// Removes and returns the object at the beginning of the queue.
-		/// </summary>
-		/// <returns>The object that is removed from the beginning of the queue.</returns>
-		T Dequeue();
+	/// <summary>
+	/// Removes and returns the object at the beginning of the queue.
+	/// </summary>
+	/// <returns>The object that is removed from the beginning of the queue.</returns>
+	T Dequeue();
 
-		/// <summary>
-		/// Attempts to remove and return the object at the beginning of the queue.
-		/// </summary>
-		/// <param name="value">When this method returns, contains the object removed from the beginning of the queue, if the operation succeeded.</param>
-		/// <param name="exitOnClose">If set to <c>true</c>, the operation exits if the queue is closed.</param>
-		/// <param name="block">If set to <c>true</c>, blocks until an item is available.</param>
-		/// <returns><c>true</c> if an object was successfully removed; otherwise, <c>false</c>.</returns>
-		bool TryDequeue(out T value, bool exitOnClose = true, bool block = true);
+	/// <summary>
+	/// Attempts to remove and return the object at the beginning of the queue.
+	/// </summary>
+	/// <param name="value">When this method returns, contains the object removed from the beginning of the queue, if the operation succeeded.</param>
+	/// <param name="exitOnClose">If set to <c>true</c>, the operation exits if the queue is closed.</param>
+	/// <param name="block">If set to <c>true</c>, blocks until an item is available.</param>
+	/// <returns><c>true</c> if an object was successfully removed; otherwise, <c>false</c>.</returns>
+	bool TryDequeue(out T value, bool exitOnClose = true, bool block = true);
 
-		/// <summary>
-		/// Returns the object at the beginning of the queue without removing it.
-		/// </summary>
-		/// <returns>The object at the beginning of the queue.</returns>
-		T Peek();
+	/// <summary>
+	/// Returns the object at the beginning of the queue without removing it.
+	/// </summary>
+	/// <returns>The object at the beginning of the queue.</returns>
+	T Peek();
 
-		/// <summary>
-		/// Attempts to return the object at the beginning of the queue without removing it.
-		/// </summary>
-		/// <param name="value">When this method returns, contains the object at the beginning of the queue, if the operation succeeded.</param>
-		/// <param name="exitOnClose">If set to <c>true</c>, the operation exits if the queue is closed.</param>
-		/// <param name="block">If set to <c>true</c>, blocks until an item is available.</param>
-		/// <returns><c>true</c> if an object was successfully retrieved; otherwise, <c>false</c>.</returns>
-		bool TryPeek(out T value, bool exitOnClose = true, bool block = true);
+	/// <summary>
+	/// Attempts to return the object at the beginning of the queue without removing it.
+	/// </summary>
+	/// <param name="value">When this method returns, contains the object at the beginning of the queue, if the operation succeeded.</param>
+	/// <param name="exitOnClose">If set to <c>true</c>, the operation exits if the queue is closed.</param>
+	/// <param name="block">If set to <c>true</c>, blocks until an item is available.</param>
+	/// <returns><c>true</c> if an object was successfully retrieved; otherwise, <c>false</c>.</returns>
+	bool TryPeek(out T value, bool exitOnClose = true, bool block = true);
 
-		/// <summary>
-		/// Removes all objects from the queue.
-		/// </summary>
-		void Clear();
-	}
+	/// <summary>
+	/// Removes all objects from the queue.
+	/// </summary>
+	void Clear();
 }
\ No newline at end of file
diff --git a/Collections/ICollectionEx.cs b/Collections/ICollectionEx.cs
index 291eaf78..9fa00bf2 100644
--- a/Collections/ICollectionEx.cs
+++ b/Collections/ICollectionEx.cs
@@ -1,42 +1,41 @@
-namespace Ecng.Collections
-{
-	using System;
-	using System.Collections.Generic;
+namespace Ecng.Collections;
+
+using System;
+using System.Collections.Generic;
 
+/// <summary>
+/// Provides an extended set of methods and events for collections of a specified type.
+/// </summary>
+/// <typeparam name="T">The type of elements in the collection.</typeparam>
+public interface ICollectionEx<T> : ICollection<T>
+{
 	/// <summary>
-	/// Provides an extended set of methods and events for collections of a specified type.
+	/// Occurs when a range of elements is added.
 	/// </summary>
-	/// <typeparam name="T">The type of elements in the collection.</typeparam>
-	public interface ICollectionEx<T> : ICollection<T>
-	{
-		/// <summary>
-		/// Occurs when a range of elements is added.
-		/// </summary>
-		event Action<IEnumerable<T>> AddedRange;
+	event Action<IEnumerable<T>> AddedRange;
 
-		/// <summary>
-		/// Occurs when a range of elements is removed.
-		/// </summary>
-		event Action<IEnumerable<T>> RemovedRange;
+	/// <summary>
+	/// Occurs when a range of elements is removed.
+	/// </summary>
+	event Action<IEnumerable<T>> RemovedRange;
 
-		/// <summary>
-		/// Adds a range of elements to the collection.
-		/// </summary>
-		/// <param name="items">The elements to add.</param>
-		void AddRange(IEnumerable<T> items);
+	/// <summary>
+	/// Adds a range of elements to the collection.
+	/// </summary>
+	/// <param name="items">The elements to add.</param>
+	void AddRange(IEnumerable<T> items);
 
-		/// <summary>
-		/// Removes a range of elements from the collection.
-		/// </summary>
-		/// <param name="items">The elements to remove.</param>
-		void RemoveRange(IEnumerable<T> items);
+	/// <summary>
+	/// Removes a range of elements from the collection.
+	/// </summary>
+	/// <param name="items">The elements to remove.</param>
+	void RemoveRange(IEnumerable<T> items);
 
-		/// <summary>
-		/// Removes a specified number of elements starting at a certain index.
-		/// </summary>
-		/// <param name="index">The starting index.</param>
-		/// <param name="count">The number of elements to remove.</param>
-		/// <returns>The number of removed elements.</returns>
-		int RemoveRange(int index, int count);
-	}
+	/// <summary>
+	/// Removes a specified number of elements starting at a certain index.
+	/// </summary>
+	/// <param name="index">The starting index.</param>
+	/// <param name="count">The number of elements to remove.</param>
+	/// <returns>The number of removed elements.</returns>
+	int RemoveRange(int index, int count);
 }
\ No newline at end of file
diff --git a/Collections/IEnumerableEx.cs b/Collections/IEnumerableEx.cs
index 90938298..c6045a70 100644
--- a/Collections/IEnumerableEx.cs
+++ b/Collections/IEnumerableEx.cs
@@ -1,24 +1,23 @@
-namespace Ecng.Collections
-{
-	using System.Collections;
-	using System.Collections.Generic;
+namespace Ecng.Collections;
 
-	/// <summary>
-	/// Extended version of <see cref="IEnumerable"/> that provides the total number of elements.
-	/// </summary>
-	public interface IEnumerableEx : IEnumerable
-	{
-		/// <summary>
-		/// Gets the total number of elements.
-		/// </summary>
-		int Count { get; }
-	}
+using System.Collections;
+using System.Collections.Generic;
 
+/// <summary>
+/// Extended version of <see cref="IEnumerable"/> that provides the total number of elements.
+/// </summary>
+public interface IEnumerableEx : IEnumerable
+{
 	/// <summary>
-	/// Extended version of <see cref="IEnumerable{T}"/> that provides the total number of elements.
+	/// Gets the total number of elements.
 	/// </summary>
-	/// <typeparam name="T">The type of the element.</typeparam>
-	public interface IEnumerableEx<out T> : IEnumerable<T>, IEnumerableEx
-	{
-	}
+	int Count { get; }
+}
+
+/// <summary>
+/// Extended version of <see cref="IEnumerable{T}"/> that provides the total number of elements.
+/// </summary>
+/// <typeparam name="T">The type of the element.</typeparam>
+public interface IEnumerableEx<out T> : IEnumerable<T>, IEnumerableEx
+{
 }
\ No newline at end of file
diff --git a/Collections/IListEx.cs b/Collections/IListEx.cs
index b5519c54..42e02f99 100644
--- a/Collections/IListEx.cs
+++ b/Collections/IListEx.cs
@@ -1,12 +1,11 @@
-namespace Ecng.Collections
-{
-	using System.Collections.Generic;
+namespace Ecng.Collections;
+
+using System.Collections.Generic;
 
-	/// <summary>
-	/// Provides an extended set of methods and events for lists of a specified type.
-	/// </summary>
-	/// <typeparam name="T">The type of elements in the list.</typeparam>
-	public interface IListEx<T> : IList<T>, ICollectionEx<T>
-	{
-	}
+/// <summary>
+/// Provides an extended set of methods and events for lists of a specified type.
+/// </summary>
+/// <typeparam name="T">The type of elements in the list.</typeparam>
+public interface IListEx<T> : IList<T>, ICollectionEx<T>
+{
 }
\ No newline at end of file
diff --git a/Collections/INotifyList.cs b/Collections/INotifyList.cs
index 62f82d6b..2aea09da 100644
--- a/Collections/INotifyList.cs
+++ b/Collections/INotifyList.cs
@@ -1,78 +1,77 @@
-namespace Ecng.Collections
-{
-	using System;
-	using System.Collections.Generic;
+namespace Ecng.Collections;
+
+using System;
+using System.Collections.Generic;
 
+/// <summary>
+/// Represents a collection that notifies about its changes.
+/// </summary>
+/// <typeparam name="TItem">The type of elements in the collection.</typeparam>
+public interface INotifyCollection<TItem> : ICollection<TItem>
+{
 	/// <summary>
-	/// Represents a collection that notifies about its changes.
+	/// Occurs before adding an item, allowing cancellation.
 	/// </summary>
-	/// <typeparam name="TItem">The type of elements in the collection.</typeparam>
-	public interface INotifyCollection<TItem> : ICollection<TItem>
-	{
-		/// <summary>
-		/// Occurs before adding an item, allowing cancellation.
-		/// </summary>
-		event Func<TItem, bool> Adding;
+	event Func<TItem, bool> Adding;
 
-		/// <summary>
-		/// Occurs after an item has been added.
-		/// </summary>
-		event Action<TItem> Added;
-
-		/// <summary>
-		/// Occurs before removing an item, allowing cancellation.
-		/// </summary>
-		event Func<TItem, bool> Removing;
-
-		/// <summary>
-		/// Occurs before removing an item at a specific index, allowing cancellation.
-		/// </summary>
-		event Func<int, bool> RemovingAt;
+	/// <summary>
+	/// Occurs after an item has been added.
+	/// </summary>
+	event Action<TItem> Added;
 
-		/// <summary>
-		/// Occurs after an item has been removed.
-		/// </summary>
-		event Action<TItem> Removed;
+	/// <summary>
+	/// Occurs before removing an item, allowing cancellation.
+	/// </summary>
+	event Func<TItem, bool> Removing;
 
-		/// <summary>
-		/// Occurs before clearing the collection, allowing cancellation.
-		/// </summary>
-		event Func<bool> Clearing;
+	/// <summary>
+	/// Occurs before removing an item at a specific index, allowing cancellation.
+	/// </summary>
+	event Func<int, bool> RemovingAt;
 
-		/// <summary>
-		/// Occurs after the collection has been cleared.
-		/// </summary>
-		event Action Cleared;
+	/// <summary>
+	/// Occurs after an item has been removed.
+	/// </summary>
+	event Action<TItem> Removed;
 
-		/// <summary>
-		/// Occurs before inserting an item at a specified index, allowing cancellation.
-		/// </summary>
-		event Func<int, TItem, bool> Inserting;
+	/// <summary>
+	/// Occurs before clearing the collection, allowing cancellation.
+	/// </summary>
+	event Func<bool> Clearing;
 
-		/// <summary>
-		/// Occurs after an item has been inserted at a specific index.
-		/// </summary>
-		event Action<int, TItem> Inserted;
+	/// <summary>
+	/// Occurs after the collection has been cleared.
+	/// </summary>
+	event Action Cleared;
 
-		/// <summary>
-		/// Occurs when a change happens in the collection.
-		/// </summary>
-		event Action Changed;
-	}
+	/// <summary>
+	/// Occurs before inserting an item at a specified index, allowing cancellation.
+	/// </summary>
+	event Func<int, TItem, bool> Inserting;
 
 	/// <summary>
-	/// Represents a list that notifies about its changes.
+	/// Occurs after an item has been inserted at a specific index.
 	/// </summary>
-	/// <typeparam name="TItem">The type of elements in the list.</typeparam>
-	public interface INotifyList<TItem> : INotifyCollection<TItem>, IList<TItem>
-	{
-	}
+	event Action<int, TItem> Inserted;
 
 	/// <summary>
-	/// Represents an extended list that notifies about its changes.
+	/// Occurs when a change happens in the collection.
 	/// </summary>
-	/// <typeparam name="TItem">The type of elements in the extended list.</typeparam>
-	public interface INotifyListEx<TItem> : INotifyList<TItem>, IListEx<TItem>
-	{
-	}
+	event Action Changed;
+}
+
+/// <summary>
+/// Represents a list that notifies about its changes.
+/// </summary>
+/// <typeparam name="TItem">The type of elements in the list.</typeparam>
+public interface INotifyList<TItem> : INotifyCollection<TItem>, IList<TItem>
+{
+}
+
+/// <summary>
+/// Represents an extended list that notifies about its changes.
+/// </summary>
+/// <typeparam name="TItem">The type of elements in the extended list.</typeparam>
+public interface INotifyListEx<TItem> : INotifyList<TItem>, IListEx<TItem>
+{
 }
\ No newline at end of file
diff --git a/Collections/ISynchronizedCollection.cs b/Collections/ISynchronizedCollection.cs
index fbbfa129..438ad9f1 100644
--- a/Collections/ISynchronizedCollection.cs
+++ b/Collections/ISynchronizedCollection.cs
@@ -1,24 +1,23 @@
-namespace Ecng.Collections
-{
-	using System.Collections.Generic;
-	using Ecng.Common;
+namespace Ecng.Collections;
 
-	/// <summary>
-	/// Represents a collection that can be synchronized using a <see cref="SyncObject"/>.
-	/// </summary>
-	public interface ISynchronizedCollection
-	{
-		/// <summary>
-		/// Gets the synchronization object used for thread-safe operations.
-		/// </summary>
-		SyncObject SyncRoot { get; }
-	}
+using System.Collections.Generic;
+using Ecng.Common;
 
+/// <summary>
+/// Represents a collection that can be synchronized using a <see cref="SyncObject"/>.
+/// </summary>
+public interface ISynchronizedCollection
+{
 	/// <summary>
-	/// Represents a generic synchronized collection.
+	/// Gets the synchronization object used for thread-safe operations.
 	/// </summary>
-	/// <typeparam name="T">The type of elements in the collection.</typeparam>
-	public interface ISynchronizedCollection<T> : ISynchronizedCollection, ICollection<T>
-	{
-	}
+	SyncObject SyncRoot { get; }
+}
+
+/// <summary>
+/// Represents a generic synchronized collection.
+/// </summary>
+/// <typeparam name="T">The type of elements in the collection.</typeparam>
+public interface ISynchronizedCollection<T> : ISynchronizedCollection, ICollection<T>
+{
 }
\ No newline at end of file
diff --git a/Collections/KeyedCollection.cs b/Collections/KeyedCollection.cs
index 8ed8502c..d3c27849 100644
--- a/Collections/KeyedCollection.cs
+++ b/Collections/KeyedCollection.cs
@@ -1,255 +1,254 @@
-namespace Ecng.Collections
+namespace Ecng.Collections;
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+/// <summary>
+/// Represents an abstract dictionary-backed collection that manages key-value pairs with customizable behavior.
+/// </summary>
+/// <typeparam name="TKey">The type of keys in the collection.</typeparam>
+/// <typeparam name="TValue">The type of values in the collection.</typeparam>
+[Serializable]
+public abstract class KeyedCollection<TKey, TValue>(IDictionary<TKey, TValue> innerDictionary) : IDictionary<TKey, TValue>
 {
-	using System;
-	using System.Collections;
-	using System.Collections.Generic;
-
 	/// <summary>
-	/// Represents an abstract dictionary-backed collection that manages key-value pairs with customizable behavior.
+	/// Initializes a new instance of the <see cref="KeyedCollection{TKey, TValue}"/> class with a default dictionary.
 	/// </summary>
-	/// <typeparam name="TKey">The type of keys in the collection.</typeparam>
-	/// <typeparam name="TValue">The type of values in the collection.</typeparam>
-	[Serializable]
-	public abstract class KeyedCollection<TKey, TValue>(IDictionary<TKey, TValue> innerDictionary) : IDictionary<TKey, TValue>
+	protected KeyedCollection()
+		: this(new Dictionary<TKey, TValue>())
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="KeyedCollection{TKey, TValue}"/> class with a default dictionary.
-		/// </summary>
-		protected KeyedCollection()
-			: this(new Dictionary<TKey, TValue>())
-		{
-		}
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="KeyedCollection{TKey, TValue}"/> class with a specified key comparer.
-		/// </summary>
-		/// <param name="comparer">The equality comparer for keys, or null to use the default comparer.</param>
-		protected KeyedCollection(IEqualityComparer<TKey> comparer)
-			: this(new Dictionary<TKey, TValue>(comparer))
-		{
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="KeyedCollection{TKey, TValue}"/> class with a specified key comparer.
+	/// </summary>
+	/// <param name="comparer">The equality comparer for keys, or null to use the default comparer.</param>
+	protected KeyedCollection(IEqualityComparer<TKey> comparer)
+		: this(new Dictionary<TKey, TValue>(comparer))
+	{
+	}
 
-		/// <summary>
-		/// Gets the underlying dictionary that stores the key-value pairs.
-		/// </summary>
-		protected IDictionary<TKey, TValue> InnerDictionary { get; } = innerDictionary ?? throw new ArgumentNullException(nameof(innerDictionary));
-
-		/// <summary>
-		/// Adds the specified key-value pair to the collection.
-		/// </summary>
-		/// <param name="key">The key to add.</param>
-		/// <param name="value">The value to add.</param>
-		/// <exception cref="ArgumentException">Thrown when the key-value pair cannot be added, as determined by <see cref="CanAdd"/>.</exception>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="key"/> is null and the underlying dictionary does not permit null keys.</exception>
-		public virtual void Add(TKey key, TValue value)
-		{
-			if (!CanAdd(key, value))
-				throw new ArgumentException();
+	/// <summary>
+	/// Gets the underlying dictionary that stores the key-value pairs.
+	/// </summary>
+	protected IDictionary<TKey, TValue> InnerDictionary { get; } = innerDictionary ?? throw new ArgumentNullException(nameof(innerDictionary));
 
-			OnAdding(key, value);
-			InnerDictionary.Add(key, value);
-			OnAdded(key, value);
-		}
+	/// <summary>
+	/// Adds the specified key-value pair to the collection.
+	/// </summary>
+	/// <param name="key">The key to add.</param>
+	/// <param name="value">The value to add.</param>
+	/// <exception cref="ArgumentException">Thrown when the key-value pair cannot be added, as determined by <see cref="CanAdd"/>.</exception>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="key"/> is null and the underlying dictionary does not permit null keys.</exception>
+	public virtual void Add(TKey key, TValue value)
+	{
+		if (!CanAdd(key, value))
+			throw new ArgumentException();
 
-		/// <summary>
-		/// Gets or sets the value associated with the specified key.
-		/// </summary>
-		/// <param name="key">The key whose value is to be retrieved or set.</param>
-		/// <returns>The value associated with the specified key.</returns>
-		/// <exception cref="KeyNotFoundException">Thrown when getting a value and the key is not found in the collection.</exception>
-		/// <exception cref="ArgumentNullException">Thrown when setting a value and <paramref name="key"/> is null, if the underlying dictionary does not permit null keys.</exception>
-		public virtual TValue this[TKey key]
-		{
-			get => InnerDictionary[key];
-			set
-			{
-				OnSetting(key, value);
-				InnerDictionary[key] = value;
-				OnSetted(key, value);
-			}
-		}
+		OnAdding(key, value);
+		InnerDictionary.Add(key, value);
+		OnAdded(key, value);
+	}
 
-		/// <summary>
-		/// Removes all items from the collection.
-		/// </summary>
-		public virtual void Clear()
+	/// <summary>
+	/// Gets or sets the value associated with the specified key.
+	/// </summary>
+	/// <param name="key">The key whose value is to be retrieved or set.</param>
+	/// <returns>The value associated with the specified key.</returns>
+	/// <exception cref="KeyNotFoundException">Thrown when getting a value and the key is not found in the collection.</exception>
+	/// <exception cref="ArgumentNullException">Thrown when setting a value and <paramref name="key"/> is null, if the underlying dictionary does not permit null keys.</exception>
+	public virtual TValue this[TKey key]
+	{
+		get => InnerDictionary[key];
+		set
 		{
-			OnClearing();
-			InnerDictionary.Clear();
-			OnCleared();
+			OnSetting(key, value);
+			InnerDictionary[key] = value;
+			OnSetted(key, value);
 		}
+	}
 
-		/// <summary>
-		/// Removes the value with the specified key from the collection.
-		/// </summary>
-		/// <param name="key">The key of the element to remove.</param>
-		/// <returns>True if the element was found and removed; otherwise, false.</returns>
-		public virtual bool Remove(TKey key)
-		{
-			if (InnerDictionary.TryGetValue(key, out var value))
-			{
-				OnRemoving(key, value);
-				var retVal = InnerDictionary.Remove(key);
-				OnRemoved(key, value);
-				return retVal;
-			}
-			else
-				return false;
-		}
+	/// <summary>
+	/// Removes all items from the collection.
+	/// </summary>
+	public virtual void Clear()
+	{
+		OnClearing();
+		InnerDictionary.Clear();
+		OnCleared();
+	}
 
-		/// <summary>
-		/// Attempts to retrieve the value associated with the specified key.
-		/// </summary>
-		/// <param name="key">The key to locate.</param>
-		/// <param name="value">When this method returns, contains the value associated with the key if found; otherwise, the default value of <typeparamref name="TValue"/>.</param>
-		/// <returns>True if the key was found; otherwise, false.</returns>
-		public virtual bool TryGetValue(TKey key, out TValue value)
+	/// <summary>
+	/// Removes the value with the specified key from the collection.
+	/// </summary>
+	/// <param name="key">The key of the element to remove.</param>
+	/// <returns>True if the element was found and removed; otherwise, false.</returns>
+	public virtual bool Remove(TKey key)
+	{
+		if (InnerDictionary.TryGetValue(key, out var value))
 		{
-			return InnerDictionary.TryGetValue(key, out value);
+			OnRemoving(key, value);
+			var retVal = InnerDictionary.Remove(key);
+			OnRemoved(key, value);
+			return retVal;
 		}
+		else
+			return false;
+	}
 
-		/// <summary>
-		/// Gets the number of key-value pairs in the collection.
-		/// </summary>
-		public virtual int Count => InnerDictionary.Count;
+	/// <summary>
+	/// Attempts to retrieve the value associated with the specified key.
+	/// </summary>
+	/// <param name="key">The key to locate.</param>
+	/// <param name="value">When this method returns, contains the value associated with the key if found; otherwise, the default value of <typeparamref name="TValue"/>.</param>
+	/// <returns>True if the key was found; otherwise, false.</returns>
+	public virtual bool TryGetValue(TKey key, out TValue value)
+	{
+		return InnerDictionary.TryGetValue(key, out value);
+	}
 
-		/// <summary>
-		/// Returns an enumerator that iterates through the collection.
-		/// </summary>
-		/// <returns>An <see cref="IEnumerator{T}"/> that can be used to iterate through the collection.</returns>
-		public virtual IEnumerator<KeyValuePair<TKey, TValue>> GetEnumerator()
-		{
-			return InnerDictionary.GetEnumerator();
-		}
+	/// <summary>
+	/// Gets the number of key-value pairs in the collection.
+	/// </summary>
+	public virtual int Count => InnerDictionary.Count;
 
-		/// <summary>
-		/// Called before adding a key-value pair to the collection.
-		/// </summary>
-		/// <param name="key">The key being added.</param>
-		/// <param name="value">The value being added.</param>
-		/// <remarks>This method is intended for derived classes to implement custom logic before an addition occurs.</remarks>
-		protected virtual void OnAdding(TKey key, TValue value) { }
-
-		/// <summary>
-		/// Called after a key-value pair has been added to the collection.
-		/// </summary>
-		/// <param name="key">The key that was added.</param>
-		/// <param name="value">The value that was added.</param>
-		/// <remarks>This method is intended for derived classes to implement custom logic after an addition occurs.</remarks>
-		protected virtual void OnAdded(TKey key, TValue value) { }
-
-		/// <summary>
-		/// Called before setting a new value for an existing key.
-		/// </summary>
-		/// <param name="key">The key being updated.</param>
-		/// <param name="value">The new value to set.</param>
-		/// <remarks>This method is intended for derived classes to implement custom logic before a value is updated.</remarks>
-		protected virtual void OnSetting(TKey key, TValue value) { }
-
-		/// <summary>
-		/// Called after a new value has been set for an existing key.
-		/// </summary>
-		/// <param name="key">The key that was updated.</param>
-		/// <param name="value">The new value that was set.</param>
-		/// <remarks>This method is intended for derived classes to implement custom logic after a value is updated.</remarks>
-		protected virtual void OnSetted(TKey key, TValue value) { }
-
-		/// <summary>
-		/// Called before clearing all items from the collection.
-		/// </summary>
-		/// <remarks>This method is intended for derived classes to implement custom logic before clearing occurs.</remarks>
-		protected virtual void OnClearing() {}
-
-		/// <summary>
-		/// Called after all items have been cleared from the collection.
-		/// </summary>
-		/// <remarks>This method is intended for derived classes to implement custom logic after clearing occurs.</remarks>
-		protected virtual void OnCleared() {}
-
-		/// <summary>
-		/// Called before removing a key-value pair from the collection.
-		/// </summary>
-		/// <param name="key">The key being removed.</param>
-		/// <param name="value">The value being removed.</param>
-		/// <remarks>This method is intended for derived classes to implement custom logic before a removal occurs.</remarks>
-		protected virtual void OnRemoving(TKey key, TValue value) { }
-
-		/// <summary>
-		/// Called after a key-value pair has been removed from the collection.
-		/// </summary>
-		/// <param name="key">The key that was removed.</param>
-		/// <param name="value">The value that was removed.</param>
-		/// <remarks>This method is intended for derived classes to implement custom logic after a removal occurs.</remarks>
-		protected virtual void OnRemoved(TKey key, TValue value) { }
-
-		/// <summary>
-		/// Determines whether a key-value pair can be added to the collection.
-		/// </summary>
-		/// <param name="key">The key to check.</param>
-		/// <param name="value">The value to check.</param>
-		/// <returns>True if the pair can be added; otherwise, false.</returns>
-		/// <remarks>This method is intended for derived classes to enforce custom addition constraints. The default implementation always returns true.</remarks>
-		protected virtual bool CanAdd(TKey key, TValue value) => true;
-
-		/// <summary>
-		/// Gets a collection containing the keys in the dictionary.
-		/// </summary>
-		public ICollection<TKey> Keys => InnerDictionary.Keys;
-
-		/// <summary>
-		/// Gets a collection containing the values in the dictionary.
-		/// </summary>
-		public ICollection<TValue> Values => InnerDictionary.Values;
-
-		/// <summary>
-		/// Gets a value indicating whether the collection is read-only.
-		/// </summary>
-		bool ICollection<KeyValuePair<TKey, TValue>>.IsReadOnly => InnerDictionary.IsReadOnly;
-
-		/// <summary>
-		/// Determines whether the collection contains an element with the specified key.
-		/// </summary>
-		/// <param name="key">The key to locate.</param>
-		/// <returns>True if the key is found; otherwise, false.</returns>
-		public bool ContainsKey(TKey key) => InnerDictionary.ContainsKey(key);
-
-		/// <summary>
-		/// Adds a key-value pair to the collection.
-		/// </summary>
-		/// <param name="item">The key-value pair to add.</param>
-		/// <exception cref="ArgumentException">Thrown when the pair cannot be added, as determined by <see cref="CanAdd"/>.</exception>
-		public void Add(KeyValuePair<TKey, TValue> item) => Add(item.Key, item.Value);
-
-		/// <summary>
-		/// Determines whether the collection contains a specific key-value pair.
-		/// </summary>
-		/// <param name="item">The key-value pair to locate.</param>
-		/// <returns>True if the pair is found; otherwise, false.</returns>
-		/// <remarks>This implementation only checks the presence of the key, not the value equality.</remarks>
-		public bool Contains(KeyValuePair<TKey, TValue> item) => ContainsKey(item.Key);
-
-		/// <summary>
-		/// Copies the elements of the collection to an array, starting at the specified index.
-		/// </summary>
-		/// <param name="array">The destination array to copy to.</param>
-		/// <param name="arrayIndex">The zero-based index in the array at which copying begins.</param>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="array"/> is null.</exception>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="arrayIndex"/> is negative.</exception>
-		/// <exception cref="ArgumentException">Thrown when the destination array is too small to accommodate the elements.</exception>
-		public void CopyTo(KeyValuePair<TKey, TValue>[] array, int arrayIndex) => InnerDictionary.CopyTo(array, arrayIndex);
-
-		/// <summary>
-		/// Removes a specific key-value pair from the collection.
-		/// </summary>
-		/// <param name="item">The key-value pair to remove.</param>
-		/// <returns>True if the pair was found and removed; otherwise, false.</returns>
-		/// <remarks>This implementation only considers the key for removal, ignoring the value in <paramref name="item"/>.</remarks>
-		public bool Remove(KeyValuePair<TKey, TValue> item) => Remove(item.Key);
-
-		/// <summary>
-		/// Returns an enumerator that iterates through the collection (non-generic version).
-		/// </summary>
-		/// <returns>An <see cref="IEnumerator"/> that can be used to iterate through the collection.</returns>
-		IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+	/// <summary>
+	/// Returns an enumerator that iterates through the collection.
+	/// </summary>
+	/// <returns>An <see cref="IEnumerator{T}"/> that can be used to iterate through the collection.</returns>
+	public virtual IEnumerator<KeyValuePair<TKey, TValue>> GetEnumerator()
+	{
+		return InnerDictionary.GetEnumerator();
 	}
+
+	/// <summary>
+	/// Called before adding a key-value pair to the collection.
+	/// </summary>
+	/// <param name="key">The key being added.</param>
+	/// <param name="value">The value being added.</param>
+	/// <remarks>This method is intended for derived classes to implement custom logic before an addition occurs.</remarks>
+	protected virtual void OnAdding(TKey key, TValue value) { }
+
+	/// <summary>
+	/// Called after a key-value pair has been added to the collection.
+	/// </summary>
+	/// <param name="key">The key that was added.</param>
+	/// <param name="value">The value that was added.</param>
+	/// <remarks>This method is intended for derived classes to implement custom logic after an addition occurs.</remarks>
+	protected virtual void OnAdded(TKey key, TValue value) { }
+
+	/// <summary>
+	/// Called before setting a new value for an existing key.
+	/// </summary>
+	/// <param name="key">The key being updated.</param>
+	/// <param name="value">The new value to set.</param>
+	/// <remarks>This method is intended for derived classes to implement custom logic before a value is updated.</remarks>
+	protected virtual void OnSetting(TKey key, TValue value) { }
+
+	/// <summary>
+	/// Called after a new value has been set for an existing key.
+	/// </summary>
+	/// <param name="key">The key that was updated.</param>
+	/// <param name="value">The new value that was set.</param>
+	/// <remarks>This method is intended for derived classes to implement custom logic after a value is updated.</remarks>
+	protected virtual void OnSetted(TKey key, TValue value) { }
+
+	/// <summary>
+	/// Called before clearing all items from the collection.
+	/// </summary>
+	/// <remarks>This method is intended for derived classes to implement custom logic before clearing occurs.</remarks>
+	protected virtual void OnClearing() {}
+
+	/// <summary>
+	/// Called after all items have been cleared from the collection.
+	/// </summary>
+	/// <remarks>This method is intended for derived classes to implement custom logic after clearing occurs.</remarks>
+	protected virtual void OnCleared() {}
+
+	/// <summary>
+	/// Called before removing a key-value pair from the collection.
+	/// </summary>
+	/// <param name="key">The key being removed.</param>
+	/// <param name="value">The value being removed.</param>
+	/// <remarks>This method is intended for derived classes to implement custom logic before a removal occurs.</remarks>
+	protected virtual void OnRemoving(TKey key, TValue value) { }
+
+	/// <summary>
+	/// Called after a key-value pair has been removed from the collection.
+	/// </summary>
+	/// <param name="key">The key that was removed.</param>
+	/// <param name="value">The value that was removed.</param>
+	/// <remarks>This method is intended for derived classes to implement custom logic after a removal occurs.</remarks>
+	protected virtual void OnRemoved(TKey key, TValue value) { }
+
+	/// <summary>
+	/// Determines whether a key-value pair can be added to the collection.
+	/// </summary>
+	/// <param name="key">The key to check.</param>
+	/// <param name="value">The value to check.</param>
+	/// <returns>True if the pair can be added; otherwise, false.</returns>
+	/// <remarks>This method is intended for derived classes to enforce custom addition constraints. The default implementation always returns true.</remarks>
+	protected virtual bool CanAdd(TKey key, TValue value) => true;
+
+	/// <summary>
+	/// Gets a collection containing the keys in the dictionary.
+	/// </summary>
+	public ICollection<TKey> Keys => InnerDictionary.Keys;
+
+	/// <summary>
+	/// Gets a collection containing the values in the dictionary.
+	/// </summary>
+	public ICollection<TValue> Values => InnerDictionary.Values;
+
+	/// <summary>
+	/// Gets a value indicating whether the collection is read-only.
+	/// </summary>
+	bool ICollection<KeyValuePair<TKey, TValue>>.IsReadOnly => InnerDictionary.IsReadOnly;
+
+	/// <summary>
+	/// Determines whether the collection contains an element with the specified key.
+	/// </summary>
+	/// <param name="key">The key to locate.</param>
+	/// <returns>True if the key is found; otherwise, false.</returns>
+	public bool ContainsKey(TKey key) => InnerDictionary.ContainsKey(key);
+
+	/// <summary>
+	/// Adds a key-value pair to the collection.
+	/// </summary>
+	/// <param name="item">The key-value pair to add.</param>
+	/// <exception cref="ArgumentException">Thrown when the pair cannot be added, as determined by <see cref="CanAdd"/>.</exception>
+	public void Add(KeyValuePair<TKey, TValue> item) => Add(item.Key, item.Value);
+
+	/// <summary>
+	/// Determines whether the collection contains a specific key-value pair.
+	/// </summary>
+	/// <param name="item">The key-value pair to locate.</param>
+	/// <returns>True if the pair is found; otherwise, false.</returns>
+	/// <remarks>This implementation only checks the presence of the key, not the value equality.</remarks>
+	public bool Contains(KeyValuePair<TKey, TValue> item) => ContainsKey(item.Key);
+
+	/// <summary>
+	/// Copies the elements of the collection to an array, starting at the specified index.
+	/// </summary>
+	/// <param name="array">The destination array to copy to.</param>
+	/// <param name="arrayIndex">The zero-based index in the array at which copying begins.</param>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="array"/> is null.</exception>
+	/// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="arrayIndex"/> is negative.</exception>
+	/// <exception cref="ArgumentException">Thrown when the destination array is too small to accommodate the elements.</exception>
+	public void CopyTo(KeyValuePair<TKey, TValue>[] array, int arrayIndex) => InnerDictionary.CopyTo(array, arrayIndex);
+
+	/// <summary>
+	/// Removes a specific key-value pair from the collection.
+	/// </summary>
+	/// <param name="item">The key-value pair to remove.</param>
+	/// <returns>True if the pair was found and removed; otherwise, false.</returns>
+	/// <remarks>This implementation only considers the key for removal, ignoring the value in <paramref name="item"/>.</remarks>
+	public bool Remove(KeyValuePair<TKey, TValue> item) => Remove(item.Key);
+
+	/// <summary>
+	/// Returns an enumerator that iterates through the collection (non-generic version).
+	/// </summary>
+	/// <returns>An <see cref="IEnumerator"/> that can be used to iterate through the collection.</returns>
+	IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
 }
\ No newline at end of file
diff --git a/Collections/OrderedPriorityQueue.cs b/Collections/OrderedPriorityQueue.cs
index 2d3bc5b7..81465548 100644
--- a/Collections/OrderedPriorityQueue.cs
+++ b/Collections/OrderedPriorityQueue.cs
@@ -1,265 +1,264 @@
-namespace Ecng.Collections
+namespace Ecng.Collections;
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+
+/// <summary>
+/// Represents a priority queue that sorts elements based on a specified key.
+/// </summary>
+/// <typeparam name="TPriority">
+/// The type used to determine the sort order of elements.
+/// </typeparam>
+/// <typeparam name="TValue">
+/// The type of the values stored in the queue.
+/// </typeparam>
+[Obsolete("Use PriorityQueue.")]
+public class OrderedPriorityQueue<TPriority, TValue> : ICollection<KeyValuePair<TPriority, TValue>>, IQueue<KeyValuePair<TPriority, TValue>>
 {
-	using System;
-	using System.Collections;
-	using System.Collections.Generic;
-	using System.Linq;
+	private readonly SortedDictionary<TPriority, Queue<TValue>> _dictionary;
 
 	/// <summary>
-	/// Represents a priority queue that sorts elements based on a specified key.
+	/// Initializes a new instance of the <see cref="OrderedPriorityQueue{TPriority, TValue}"/> class.
 	/// </summary>
-	/// <typeparam name="TPriority">
-	/// The type used to determine the sort order of elements.
-	/// </typeparam>
-	/// <typeparam name="TValue">
-	/// The type of the values stored in the queue.
-	/// </typeparam>
-	[Obsolete("Use PriorityQueue.")]
-	public class OrderedPriorityQueue<TPriority, TValue> : ICollection<KeyValuePair<TPriority, TValue>>, IQueue<KeyValuePair<TPriority, TValue>>
+	public OrderedPriorityQueue()
 	{
-		private readonly SortedDictionary<TPriority, Queue<TValue>> _dictionary;
+		_dictionary = [];
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="OrderedPriorityQueue{TPriority, TValue}"/> class.
-		/// </summary>
-		public OrderedPriorityQueue()
-		{
-			_dictionary = [];
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="OrderedPriorityQueue{TPriority, TValue}"/> class using the specified comparer.
+	/// </summary>
+	/// <param name="comparer">The comparer used to sort the keys.</param>
+	public OrderedPriorityQueue(IComparer<TPriority> comparer)
+	{
+		_dictionary = new SortedDictionary<TPriority, Queue<TValue>>(comparer);
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="OrderedPriorityQueue{TPriority, TValue}"/> class using the specified comparer.
-		/// </summary>
-		/// <param name="comparer">The comparer used to sort the keys.</param>
-		public OrderedPriorityQueue(IComparer<TPriority> comparer)
-		{
-			_dictionary = new SortedDictionary<TPriority, Queue<TValue>>(comparer);
-		}
+	#region Priority queue operations
 
-		#region Priority queue operations
+	/// <summary>
+	/// Enqueues element into priority queue
+	/// </summary>
+	/// <param name="priority">element priority</param>
+	/// <param name="value">element value</param>
+	public void Enqueue(TPriority priority, TValue value)
+	{
+		_dictionary.SafeAdd(priority).Enqueue(value);
+		Count++;
+	}
 
-		/// <summary>
-		/// Enqueues element into priority queue
-		/// </summary>
-		/// <param name="priority">element priority</param>
-		/// <param name="value">element value</param>
-		public void Enqueue(TPriority priority, TValue value)
-		{
-			_dictionary.SafeAdd(priority).Enqueue(value);
-			Count++;
-		}
+	/// <summary>
+	/// Dequeues element with minimum priority and return its priority and value as <see cref="KeyValuePair{TPriority,TValue}"/> 
+	/// </summary>
+	/// <returns>priority and value of the dequeued element</returns>
+	/// <remarks>
+	/// Method throws <see cref="InvalidOperationException"/> if priority queue is empty
+	/// </remarks>
+	public KeyValuePair<TPriority, TValue> Dequeue()
+	{
+		if (IsEmpty)
+			throw new InvalidOperationException("Priority queue is empty");
 
-		/// <summary>
-		/// Dequeues element with minimum priority and return its priority and value as <see cref="KeyValuePair{TPriority,TValue}"/> 
-		/// </summary>
-		/// <returns>priority and value of the dequeued element</returns>
-		/// <remarks>
-		/// Method throws <see cref="InvalidOperationException"/> if priority queue is empty
-		/// </remarks>
-		public KeyValuePair<TPriority, TValue> Dequeue()
-		{
-			if (IsEmpty)
-				throw new InvalidOperationException("Priority queue is empty");
+		var first = _dictionary.First();
 
-			var first = _dictionary.First();
+		var item = first.Value.Dequeue();
 
-			var item = first.Value.Dequeue();
+		if (first.Value.Count == 0)
+			_dictionary.Remove(first.Key);
 
-			if (first.Value.Count == 0)
-				_dictionary.Remove(first.Key);
+		Count--;
 
-			Count--;
+		return new KeyValuePair<TPriority, TValue>(first.Key, item);
+	}
 
-			return new KeyValuePair<TPriority, TValue>(first.Key, item);
-		}
+	/// <summary>
+	/// Dequeues element with minimum priority and return its priority and value as <see cref="KeyValuePair{TPriority,TValue}"/> 
+	/// </summary>
+	/// <returns>priority and value of the dequeued element</returns>
+	/// <remarks>
+	/// Method throws <see cref="InvalidOperationException"/> if priority queue is empty
+	/// </remarks>
+	public TValue DequeueValue()
+	{
+		return Dequeue().Value;
+	}
 
-		/// <summary>
-		/// Dequeues element with minimum priority and return its priority and value as <see cref="KeyValuePair{TPriority,TValue}"/> 
-		/// </summary>
-		/// <returns>priority and value of the dequeued element</returns>
-		/// <remarks>
-		/// Method throws <see cref="InvalidOperationException"/> if priority queue is empty
-		/// </remarks>
-		public TValue DequeueValue()
-		{
-			return Dequeue().Value;
-		}
+	/// <summary>
+	/// Returns priority and value of the element with minimun priority, without removing it from the queue
+	/// </summary>
+	/// <returns>priority and value of the element with minimum priority</returns>
+	/// <remarks>
+	/// Method throws <see cref="InvalidOperationException"/> if priority queue is empty
+	/// </remarks>
+	public KeyValuePair<TPriority, TValue> Peek()
+	{
+		if (IsEmpty)
+			throw new InvalidOperationException("Priority queue is empty");
 
-		/// <summary>
-		/// Returns priority and value of the element with minimun priority, without removing it from the queue
-		/// </summary>
-		/// <returns>priority and value of the element with minimum priority</returns>
-		/// <remarks>
-		/// Method throws <see cref="InvalidOperationException"/> if priority queue is empty
-		/// </remarks>
-		public KeyValuePair<TPriority, TValue> Peek()
-		{
-			if (IsEmpty)
-				throw new InvalidOperationException("Priority queue is empty");
+		var first = _dictionary.First();
+		var item = first.Value.Peek();
 
-			var first = _dictionary.First();
-			var item = first.Value.Peek();
+		return new KeyValuePair<TPriority, TValue>(first.Key, item);
+	}
 
-			return new KeyValuePair<TPriority, TValue>(first.Key, item);
-		}
+	/// <summary>
+	/// Returns priority and value of the element with minimun priority, without removing it from the queue
+	/// </summary>
+	/// <returns>priority and value of the element with minimum priority</returns>
+	/// <remarks>
+	/// Method throws <see cref="InvalidOperationException"/> if priority queue is empty
+	/// </remarks>
+	public TValue PeekValue()
+	{
+		return Peek().Value;
+	}
 
-		/// <summary>
-		/// Returns priority and value of the element with minimun priority, without removing it from the queue
-		/// </summary>
-		/// <returns>priority and value of the element with minimum priority</returns>
-		/// <remarks>
-		/// Method throws <see cref="InvalidOperationException"/> if priority queue is empty
-		/// </remarks>
-		public TValue PeekValue()
-		{
-			return Peek().Value;
-		}
+	/// <summary>
+	/// Gets whether priority queue is empty
+	/// </summary>
+	public bool IsEmpty => Count == 0;
 
-		/// <summary>
-		/// Gets whether priority queue is empty
-		/// </summary>
-		public bool IsEmpty => Count == 0;
+	#endregion
 
-		#endregion
+	#region ICollection<KeyValuePair<TPriority, TValue>> implementation
 
-		#region ICollection<KeyValuePair<TPriority, TValue>> implementation
+	/// <summary>
+	/// Enqueus element into priority queue
+	/// </summary>
+	/// <param name="item">element to add</param>
+	public void Add(KeyValuePair<TPriority, TValue> item)
+	{
+		Enqueue(item.Key, item.Value);
+	}
 
-		/// <summary>
-		/// Enqueus element into priority queue
-		/// </summary>
-		/// <param name="item">element to add</param>
-		public void Add(KeyValuePair<TPriority, TValue> item)
-		{
-			Enqueue(item.Key, item.Value);
-		}
+	/// <summary>
+	/// Clears the collection
+	/// </summary>
+	public void Clear()
+	{
+		_dictionary.Clear();
+		Count = 0;
+	}
 
-		/// <summary>
-		/// Clears the collection
-		/// </summary>
-		public void Clear()
-		{
-			_dictionary.Clear();
-			Count = 0;
-		}
+	/// <summary>
+	/// Determines whether the priority queue contains a specific element
+	/// </summary>
+	/// <param name="item">The object to locate in the priority queue</param>
+	/// <returns><c>true</c> if item is found in the priority queue; otherwise, <c>false.</c> </returns>
+	public bool Contains(KeyValuePair<TPriority, TValue> item)
+	{
+		if (!_dictionary.TryGetValue(item.Key, out var dic))
+			return false;
 
-		/// <summary>
-		/// Determines whether the priority queue contains a specific element
-		/// </summary>
-		/// <param name="item">The object to locate in the priority queue</param>
-		/// <returns><c>true</c> if item is found in the priority queue; otherwise, <c>false.</c> </returns>
-		public bool Contains(KeyValuePair<TPriority, TValue> item)
-		{
-			if (!_dictionary.TryGetValue(item.Key, out var dic))
-				return false;
+		return dic.Contains(item.Value);
+	}
 
-			return dic.Contains(item.Value);
-		}
+	/// <summary>
+	/// Gets number of elements in the priority queue
+	/// </summary>
+	public int Count { get; private set; }
 
-		/// <summary>
-		/// Gets number of elements in the priority queue
-		/// </summary>
-		public int Count { get; private set; }
-
-		/// <summary>
-		/// Copies the elements of the priority queue to an Array, starting at a particular Array index. 
-		/// </summary>
-		/// <param name="array">The one-dimensional Array that is the destination of the elements copied from the priority queue. The Array must have zero-based indexing. </param>
-		/// <param name="arrayIndex">The zero-based index in array at which copying begins.</param>
-		/// <remarks>
-		/// It is not guaranteed that items will be copied in the sorted order.
-		/// </remarks>
-		public void CopyTo(KeyValuePair<TPriority, TValue>[] array, int arrayIndex)
-		{
-			AllItems.ToArray().CopyTo(array, arrayIndex);
-		}
+	/// <summary>
+	/// Copies the elements of the priority queue to an Array, starting at a particular Array index. 
+	/// </summary>
+	/// <param name="array">The one-dimensional Array that is the destination of the elements copied from the priority queue. The Array must have zero-based indexing. </param>
+	/// <param name="arrayIndex">The zero-based index in array at which copying begins.</param>
+	/// <remarks>
+	/// It is not guaranteed that items will be copied in the sorted order.
+	/// </remarks>
+	public void CopyTo(KeyValuePair<TPriority, TValue>[] array, int arrayIndex)
+	{
+		AllItems.ToArray().CopyTo(array, arrayIndex);
+	}
 
-		/// <summary>
-		/// Gets a value indicating whether the collection is read-only. 
-		/// </summary>
-		/// <remarks>
-		/// For priority queue this property returns <c>false</c>.
-		/// </remarks>
-		public bool IsReadOnly => false;
-
-		/// <summary>
-		/// Removes the first occurrence of a specific object from the priority queue. 
-		/// </summary>
-		/// <param name="item">The object to remove from the <see cref="ICollection{T}"/>.</param>
-		/// <returns><c>true</c> if item was successfully removed from the priority queue.
-		/// This method returns false if item is not found in the collection. </returns>
-		public bool Remove(KeyValuePair<TPriority, TValue> item)
-		{
-			return Remove(item.Key, [item.Value]);
-		}
+	/// <summary>
+	/// Gets a value indicating whether the collection is read-only. 
+	/// </summary>
+	/// <remarks>
+	/// For priority queue this property returns <c>false</c>.
+	/// </remarks>
+	public bool IsReadOnly => false;
 
-		/// <summary>
-		/// Removes the range of elements from the priority queue.
-		/// </summary>
-		/// <param name="items">The range of elements to remove from the priority queue.</param>
-		public void RemoveRange(IEnumerable<KeyValuePair<TPriority, TValue>> items)
-		{
-			var groups = items.GroupBy(i => i.Key, i => i.Value);
+	/// <summary>
+	/// Removes the first occurrence of a specific object from the priority queue. 
+	/// </summary>
+	/// <param name="item">The object to remove from the <see cref="ICollection{T}"/>.</param>
+	/// <returns><c>true</c> if item was successfully removed from the priority queue.
+	/// This method returns false if item is not found in the collection. </returns>
+	public bool Remove(KeyValuePair<TPriority, TValue> item)
+	{
+		return Remove(item.Key, [item.Value]);
+	}
 
-			foreach (var g in groups)
-			{
-				Remove(g.Key, [.. g]);
-			}
-		}
+	/// <summary>
+	/// Removes the range of elements from the priority queue.
+	/// </summary>
+	/// <param name="items">The range of elements to remove from the priority queue.</param>
+	public void RemoveRange(IEnumerable<KeyValuePair<TPriority, TValue>> items)
+	{
+		var groups = items.GroupBy(i => i.Key, i => i.Value);
 
-		private bool Remove(TPriority key, ICollection<TValue> items)
+		foreach (var g in groups)
 		{
-			if (!_dictionary.TryGetValue(key, out var queue))
-				return false;
+			Remove(g.Key, [.. g]);
+		}
+	}
 
-			_dictionary.Remove(key);
+	private bool Remove(TPriority key, ICollection<TValue> items)
+	{
+		if (!_dictionary.TryGetValue(key, out var queue))
+			return false;
 
-			while (queue.Count > 0)
-			{
-				var queueItem = queue.Dequeue();
+		_dictionary.Remove(key);
 
-				if (items.Contains(queueItem))
-				{
-					items.Remove(queueItem);
-					Count--;
-					continue;
-				}
+		while (queue.Count > 0)
+		{
+			var queueItem = queue.Dequeue();
 
-				_dictionary.SafeAdd(key).Enqueue(queueItem);
+			if (items.Contains(queueItem))
+			{
+				items.Remove(queueItem);
+				Count--;
+				continue;
 			}
 
-			return true;
+			_dictionary.SafeAdd(key).Enqueue(queueItem);
 		}
 
-		/// <summary>
-		/// Returns an enumerator that iterates through the collection.
-		/// </summary>
-		/// <returns>Enumerator</returns>
-		/// <remarks>
-		/// Returned enumerator does not iterate elements in sorted order.</remarks>
-		public IEnumerator<KeyValuePair<TPriority, TValue>> GetEnumerator()
-		{
-			return AllItems.GetEnumerator();
-		}
-
-		/// <summary>
-		/// Returns an enumerator that iterates through the collection.
-		/// </summary>
-		/// <returns>Enumerator</returns>
-		/// <remarks>
-		/// Returned enumerator does not iterate elements in sorted order.</remarks>
-		IEnumerator IEnumerable.GetEnumerator()
-		{
-			return GetEnumerator();
-		}
+		return true;
+	}
 
-		private IEnumerable<KeyValuePair<TPriority, TValue>> AllItems
-		{
-			get { return _dictionary.SelectMany(d => d.Value.Select(v => new KeyValuePair<TPriority, TValue>(d.Key, v))); }
-		}
+	/// <summary>
+	/// Returns an enumerator that iterates through the collection.
+	/// </summary>
+	/// <returns>Enumerator</returns>
+	/// <remarks>
+	/// Returned enumerator does not iterate elements in sorted order.</remarks>
+	public IEnumerator<KeyValuePair<TPriority, TValue>> GetEnumerator()
+	{
+		return AllItems.GetEnumerator();
+	}
 
-		#endregion
+	/// <summary>
+	/// Returns an enumerator that iterates through the collection.
+	/// </summary>
+	/// <returns>Enumerator</returns>
+	/// <remarks>
+	/// Returned enumerator does not iterate elements in sorted order.</remarks>
+	IEnumerator IEnumerable.GetEnumerator()
+	{
+		return GetEnumerator();
+	}
 
-		void IQueue<KeyValuePair<TPriority, TValue>>.Enqueue(KeyValuePair<TPriority, TValue> item) =>
-			Enqueue(item.Key, item.Value);
+	private IEnumerable<KeyValuePair<TPriority, TValue>> AllItems
+	{
+		get { return _dictionary.SelectMany(d => d.Value.Select(v => new KeyValuePair<TPriority, TValue>(d.Key, v))); }
 	}
+
+	#endregion
+
+	void IQueue<KeyValuePair<TPriority, TValue>>.Enqueue(KeyValuePair<TPriority, TValue> item) =>
+		Enqueue(item.Key, item.Value);
 }
\ No newline at end of file
diff --git a/Collections/PairSet.cs b/Collections/PairSet.cs
index 10d841a7..775a0465 100644
--- a/Collections/PairSet.cs
+++ b/Collections/PairSet.cs
@@ -1,215 +1,214 @@
-namespace Ecng.Collections
+namespace Ecng.Collections;
+
+using System;
+using System.Collections.Generic;
+
+/// <summary>
+/// Represents a collection of key-value pairs that supports bidirectional lookup by key or value.
+/// </summary>
+/// <typeparam name="TKey">The type of keys in the collection.</typeparam>
+/// <typeparam name="TValue">The type of values in the collection.</typeparam>
+[Serializable]
+public sealed class PairSet<TKey, TValue> : KeyedCollection<TKey, TValue>
 {
-	using System;
-	using System.Collections.Generic;
-
-	/// <summary>
-	/// Represents a collection of key-value pairs that supports bidirectional lookup by key or value.
-	/// </summary>
-	/// <typeparam name="TKey">The type of keys in the collection.</typeparam>
-	/// <typeparam name="TValue">The type of values in the collection.</typeparam>
-	[Serializable]
-	public sealed class PairSet<TKey, TValue> : KeyedCollection<TKey, TValue>
-	{
-		#region Private Fields
-
-		private readonly Dictionary<TValue, TKey> _values;
-
-		#endregion
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="PairSet{TKey, TValue}"/> class with default comparers.
-		/// </summary>
-		public PairSet()
-		{
-			_values = [];
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="PairSet{TKey, TValue}"/> class with a specified key comparer.
-		/// </summary>
-		/// <param name="comparer">The equality comparer for keys, or null to use the default comparer.</param>
-		public PairSet(IEqualityComparer<TKey> comparer)
-			: base(comparer)
-		{
-			_values = [];
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="PairSet{TKey, TValue}"/> class with specified key and value comparers.
-		/// </summary>
-		/// <param name="keyComparer">The equality comparer for keys, or null to use the default comparer.</param>
-		/// <param name="valueComparer">The equality comparer for values, or null to use the default comparer.</param>
-		public PairSet(IEqualityComparer<TKey> keyComparer, IEqualityComparer<TValue> valueComparer)
-			: base(keyComparer)
-		{
-			_values = new Dictionary<TValue, TKey>(valueComparer);
-		}
-
-		#region Item
-
-		/// <summary>
-		/// Gets the key associated with the specified value.
-		/// </summary>
-		/// <param name="value">The value to look up.</param>
-		/// <returns>The key associated with the specified value.</returns>
-		/// <exception cref="KeyNotFoundException">Thrown when the value is not found in the collection.</exception>
-		public TKey this[TValue value] => _values[value];
-
-		#endregion
-		
-		#region GetKey
-
-		/// <summary>
-		/// Retrieves the key associated with the specified value.
-		/// </summary>
-		/// <param name="value">The value to look up.</param>
-		/// <returns>The key associated with the specified value.</returns>
-		/// <exception cref="KeyNotFoundException">Thrown when the value is not found in the collection.</exception>
-		public TKey GetKey(TValue value)
-		{
-			return this[value];
-		}
-
-		#endregion
-
-		#region GetValue
-
-		/// <summary>
-		/// Retrieves the value associated with the specified key.
-		/// </summary>
-		/// <param name="key">The key to look up.</param>
-		/// <returns>The value associated with the specified key.</returns>
-		/// <exception cref="KeyNotFoundException">Thrown when the key is not found in the collection.</exception>
-		public TValue GetValue(TKey key)
-		{
-			return base[key];
-		}
-
-		#endregion
-
-		/// <summary>
-		/// Sets a new key for an existing value, replacing any previous association.
-		/// </summary>
-		/// <param name="value">The value to associate with the new key.</param>
-		/// <param name="key">The new key to associate with the value.</param>
-		public void SetKey(TValue value, TKey key)
-		{
-			RemoveByValue(value);
-			Add(key, value);
-		}
-
-		#region SetValue
-
-		/// <summary>
-		/// Sets a new value for an existing key, updating the internal value-to-key mapping.
-		/// </summary>
-		/// <param name="key">The key whose value is to be updated.</param>
-		/// <param name="value">The new value to associate with the key.</param>
-		public void SetValue(TKey key, TValue value)
-		{
-			base[key] = value;
-		}
-
-		#endregion
-
-		/// <summary>
-		/// Determines whether a key-value pair can be added to the collection.
-		/// </summary>
-		/// <param name="key">The key to check.</param>
-		/// <param name="value">The value to check.</param>
-		/// <returns>True if the value is not already associated with a key; otherwise, false.</returns>
-		protected override bool CanAdd(TKey key, TValue value)
-		{
-			return !_values.ContainsKey(value);
-		}
-
-		#region KeyedCollection<TKey, TValue> Members
-
-		/// <summary>
-		/// Called before adding a key-value pair to the collection, updating the value-to-key mapping.
-		/// </summary>
-		/// <param name="key">The key being added.</param>
-		/// <param name="value">The value being added.</param>
-		protected override void OnAdding(TKey key, TValue value)
-		{
-			_values.Add(value, key);
-		}
-
-		/// <summary>
-		/// Called before setting a new value for an existing key, updating the value-to-key mapping.
-		/// </summary>
-		/// <param name="key">The key being updated.</param>
-		/// <param name="value">The new value to set.</param>
-		protected override void OnSetting(TKey key, TValue value)
-		{
-			_values[value] = key;
-		}
-
-		/// <summary>
-		/// Called before clearing the collection, clearing the value-to-key mapping.
-		/// </summary>
-		protected override void OnClearing()
-		{
-			_values.Clear();
-		}
-
-		/// <summary>
-		/// Called before removing a key-value pair, updating the value-to-key mapping.
-		/// </summary>
-		/// <param name="key">The key being removed.</param>
-		/// <param name="value">The value being removed.</param>
-		protected override void OnRemoving(TKey key, TValue value)
-		{
-			_values.Remove(value);
-		}
-
-		#endregion
-
-		/// <summary>
-		/// Attempts to retrieve the key associated with a specified value.
-		/// </summary>
-		/// <param name="value">The value to look up.</param>
-		/// <param name="key">When this method returns, contains the key if found; otherwise, the default value of <typeparamref name="TKey"/>.</param>
-		/// <returns>True if the value was found; otherwise, false.</returns>
-		public bool TryGetKey(TValue value, out TKey key)
-		{
-			return _values.TryGetValue(value, out key);
-		}
-
-		/// <summary>
-		/// Attempts to add a key-value pair to the collection if neither the key nor value already exists.
-		/// </summary>
-		/// <param name="key">The key to add.</param>
-		/// <param name="value">The value to add.</param>
-		/// <returns>True if the pair was added; false if either the key or value already exists.</returns>
-		public bool TryAdd(TKey key, TValue value)
-		{
-			if (ContainsKey(key) || _values.ContainsKey(value))
-				return false;
-
-			Add(key, value);
-			return true;
-		}
-
-		/// <summary>
-		/// Removes a key-value pair from the collection based on the specified value.
-		/// </summary>
-		/// <param name="value">The value to remove.</param>
-		/// <returns>True if the value was found and removed; otherwise, false.</returns>
-		public bool RemoveByValue(TValue value)
-		{
-			return _values.ContainsKey(value) && Remove(_values[value]);
-		}
-
-		/// <summary>
-		/// Determines whether the collection contains a specific value.
-		/// </summary>
-		/// <param name="value">The value to check.</param>
-		/// <returns>True if the value exists in the collection; otherwise, false.</returns>
-		public bool ContainsValue(TValue value)
-		{
-			return _values.ContainsKey(value);
-		}
+	#region Private Fields
+
+	private readonly Dictionary<TValue, TKey> _values;
+
+	#endregion
+
+	/// <summary>
+	/// Initializes a new instance of the <see cref="PairSet{TKey, TValue}"/> class with default comparers.
+	/// </summary>
+	public PairSet()
+	{
+		_values = [];
+	}
+
+	/// <summary>
+	/// Initializes a new instance of the <see cref="PairSet{TKey, TValue}"/> class with a specified key comparer.
+	/// </summary>
+	/// <param name="comparer">The equality comparer for keys, or null to use the default comparer.</param>
+	public PairSet(IEqualityComparer<TKey> comparer)
+		: base(comparer)
+	{
+		_values = [];
+	}
+
+	/// <summary>
+	/// Initializes a new instance of the <see cref="PairSet{TKey, TValue}"/> class with specified key and value comparers.
+	/// </summary>
+	/// <param name="keyComparer">The equality comparer for keys, or null to use the default comparer.</param>
+	/// <param name="valueComparer">The equality comparer for values, or null to use the default comparer.</param>
+	public PairSet(IEqualityComparer<TKey> keyComparer, IEqualityComparer<TValue> valueComparer)
+		: base(keyComparer)
+	{
+		_values = new Dictionary<TValue, TKey>(valueComparer);
+	}
+
+	#region Item
+
+	/// <summary>
+	/// Gets the key associated with the specified value.
+	/// </summary>
+	/// <param name="value">The value to look up.</param>
+	/// <returns>The key associated with the specified value.</returns>
+	/// <exception cref="KeyNotFoundException">Thrown when the value is not found in the collection.</exception>
+	public TKey this[TValue value] => _values[value];
+
+	#endregion
+	
+	#region GetKey
+
+	/// <summary>
+	/// Retrieves the key associated with the specified value.
+	/// </summary>
+	/// <param name="value">The value to look up.</param>
+	/// <returns>The key associated with the specified value.</returns>
+	/// <exception cref="KeyNotFoundException">Thrown when the value is not found in the collection.</exception>
+	public TKey GetKey(TValue value)
+	{
+		return this[value];
+	}
+
+	#endregion
+
+	#region GetValue
+
+	/// <summary>
+	/// Retrieves the value associated with the specified key.
+	/// </summary>
+	/// <param name="key">The key to look up.</param>
+	/// <returns>The value associated with the specified key.</returns>
+	/// <exception cref="KeyNotFoundException">Thrown when the key is not found in the collection.</exception>
+	public TValue GetValue(TKey key)
+	{
+		return base[key];
+	}
+
+	#endregion
+
+	/// <summary>
+	/// Sets a new key for an existing value, replacing any previous association.
+	/// </summary>
+	/// <param name="value">The value to associate with the new key.</param>
+	/// <param name="key">The new key to associate with the value.</param>
+	public void SetKey(TValue value, TKey key)
+	{
+		RemoveByValue(value);
+		Add(key, value);
+	}
+
+	#region SetValue
+
+	/// <summary>
+	/// Sets a new value for an existing key, updating the internal value-to-key mapping.
+	/// </summary>
+	/// <param name="key">The key whose value is to be updated.</param>
+	/// <param name="value">The new value to associate with the key.</param>
+	public void SetValue(TKey key, TValue value)
+	{
+		base[key] = value;
+	}
+
+	#endregion
+
+	/// <summary>
+	/// Determines whether a key-value pair can be added to the collection.
+	/// </summary>
+	/// <param name="key">The key to check.</param>
+	/// <param name="value">The value to check.</param>
+	/// <returns>True if the value is not already associated with a key; otherwise, false.</returns>
+	protected override bool CanAdd(TKey key, TValue value)
+	{
+		return !_values.ContainsKey(value);
+	}
+
+	#region KeyedCollection<TKey, TValue> Members
+
+	/// <summary>
+	/// Called before adding a key-value pair to the collection, updating the value-to-key mapping.
+	/// </summary>
+	/// <param name="key">The key being added.</param>
+	/// <param name="value">The value being added.</param>
+	protected override void OnAdding(TKey key, TValue value)
+	{
+		_values.Add(value, key);
+	}
+
+	/// <summary>
+	/// Called before setting a new value for an existing key, updating the value-to-key mapping.
+	/// </summary>
+	/// <param name="key">The key being updated.</param>
+	/// <param name="value">The new value to set.</param>
+	protected override void OnSetting(TKey key, TValue value)
+	{
+		_values[value] = key;
+	}
+
+	/// <summary>
+	/// Called before clearing the collection, clearing the value-to-key mapping.
+	/// </summary>
+	protected override void OnClearing()
+	{
+		_values.Clear();
+	}
+
+	/// <summary>
+	/// Called before removing a key-value pair, updating the value-to-key mapping.
+	/// </summary>
+	/// <param name="key">The key being removed.</param>
+	/// <param name="value">The value being removed.</param>
+	protected override void OnRemoving(TKey key, TValue value)
+	{
+		_values.Remove(value);
+	}
+
+	#endregion
+
+	/// <summary>
+	/// Attempts to retrieve the key associated with a specified value.
+	/// </summary>
+	/// <param name="value">The value to look up.</param>
+	/// <param name="key">When this method returns, contains the key if found; otherwise, the default value of <typeparamref name="TKey"/>.</param>
+	/// <returns>True if the value was found; otherwise, false.</returns>
+	public bool TryGetKey(TValue value, out TKey key)
+	{
+		return _values.TryGetValue(value, out key);
+	}
+
+	/// <summary>
+	/// Attempts to add a key-value pair to the collection if neither the key nor value already exists.
+	/// </summary>
+	/// <param name="key">The key to add.</param>
+	/// <param name="value">The value to add.</param>
+	/// <returns>True if the pair was added; false if either the key or value already exists.</returns>
+	public bool TryAdd(TKey key, TValue value)
+	{
+		if (ContainsKey(key) || _values.ContainsKey(value))
+			return false;
+
+		Add(key, value);
+		return true;
+	}
+
+	/// <summary>
+	/// Removes a key-value pair from the collection based on the specified value.
+	/// </summary>
+	/// <param name="value">The value to remove.</param>
+	/// <returns>True if the value was found and removed; otherwise, false.</returns>
+	public bool RemoveByValue(TValue value)
+	{
+		return _values.ContainsKey(value) && Remove(_values[value]);
+	}
+
+	/// <summary>
+	/// Determines whether the collection contains a specific value.
+	/// </summary>
+	/// <param name="value">The value to check.</param>
+	/// <returns>True if the value exists in the collection; otherwise, false.</returns>
+	public bool ContainsValue(TValue value)
+	{
+		return _values.ContainsKey(value);
 	}
 }
\ No newline at end of file
diff --git a/Collections/QueueEx.cs b/Collections/QueueEx.cs
index 30feb5dc..0beb43dd 100644
--- a/Collections/QueueEx.cs
+++ b/Collections/QueueEx.cs
@@ -1,28 +1,27 @@
-namespace Ecng.Collections
+namespace Ecng.Collections;
+
+using System;
+using System.Collections.Generic;
+
+/// <summary>
+/// Extends the <see cref="Queue{T}"/> class to explicitly implement the <see cref="ICollection{T}"/> interface.
+/// </summary>
+/// <typeparam name="T">The type of elements in the queue.</typeparam>
+public class QueueEx<T> : Queue<T>, ICollection<T>
 {
-	using System;
-	using System.Collections.Generic;
+	#region Implementation of ICollection<T>
 
-	/// <summary>
-	/// Extends the <see cref="Queue{T}"/> class to explicitly implement the <see cref="ICollection{T}"/> interface.
-	/// </summary>
-	/// <typeparam name="T">The type of elements in the queue.</typeparam>
-	public class QueueEx<T> : Queue<T>, ICollection<T>
+	void ICollection<T>.Add(T item)
 	{
-		#region Implementation of ICollection<T>
-
-		void ICollection<T>.Add(T item)
-		{
-			Enqueue(item);
-		}
+		Enqueue(item);
+	}
 
-		bool ICollection<T>.Remove(T item)
-		{
-			throw new NotSupportedException();
-		}
+	bool ICollection<T>.Remove(T item)
+	{
+		throw new NotSupportedException();
+	}
 
-		bool ICollection<T>.IsReadOnly => false;
+	bool ICollection<T>.IsReadOnly => false;
 
-		#endregion
-	}
+	#endregion
 }
\ No newline at end of file
diff --git a/Collections/SimpleEnumerable.cs b/Collections/SimpleEnumerable.cs
index 63497924..add54fb1 100644
--- a/Collections/SimpleEnumerable.cs
+++ b/Collections/SimpleEnumerable.cs
@@ -1,33 +1,32 @@
-namespace Ecng.Collections
+namespace Ecng.Collections;
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+/// <summary>
+/// Represents a simple implementation of an enumerable that uses a factory function to create its enumerator.
+/// </summary>
+/// <typeparam name="T">The type of elements in the enumerable.</typeparam>
+public class SimpleEnumerable<T>(Func<IEnumerator<T>> createEnumerator) : IEnumerable<T>
 {
-	using System;
-	using System.Collections;
-	using System.Collections.Generic;
+	private readonly Func<IEnumerator<T>> _createEnumerator = createEnumerator ?? throw new ArgumentNullException(nameof(createEnumerator));
 
 	/// <summary>
-	/// Represents a simple implementation of an enumerable that uses a factory function to create its enumerator.
+	/// Returns an enumerator that iterates through the collection.
 	/// </summary>
-	/// <typeparam name="T">The type of elements in the enumerable.</typeparam>
-	public class SimpleEnumerable<T>(Func<IEnumerator<T>> createEnumerator) : IEnumerable<T>
+	/// <returns>An <see cref="IEnumerator{T}"/> for the collection.</returns>
+	public IEnumerator<T> GetEnumerator()
 	{
-		private readonly Func<IEnumerator<T>> _createEnumerator = createEnumerator ?? throw new ArgumentNullException(nameof(createEnumerator));
-
-		/// <summary>
-		/// Returns an enumerator that iterates through the collection.
-		/// </summary>
-		/// <returns>An <see cref="IEnumerator{T}"/> for the collection.</returns>
-		public IEnumerator<T> GetEnumerator()
-		{
-			return _createEnumerator();
-		}
+		return _createEnumerator();
+	}
 
-		/// <summary>
-		/// Returns an enumerator that iterates through the collection (non-generic version).
-		/// </summary>
-		/// <returns>An <see cref="IEnumerator"/> for the collection.</returns>
-		IEnumerator IEnumerable.GetEnumerator()
-		{
-			return GetEnumerator();
-		}
+	/// <summary>
+	/// Returns an enumerator that iterates through the collection (non-generic version).
+	/// </summary>
+	/// <returns>An <see cref="IEnumerator"/> for the collection.</returns>
+	IEnumerator IEnumerable.GetEnumerator()
+	{
+		return GetEnumerator();
 	}
 }
\ No newline at end of file
diff --git a/Collections/SimpleEnumerator.cs b/Collections/SimpleEnumerator.cs
index a02fddd7..8e4fcee5 100644
--- a/Collections/SimpleEnumerator.cs
+++ b/Collections/SimpleEnumerator.cs
@@ -1,38 +1,37 @@
-namespace Ecng.Collections
-{
-	using System.Collections;
-	using System.Collections.Generic;
+namespace Ecng.Collections;
+
+using System.Collections;
+using System.Collections.Generic;
 
-	using Ecng.Common;
+using Ecng.Common;
 
+/// <summary>
+/// Provides an abstract base class for implementing a simple enumerator with disposable functionality.
+/// </summary>
+/// <typeparam name="T">The type of elements being enumerated.</typeparam>
+public abstract class SimpleEnumerator<T> : Disposable, IEnumerator<T>
+{
 	/// <summary>
-	/// Provides an abstract base class for implementing a simple enumerator with disposable functionality.
+	/// Advances the enumerator to the next element of the collection.
 	/// </summary>
-	/// <typeparam name="T">The type of elements being enumerated.</typeparam>
-	public abstract class SimpleEnumerator<T> : Disposable, IEnumerator<T>
-	{
-		/// <summary>
-		/// Advances the enumerator to the next element of the collection.
-		/// </summary>
-		/// <returns>True if the enumerator was successfully advanced to the next element; false if the enumerator has passed the end of the collection.</returns>
-		public abstract bool MoveNext();
+	/// <returns>True if the enumerator was successfully advanced to the next element; false if the enumerator has passed the end of the collection.</returns>
+	public abstract bool MoveNext();
 
-		/// <summary>
-		/// Sets the enumerator to its initial position, which is before the first element in the collection.
-		/// </summary>
-		/// <remarks>This implementation does nothing by default and can be overridden by derived classes.</remarks>
-		public virtual void Reset()
-		{
-		}
+	/// <summary>
+	/// Sets the enumerator to its initial position, which is before the first element in the collection.
+	/// </summary>
+	/// <remarks>This implementation does nothing by default and can be overridden by derived classes.</remarks>
+	public virtual void Reset()
+	{
+	}
 
-		/// <summary>
-		/// Gets the current element in the collection.
-		/// </summary>
-		public T Current { get; protected set; }
+	/// <summary>
+	/// Gets the current element in the collection.
+	/// </summary>
+	public T Current { get; protected set; }
 
-		/// <summary>
-		/// Gets the current element in the collection as an object (non-generic version).
-		/// </summary>
-		object IEnumerator.Current => Current;
-	}
+	/// <summary>
+	/// Gets the current element in the collection as an object (non-generic version).
+	/// </summary>
+	object IEnumerator.Current => Current;
 }
\ No newline at end of file
diff --git a/Collections/StackEx.cs b/Collections/StackEx.cs
index d8262339..3d6bf3de 100644
--- a/Collections/StackEx.cs
+++ b/Collections/StackEx.cs
@@ -1,39 +1,38 @@
-namespace Ecng.Collections
-{
-	using System;
-	using System.Collections.Generic;
+namespace Ecng.Collections;
+
+using System;
+using System.Collections.Generic;
 
+/// <summary>
+/// Extends the <see cref="Stack{T}"/> class to explicitly implement the <see cref="ICollection{T}"/> interface.
+/// </summary>
+/// <typeparam name="T">The type of elements in the stack.</typeparam>
+public class StackEx<T> : Stack<T>, ICollection<T>
+{
 	/// <summary>
-	/// Extends the <see cref="Stack{T}"/> class to explicitly implement the <see cref="ICollection{T}"/> interface.
+	/// Adds an item to the top of the stack.
 	/// </summary>
-	/// <typeparam name="T">The type of elements in the stack.</typeparam>
-	public class StackEx<T> : Stack<T>, ICollection<T>
+	/// <param name="item">The item to add.</param>
+	/// <remarks>This method delegates to <see cref="Stack{T}.Push(T)"/>.</remarks>
+	void ICollection<T>.Add(T item)
 	{
-		/// <summary>
-		/// Adds an item to the top of the stack.
-		/// </summary>
-		/// <param name="item">The item to add.</param>
-		/// <remarks>This method delegates to <see cref="Stack{T}.Push(T)"/>.</remarks>
-		void ICollection<T>.Add(T item)
-		{
-			Push(item);
-		}
-
-		/// <summary>
-		/// Attempts to remove a specific item from the stack. This operation is not supported.
-		/// </summary>
-		/// <param name="item">The item to remove.</param>
-		/// <returns>Always throws <see cref="NotSupportedException"/>.</returns>
-		/// <exception cref="NotSupportedException">Thrown because removing a specific item is not supported by a stack.</exception>
-		bool ICollection<T>.Remove(T item)
-		{
-			throw new NotSupportedException();
-		}
+		Push(item);
+	}
 
-		/// <summary>
-		/// Gets a value indicating whether the stack is read-only.
-		/// </summary>
-		/// <remarks>Always returns false, as stacks are inherently mutable.</remarks>
-		bool ICollection<T>.IsReadOnly => false;
+	/// <summary>
+	/// Attempts to remove a specific item from the stack. This operation is not supported.
+	/// </summary>
+	/// <param name="item">The item to remove.</param>
+	/// <returns>Always throws <see cref="NotSupportedException"/>.</returns>
+	/// <exception cref="NotSupportedException">Thrown because removing a specific item is not supported by a stack.</exception>
+	bool ICollection<T>.Remove(T item)
+	{
+		throw new NotSupportedException();
 	}
+
+	/// <summary>
+	/// Gets a value indicating whether the stack is read-only.
+	/// </summary>
+	/// <remarks>Always returns false, as stacks are inherently mutable.</remarks>
+	bool ICollection<T>.IsReadOnly => false;
 }
\ No newline at end of file
diff --git a/Collections/SynchronizedCollection.cs b/Collections/SynchronizedCollection.cs
index da0a39c7..833bbf74 100644
--- a/Collections/SynchronizedCollection.cs
+++ b/Collections/SynchronizedCollection.cs
@@ -1,143 +1,142 @@
-namespace Ecng.Collections
-{
-	using System;
-	using System.Collections.Generic;
+namespace Ecng.Collections;
+
+using System;
+using System.Collections.Generic;
 
-	using Ecng.Common;
+using Ecng.Common;
 
+/// <summary>
+/// Represents a thread-safe collection that provides synchronization for its operations.
+/// </summary>
+/// <typeparam name="TItem">The type of elements in the collection.</typeparam>
+/// <typeparam name="TCollection">The type of the inner collection.</typeparam>
+[Serializable]
+public abstract class SynchronizedCollection<TItem, TCollection>(TCollection innerCollection) : BaseCollection<TItem, TCollection>(innerCollection), ISynchronizedCollection<TItem>
+	where TCollection : ICollection<TItem>
+{
 	/// <summary>
-	/// Represents a thread-safe collection that provides synchronization for its operations.
+	/// Gets the synchronization root object used to synchronize access to the collection.
 	/// </summary>
-	/// <typeparam name="TItem">The type of elements in the collection.</typeparam>
-	/// <typeparam name="TCollection">The type of the inner collection.</typeparam>
-	[Serializable]
-	public abstract class SynchronizedCollection<TItem, TCollection>(TCollection innerCollection) : BaseCollection<TItem, TCollection>(innerCollection), ISynchronizedCollection<TItem>
-		where TCollection : ICollection<TItem>
-	{
-		/// <summary>
-		/// Gets the synchronization root object used to synchronize access to the collection.
-		/// </summary>
-		public SyncObject SyncRoot { get; } = new SyncObject();
-
-		/// <summary>
-		/// Gets the number of elements contained in the collection.
-		/// </summary>
-		public override int Count
-		{
-			get
-			{
-				lock (SyncRoot)
-					return base.Count;
-			}
-		}
-
-		/// <summary>
-		/// Gets or sets the element at the specified index.
-		/// </summary>
-		/// <param name="index">The zero-based index of the element to get or set.</param>
-		/// <returns>The element at the specified index.</returns>
-		public override TItem this[int index]
-		{
-			get
-			{
-				lock (SyncRoot)
-					return base[index];
-			}
-			set
-			{
-				lock (SyncRoot)
-					base[index] = value;
-			}
-		}
+	public SyncObject SyncRoot { get; } = new SyncObject();
 
-		/// <summary>
-		/// Adds an item to the collection.
-		/// </summary>
-		/// <param name="item">The item to add to the collection.</param>
-		public override void Add(TItem item)
+	/// <summary>
+	/// Gets the number of elements contained in the collection.
+	/// </summary>
+	public override int Count
+	{
+		get
 		{
 			lock (SyncRoot)
-				base.Add(item);
+				return base.Count;
 		}
+	}
 
-		/// <summary>
-		/// Removes all items from the collection.
-		/// </summary>
-		public override void Clear()
+	/// <summary>
+	/// Gets or sets the element at the specified index.
+	/// </summary>
+	/// <param name="index">The zero-based index of the element to get or set.</param>
+	/// <returns>The element at the specified index.</returns>
+	public override TItem this[int index]
+	{
+		get
 		{
 			lock (SyncRoot)
-				base.Clear();
+				return base[index];
 		}
-
-		/// <summary>
-		/// Removes the first occurrence of a specific item from the collection.
-		/// </summary>
-		/// <param name="item">The item to remove from the collection.</param>
-		/// <returns><c>true</c> if the item was successfully removed; otherwise, <c>false</c>.</returns>
-		public override bool Remove(TItem item)
+		set
 		{
 			lock (SyncRoot)
-				return base.Remove(item);
+				base[index] = value;
 		}
+	}
 
-		/// <summary>
-		/// Removes the item at the specified index.
-		/// </summary>
-		/// <param name="index">The zero-based index of the item to remove.</param>
-		public override void RemoveAt(int index)
-		{
-			lock (SyncRoot)
-				base.RemoveAt(index);
-		}
+	/// <summary>
+	/// Adds an item to the collection.
+	/// </summary>
+	/// <param name="item">The item to add to the collection.</param>
+	public override void Add(TItem item)
+	{
+		lock (SyncRoot)
+			base.Add(item);
+	}
 
-		/// <summary>
-		/// Inserts an item into the collection at the specified index.
-		/// </summary>
-		/// <param name="index">The zero-based index at which the item should be inserted.</param>
-		/// <param name="item">The item to insert into the collection.</param>
-		public override void Insert(int index, TItem item)
-		{
-			lock (SyncRoot)
-				base.Insert(index, item);
-		}
+	/// <summary>
+	/// Removes all items from the collection.
+	/// </summary>
+	public override void Clear()
+	{
+		lock (SyncRoot)
+			base.Clear();
+	}
 
-		/// <summary>
-		/// Determines the index of a specific item in the collection.
-		/// </summary>
-		/// <param name="item">The item to locate in the collection.</param>
-		/// <returns>The index of the item if found in the collection; otherwise, -1.</returns>
-		public override int IndexOf(TItem item)
-		{
-			lock (SyncRoot)
-				return OnIndexOf(item);
-		}
+	/// <summary>
+	/// Removes the first occurrence of a specific item from the collection.
+	/// </summary>
+	/// <param name="item">The item to remove from the collection.</param>
+	/// <returns><c>true</c> if the item was successfully removed; otherwise, <c>false</c>.</returns>
+	public override bool Remove(TItem item)
+	{
+		lock (SyncRoot)
+			return base.Remove(item);
+	}
 
-		/// <summary>
-		/// Determines whether the collection contains a specific item.
-		/// </summary>
-		/// <param name="item">The item to locate in the collection.</param>
-		/// <returns><c>true</c> if the item is found in the collection; otherwise, <c>false</c>.</returns>
-		public override bool Contains(TItem item)
-		{
-			lock (SyncRoot)
-				return base.Contains(item);
-		}
+	/// <summary>
+	/// Removes the item at the specified index.
+	/// </summary>
+	/// <param name="index">The zero-based index of the item to remove.</param>
+	public override void RemoveAt(int index)
+	{
+		lock (SyncRoot)
+			base.RemoveAt(index);
+	}
 
-		/// <summary>
-		/// When overridden in a derived class, determines the index of a specific item in the collection.
-		/// </summary>
-		/// <param name="item">The item to locate in the collection.</param>
-		/// <returns>The index of the item if found in the collection; otherwise, -1.</returns>
-		protected abstract int OnIndexOf(TItem item);
+	/// <summary>
+	/// Inserts an item into the collection at the specified index.
+	/// </summary>
+	/// <param name="index">The zero-based index at which the item should be inserted.</param>
+	/// <param name="item">The item to insert into the collection.</param>
+	public override void Insert(int index, TItem item)
+	{
+		lock (SyncRoot)
+			base.Insert(index, item);
+	}
 
-		/// <summary>
-		/// Returns an enumerator that iterates through the collection.
-		/// </summary>
-		/// <returns>An enumerator that can be used to iterate through the collection.</returns>
-		public override IEnumerator<TItem> GetEnumerator()
-		{
-			lock (SyncRoot)
-				return InnerCollection.GetEnumerator();
-		}
+	/// <summary>
+	/// Determines the index of a specific item in the collection.
+	/// </summary>
+	/// <param name="item">The item to locate in the collection.</param>
+	/// <returns>The index of the item if found in the collection; otherwise, -1.</returns>
+	public override int IndexOf(TItem item)
+	{
+		lock (SyncRoot)
+			return OnIndexOf(item);
+	}
+
+	/// <summary>
+	/// Determines whether the collection contains a specific item.
+	/// </summary>
+	/// <param name="item">The item to locate in the collection.</param>
+	/// <returns><c>true</c> if the item is found in the collection; otherwise, <c>false</c>.</returns>
+	public override bool Contains(TItem item)
+	{
+		lock (SyncRoot)
+			return base.Contains(item);
+	}
+
+	/// <summary>
+	/// When overridden in a derived class, determines the index of a specific item in the collection.
+	/// </summary>
+	/// <param name="item">The item to locate in the collection.</param>
+	/// <returns>The index of the item if found in the collection; otherwise, -1.</returns>
+	protected abstract int OnIndexOf(TItem item);
+
+	/// <summary>
+	/// Returns an enumerator that iterates through the collection.
+	/// </summary>
+	/// <returns>An enumerator that can be used to iterate through the collection.</returns>
+	public override IEnumerator<TItem> GetEnumerator()
+	{
+		lock (SyncRoot)
+			return InnerCollection.GetEnumerator();
 	}
 }
\ No newline at end of file
diff --git a/Collections/SynchronizedDictionary.cs b/Collections/SynchronizedDictionary.cs
index ad014a61..2d0f14d4 100644
--- a/Collections/SynchronizedDictionary.cs
+++ b/Collections/SynchronizedDictionary.cs
@@ -1,243 +1,242 @@
-namespace Ecng.Collections
+namespace Ecng.Collections;
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+using Ecng.Common;
+
+/// <summary>
+/// Represents a thread-safe dictionary that provides synchronization for its operations.
+/// </summary>
+/// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
+/// <typeparam name="TValue">The type of values in the dictionary.</typeparam>
+[Serializable]
+public class SynchronizedDictionary<TKey, TValue> : ISynchronizedCollection<KeyValuePair<TKey, TValue>>, IDictionary<TKey, TValue>
 {
-	using System;
-	using System.Collections;
-	using System.Collections.Generic;
+	private readonly IDictionary<TKey, TValue> _inner;
 
-	using Ecng.Common;
+	/// <summary>
+	/// Initializes a new instance of the <see cref="SynchronizedDictionary{TKey, TValue}"/> class.
+	/// </summary>
+	public SynchronizedDictionary()
+		: this(new Dictionary<TKey, TValue>())
+	{
+	}
 
 	/// <summary>
-	/// Represents a thread-safe dictionary that provides synchronization for its operations.
+	/// Initializes a new instance of the <see cref="SynchronizedDictionary{TKey, TValue}"/> class with the specified initial capacity.
 	/// </summary>
-	/// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
-	/// <typeparam name="TValue">The type of values in the dictionary.</typeparam>
-	[Serializable]
-	public class SynchronizedDictionary<TKey, TValue> : ISynchronizedCollection<KeyValuePair<TKey, TValue>>, IDictionary<TKey, TValue>
+	/// <param name="capacity">The initial number of elements that the dictionary can contain.</param>
+	public SynchronizedDictionary(int capacity)
+		: this(new Dictionary<TKey, TValue>(capacity))
 	{
-		private readonly IDictionary<TKey, TValue> _inner;
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="SynchronizedDictionary{TKey, TValue}"/> class.
-		/// </summary>
-		public SynchronizedDictionary()
-			: this(new Dictionary<TKey, TValue>())
-		{
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="SynchronizedDictionary{TKey, TValue}"/> class with the specified equality comparer.
+	/// </summary>
+	/// <param name="comparer">The equality comparer to use when comparing keys.</param>
+	public SynchronizedDictionary(IEqualityComparer<TKey> comparer)
+		: this(new Dictionary<TKey, TValue>(comparer))
+	{
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="SynchronizedDictionary{TKey, TValue}"/> class with the specified initial capacity.
-		/// </summary>
-		/// <param name="capacity">The initial number of elements that the dictionary can contain.</param>
-		public SynchronizedDictionary(int capacity)
-			: this(new Dictionary<TKey, TValue>(capacity))
-		{
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="SynchronizedDictionary{TKey, TValue}"/> class with the specified initial capacity and equality comparer.
+	/// </summary>
+	/// <param name="capacity">The initial number of elements that the dictionary can contain.</param>
+	/// <param name="comparer">The equality comparer to use when comparing keys.</param>
+	public SynchronizedDictionary(int capacity, IEqualityComparer<TKey> comparer)
+		: this(new Dictionary<TKey, TValue>(capacity, comparer))
+	{
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="SynchronizedDictionary{TKey, TValue}"/> class with the specified equality comparer.
-		/// </summary>
-		/// <param name="comparer">The equality comparer to use when comparing keys.</param>
-		public SynchronizedDictionary(IEqualityComparer<TKey> comparer)
-			: this(new Dictionary<TKey, TValue>(comparer))
-		{
-		}
+	/// <summary>
+	/// Gets the synchronization root object used to synchronize access to the dictionary.
+	/// </summary>
+	public SyncObject SyncRoot { get; } = new SyncObject();
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="SynchronizedDictionary{TKey, TValue}"/> class with the specified initial capacity and equality comparer.
-		/// </summary>
-		/// <param name="capacity">The initial number of elements that the dictionary can contain.</param>
-		/// <param name="comparer">The equality comparer to use when comparing keys.</param>
-		public SynchronizedDictionary(int capacity, IEqualityComparer<TKey> comparer)
-			: this(new Dictionary<TKey, TValue>(capacity, comparer))
-		{
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="SynchronizedDictionary{TKey, TValue}"/> class with the specified inner dictionary.
+	/// </summary>
+	/// <param name="inner">The inner dictionary to wrap.</param>
+	/// <exception cref="ArgumentNullException">Thrown if <paramref name="inner"/> is null.</exception>
+	protected SynchronizedDictionary(IDictionary<TKey, TValue> inner)
+	{
+		_inner = inner ?? throw new ArgumentNullException(nameof(inner));
+	}
 
-		/// <summary>
-		/// Gets the synchronization root object used to synchronize access to the dictionary.
-		/// </summary>
-		public SyncObject SyncRoot { get; } = new SyncObject();
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="SynchronizedDictionary{TKey, TValue}"/> class with the specified inner dictionary.
-		/// </summary>
-		/// <param name="inner">The inner dictionary to wrap.</param>
-		/// <exception cref="ArgumentNullException">Thrown if <paramref name="inner"/> is null.</exception>
-		protected SynchronizedDictionary(IDictionary<TKey, TValue> inner)
-		{
-			_inner = inner ?? throw new ArgumentNullException(nameof(inner));
-		}
+	/// <summary>
+	/// Returns an enumerator that iterates through the dictionary.
+	/// </summary>
+	/// <returns>An enumerator that can be used to iterate through the dictionary.</returns>
+	public IEnumerator<KeyValuePair<TKey, TValue>> GetEnumerator()
+	{
+		lock (SyncRoot)
+			return _inner.GetEnumerator();
+	}
 
-		/// <summary>
-		/// Returns an enumerator that iterates through the dictionary.
-		/// </summary>
-		/// <returns>An enumerator that can be used to iterate through the dictionary.</returns>
-		public IEnumerator<KeyValuePair<TKey, TValue>> GetEnumerator()
-		{
-			lock (SyncRoot)
-				return _inner.GetEnumerator();
-		}
+	/// <summary>
+	/// Returns an enumerator that iterates through the dictionary.
+	/// </summary>
+	/// <returns>An enumerator that can be used to iterate through the dictionary.</returns>
+	IEnumerator IEnumerable.GetEnumerator()
+	{
+		return GetEnumerator();
+	}
 
-		/// <summary>
-		/// Returns an enumerator that iterates through the dictionary.
-		/// </summary>
-		/// <returns>An enumerator that can be used to iterate through the dictionary.</returns>
-		IEnumerator IEnumerable.GetEnumerator()
-		{
-			return GetEnumerator();
-		}
+	/// <summary>
+	/// Adds a key-value pair to the dictionary.
+	/// </summary>
+	/// <param name="item">The key-value pair to add.</param>
+	public void Add(KeyValuePair<TKey, TValue> item)
+	{
+		Add(item.Key, item.Value);
+	}
 
-		/// <summary>
-		/// Adds a key-value pair to the dictionary.
-		/// </summary>
-		/// <param name="item">The key-value pair to add.</param>
-		public void Add(KeyValuePair<TKey, TValue> item)
-		{
-			Add(item.Key, item.Value);
-		}
+	/// <summary>
+	/// Removes all keys and values from the dictionary.
+	/// </summary>
+	public virtual void Clear()
+	{
+		lock (SyncRoot)
+			_inner.Clear();
+	}
 
-		/// <summary>
-		/// Removes all keys and values from the dictionary.
-		/// </summary>
-		public virtual void Clear()
-		{
-			lock (SyncRoot)
-				_inner.Clear();
-		}
+	/// <summary>
+	/// Determines whether the dictionary contains a specific key-value pair.
+	/// </summary>
+	/// <param name="item">The key-value pair to locate in the dictionary.</param>
+	/// <returns><c>true</c> if the dictionary contains the key-value pair; otherwise, <c>false</c>.</returns>
+	public bool Contains(KeyValuePair<TKey, TValue> item)
+	{
+		return ContainsKey(item.Key);
+	}
 
-		/// <summary>
-		/// Determines whether the dictionary contains a specific key-value pair.
-		/// </summary>
-		/// <param name="item">The key-value pair to locate in the dictionary.</param>
-		/// <returns><c>true</c> if the dictionary contains the key-value pair; otherwise, <c>false</c>.</returns>
-		public bool Contains(KeyValuePair<TKey, TValue> item)
-		{
-			return ContainsKey(item.Key);
-		}
+	/// <summary>
+	/// Copies the elements of the dictionary to an array, starting at a particular array index.
+	/// </summary>
+	/// <param name="array">The one-dimensional array that is the destination of the elements copied from the dictionary.</param>
+	/// <param name="arrayIndex">The zero-based index in <paramref name="array"/> at which copying begins.</param>
+	public virtual void CopyTo(KeyValuePair<TKey, TValue>[] array, int arrayIndex)
+	{
+		lock (SyncRoot)
+			_inner.CopyTo(array, arrayIndex);
+	}
+
+	/// <summary>
+	/// Removes the first occurrence of a specific key-value pair from the dictionary.
+	/// </summary>
+	/// <param name="item">The key-value pair to remove.</param>
+	/// <returns><c>true</c> if the key-value pair was successfully removed; otherwise, <c>false</c>.</returns>
+	public bool Remove(KeyValuePair<TKey, TValue> item)
+	{
+		return Remove(item.Key);
+	}
 
-		/// <summary>
-		/// Copies the elements of the dictionary to an array, starting at a particular array index.
-		/// </summary>
-		/// <param name="array">The one-dimensional array that is the destination of the elements copied from the dictionary.</param>
-		/// <param name="arrayIndex">The zero-based index in <paramref name="array"/> at which copying begins.</param>
-		public virtual void CopyTo(KeyValuePair<TKey, TValue>[] array, int arrayIndex)
+	/// <summary>
+	/// Gets the number of key-value pairs contained in the dictionary.
+	/// </summary>
+	public int Count
+	{
+		get
 		{
 			lock (SyncRoot)
-				_inner.CopyTo(array, arrayIndex);
+				return _inner.Count;
 		}
+	}
 
-		/// <summary>
-		/// Removes the first occurrence of a specific key-value pair from the dictionary.
-		/// </summary>
-		/// <param name="item">The key-value pair to remove.</param>
-		/// <returns><c>true</c> if the key-value pair was successfully removed; otherwise, <c>false</c>.</returns>
-		public bool Remove(KeyValuePair<TKey, TValue> item)
-		{
-			return Remove(item.Key);
-		}
+	/// <summary>
+	/// Gets a value indicating whether the dictionary is read-only.
+	/// </summary>
+	public bool IsReadOnly => false;
 
-		/// <summary>
-		/// Gets the number of key-value pairs contained in the dictionary.
-		/// </summary>
-		public int Count
-		{
-			get
-			{
-				lock (SyncRoot)
-					return _inner.Count;
-			}
-		}
+	/// <summary>
+	/// Determines whether the dictionary contains the specified key.
+	/// </summary>
+	/// <param name="key">The key to locate in the dictionary.</param>
+	/// <returns><c>true</c> if the dictionary contains an element with the specified key; otherwise, <c>false</c>.</returns>
+	public virtual bool ContainsKey(TKey key)
+	{
+		lock (SyncRoot)
+			return _inner.ContainsKey(key);
+	}
 
-		/// <summary>
-		/// Gets a value indicating whether the dictionary is read-only.
-		/// </summary>
-		public bool IsReadOnly => false;
-
-		/// <summary>
-		/// Determines whether the dictionary contains the specified key.
-		/// </summary>
-		/// <param name="key">The key to locate in the dictionary.</param>
-		/// <returns><c>true</c> if the dictionary contains an element with the specified key; otherwise, <c>false</c>.</returns>
-		public virtual bool ContainsKey(TKey key)
-		{
-			lock (SyncRoot)
-				return _inner.ContainsKey(key);
-		}
+	/// <summary>
+	/// Adds the specified key and value to the dictionary.
+	/// </summary>
+	/// <param name="key">The key of the element to add.</param>
+	/// <param name="value">The value of the element to add.</param>
+	public virtual void Add(TKey key, TValue value)
+	{
+		lock (SyncRoot)
+			_inner.Add(key, value);
+	}
 
-		/// <summary>
-		/// Adds the specified key and value to the dictionary.
-		/// </summary>
-		/// <param name="key">The key of the element to add.</param>
-		/// <param name="value">The value of the element to add.</param>
-		public virtual void Add(TKey key, TValue value)
-		{
-			lock (SyncRoot)
-				_inner.Add(key, value);
-		}
+	/// <summary>
+	/// Removes the value with the specified key from the dictionary.
+	/// </summary>
+	/// <param name="key">The key of the element to remove.</param>
+	/// <returns><c>true</c> if the element is successfully found and removed; otherwise, <c>false</c>.</returns>
+	public virtual bool Remove(TKey key)
+	{
+		lock (SyncRoot)
+			return _inner.Remove(key);
+	}
 
-		/// <summary>
-		/// Removes the value with the specified key from the dictionary.
-		/// </summary>
-		/// <param name="key">The key of the element to remove.</param>
-		/// <returns><c>true</c> if the element is successfully found and removed; otherwise, <c>false</c>.</returns>
-		public virtual bool Remove(TKey key)
-		{
-			lock (SyncRoot)
-				return _inner.Remove(key);
-		}
+	/// <summary>
+	/// Gets the value associated with the specified key.
+	/// </summary>
+	/// <param name="key">The key of the value to get.</param>
+	/// <param name="value">When this method returns, contains the value associated with the specified key, if the key is found; otherwise, the default value for the type of the <paramref name="value"/> parameter.</param>
+	/// <returns><c>true</c> if the dictionary contains an element with the specified key; otherwise, <c>false</c>.</returns>
+	public virtual bool TryGetValue(TKey key, out TValue value)
+	{
+		lock (SyncRoot)
+			return _inner.TryGetValue(key, out value);
+	}
 
-		/// <summary>
-		/// Gets the value associated with the specified key.
-		/// </summary>
-		/// <param name="key">The key of the value to get.</param>
-		/// <param name="value">When this method returns, contains the value associated with the specified key, if the key is found; otherwise, the default value for the type of the <paramref name="value"/> parameter.</param>
-		/// <returns><c>true</c> if the dictionary contains an element with the specified key; otherwise, <c>false</c>.</returns>
-		public virtual bool TryGetValue(TKey key, out TValue value)
+	/// <summary>
+	/// Gets or sets the value associated with the specified key.
+	/// </summary>
+	/// <param name="key">The key of the value to get or set.</param>
+	/// <returns>The value associated with the specified key.</returns>
+	public virtual TValue this[TKey key]
+	{
+		get
 		{
 			lock (SyncRoot)
-				return _inner.TryGetValue(key, out value);
+				return _inner[key];
 		}
-
-		/// <summary>
-		/// Gets or sets the value associated with the specified key.
-		/// </summary>
-		/// <param name="key">The key of the value to get or set.</param>
-		/// <returns>The value associated with the specified key.</returns>
-		public virtual TValue this[TKey key]
+		set
 		{
-			get
-			{
-				lock (SyncRoot)
-					return _inner[key];
-			}
-			set
-			{
-				lock (SyncRoot)
-					_inner[key] = value;
-			}
+			lock (SyncRoot)
+				_inner[key] = value;
 		}
+	}
 
-		/// <summary>
-		/// Gets a collection containing the keys in the dictionary.
-		/// </summary>
-		public ICollection<TKey> Keys
+	/// <summary>
+	/// Gets a collection containing the keys in the dictionary.
+	/// </summary>
+	public ICollection<TKey> Keys
+	{
+		get
 		{
-			get
-			{
-				lock (SyncRoot)
-					return _inner.Keys;
-			}
+			lock (SyncRoot)
+				return _inner.Keys;
 		}
+	}
 
-		/// <summary>
-		/// Gets a collection containing the values in the dictionary.
-		/// </summary>
-		public ICollection<TValue> Values
+	/// <summary>
+	/// Gets a collection containing the values in the dictionary.
+	/// </summary>
+	public ICollection<TValue> Values
+	{
+		get
 		{
-			get
-			{
-				lock (SyncRoot)
-					return _inner.Values;
-			}
+			lock (SyncRoot)
+				return _inner.Values;
 		}
 	}
 }
\ No newline at end of file
diff --git a/Collections/SynchronizedKeyedCollection.cs b/Collections/SynchronizedKeyedCollection.cs
index 2a1169a0..0bec300e 100644
--- a/Collections/SynchronizedKeyedCollection.cs
+++ b/Collections/SynchronizedKeyedCollection.cs
@@ -1,77 +1,76 @@
-namespace Ecng.Collections
-{
-	using System;
-	using System.Collections.Generic;
+namespace Ecng.Collections;
+
+using System;
+using System.Collections.Generic;
 
-	using Ecng.Common;
+using Ecng.Common;
 
+/// <summary>
+/// Represents a thread-safe keyed collection that provides synchronization for its operations.
+/// </summary>
+/// <typeparam name="TKey">The type of keys in the collection.</typeparam>
+/// <typeparam name="TValue">The type of values in the collection.</typeparam>
+[Serializable]
+public abstract class SynchronizedKeyedCollection<TKey, TValue> : KeyedCollection<TKey, TValue>, ISynchronizedCollection<KeyValuePair<TKey, TValue>>
+{
 	/// <summary>
-	/// Represents a thread-safe keyed collection that provides synchronization for its operations.
+	/// Initializes a new instance of the <see cref="SynchronizedKeyedCollection{TKey, TValue}"/> class.
 	/// </summary>
-	/// <typeparam name="TKey">The type of keys in the collection.</typeparam>
-	/// <typeparam name="TValue">The type of values in the collection.</typeparam>
-	[Serializable]
-	public abstract class SynchronizedKeyedCollection<TKey, TValue> : KeyedCollection<TKey, TValue>, ISynchronizedCollection<KeyValuePair<TKey, TValue>>
+	protected SynchronizedKeyedCollection()
+		: base(new SynchronizedDictionary<TKey, TValue>())
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="SynchronizedKeyedCollection{TKey, TValue}"/> class.
-		/// </summary>
-		protected SynchronizedKeyedCollection()
-			: base(new SynchronizedDictionary<TKey, TValue>())
-		{
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="SynchronizedKeyedCollection{TKey, TValue}"/> class with the specified equality comparer.
-		/// </summary>
-		/// <param name="comparer">The equality comparer to use when comparing keys.</param>
-		protected SynchronizedKeyedCollection(IEqualityComparer<TKey> comparer)
-			: base(new SynchronizedDictionary<TKey, TValue>(comparer))
-		{
-		}
+	}
 
-		/// <summary>
-		/// Gets the synchronized dictionary used internally by the collection.
-		/// </summary>
-		private SynchronizedDictionary<TKey, TValue> SyncDict => (SynchronizedDictionary<TKey, TValue>)InnerDictionary;
+	/// <summary>
+	/// Initializes a new instance of the <see cref="SynchronizedKeyedCollection{TKey, TValue}"/> class with the specified equality comparer.
+	/// </summary>
+	/// <param name="comparer">The equality comparer to use when comparing keys.</param>
+	protected SynchronizedKeyedCollection(IEqualityComparer<TKey> comparer)
+		: base(new SynchronizedDictionary<TKey, TValue>(comparer))
+	{
+	}
 
-		/// <summary>
-		/// Gets the synchronization root object used to synchronize access to the collection.
-		/// </summary>
-		public SyncObject SyncRoot => SyncDict.SyncRoot;
+	/// <summary>
+	/// Gets the synchronized dictionary used internally by the collection.
+	/// </summary>
+	private SynchronizedDictionary<TKey, TValue> SyncDict => (SynchronizedDictionary<TKey, TValue>)InnerDictionary;
 
-		/// <summary>
-		/// Gets or sets the value associated with the specified key.
-		/// </summary>
-		/// <param name="key">The key of the value to get or set.</param>
-		/// <returns>The value associated with the specified key.</returns>
-		public override TValue this[TKey key]
-		{
-			set
-			{
-				lock (SyncRoot)
-					base[key] = value;
-			}
-		}
+	/// <summary>
+	/// Gets the synchronization root object used to synchronize access to the collection.
+	/// </summary>
+	public SyncObject SyncRoot => SyncDict.SyncRoot;
 
-		/// <summary>
-		/// Removes all keys and values from the collection.
-		/// </summary>
-		public override void Clear()
+	/// <summary>
+	/// Gets or sets the value associated with the specified key.
+	/// </summary>
+	/// <param name="key">The key of the value to get or set.</param>
+	/// <returns>The value associated with the specified key.</returns>
+	public override TValue this[TKey key]
+	{
+		set
 		{
 			lock (SyncRoot)
-				base.Clear();
+				base[key] = value;
 		}
+	}
 
-		/// <summary>
-		/// Removes the value with the specified key from the collection.
-		/// </summary>
-		/// <param name="key">The key of the element to remove.</param>
-		/// <returns><c>true</c> if the element is successfully found and removed; otherwise, <c>false</c>.</returns>
-		public override bool Remove(TKey key)
-		{
-			lock (SyncRoot)
-				return base.Remove(key);
-		}
+	/// <summary>
+	/// Removes all keys and values from the collection.
+	/// </summary>
+	public override void Clear()
+	{
+		lock (SyncRoot)
+			base.Clear();
+	}
+
+	/// <summary>
+	/// Removes the value with the specified key from the collection.
+	/// </summary>
+	/// <param name="key">The key of the element to remove.</param>
+	/// <returns><c>true</c> if the element is successfully found and removed; otherwise, <c>false</c>.</returns>
+	public override bool Remove(TKey key)
+	{
+		lock (SyncRoot)
+			return base.Remove(key);
 	}
 }
\ No newline at end of file
diff --git a/Collections/SynchronizedLinkedList.cs b/Collections/SynchronizedLinkedList.cs
index 58e16363..057d28cb 100644
--- a/Collections/SynchronizedLinkedList.cs
+++ b/Collections/SynchronizedLinkedList.cs
@@ -1,247 +1,246 @@
-namespace Ecng.Collections
-{
-	using System.Collections;
-	using System.Collections.Generic;
-
-	using Ecng.Common;
+namespace Ecng.Collections;
 
-	/// <summary>
-	/// Represents a thread-safe linked list that provides synchronization for its operations.
-	/// </summary>
-	/// <typeparam name="T">The type of elements in the linked list.</typeparam>
-	public class SynchronizedLinkedList<T> : ISynchronizedCollection<T>
-	{
-		private readonly LinkedList<T> _inner = new();
+using System.Collections;
+using System.Collections.Generic;
 
-		private readonly SyncObject _syncRoot = new();
+using Ecng.Common;
 
-		/// <summary>
-		/// Gets the synchronization root object used to synchronize access to the linked list.
-		/// </summary>
-		public SyncObject SyncRoot => _syncRoot;
+/// <summary>
+/// Represents a thread-safe linked list that provides synchronization for its operations.
+/// </summary>
+/// <typeparam name="T">The type of elements in the linked list.</typeparam>
+public class SynchronizedLinkedList<T> : ISynchronizedCollection<T>
+{
+	private readonly LinkedList<T> _inner = new();
 
-		/// <summary>
-		/// Gets the first node of the linked list.
-		/// </summary>
-		public virtual LinkedListNode<T> First
-		{
-			get
-			{
-				lock (SyncRoot)
-					return _inner.First;
-			}
-		}
+	private readonly SyncObject _syncRoot = new();
 
-		/// <summary>
-		/// Gets the last node of the linked list.
-		/// </summary>
-		public virtual LinkedListNode<T> Last
-		{
-			get
-			{
-				lock (SyncRoot)
-					return _inner.Last;
-			}
-		}
+	/// <summary>
+	/// Gets the synchronization root object used to synchronize access to the linked list.
+	/// </summary>
+	public SyncObject SyncRoot => _syncRoot;
 
-		/// <summary>
-		/// Adds a new node containing the specified value before the specified existing node.
-		/// </summary>
-		/// <param name="node">The node before which the new node should be added.</param>
-		/// <param name="value">The value to add to the linked list.</param>
-		public virtual void AddBefore(LinkedListNode<T> node, T value)
+	/// <summary>
+	/// Gets the first node of the linked list.
+	/// </summary>
+	public virtual LinkedListNode<T> First
+	{
+		get
 		{
 			lock (SyncRoot)
-				_inner.AddBefore(node, value);
+				return _inner.First;
 		}
+	}
 
-		/// <summary>
-		/// Adds the specified new node before the specified existing node.
-		/// </summary>
-		/// <param name="node">The node before which the new node should be added.</param>
-		/// <param name="newNode">The new node to add.</param>
-		public virtual void AddBefore(LinkedListNode<T> node, LinkedListNode<T> newNode)
+	/// <summary>
+	/// Gets the last node of the linked list.
+	/// </summary>
+	public virtual LinkedListNode<T> Last
+	{
+		get
 		{
 			lock (SyncRoot)
-				_inner.AddBefore(node, newNode);
+				return _inner.Last;
 		}
+	}
 
-		/// <summary>
-		/// Adds a new node containing the specified value at the start of the linked list.
-		/// </summary>
-		/// <param name="value">The value to add to the linked list.</param>
-		public virtual void AddFirst(T value)
-		{
-			lock (SyncRoot)
-				_inner.AddFirst(value);
-		}
+	/// <summary>
+	/// Adds a new node containing the specified value before the specified existing node.
+	/// </summary>
+	/// <param name="node">The node before which the new node should be added.</param>
+	/// <param name="value">The value to add to the linked list.</param>
+	public virtual void AddBefore(LinkedListNode<T> node, T value)
+	{
+		lock (SyncRoot)
+			_inner.AddBefore(node, value);
+	}
 
-		/// <summary>
-		/// Adds the specified new node at the start of the linked list.
-		/// </summary>
-		/// <param name="node">The new node to add.</param>
-		public virtual void AddFirst(LinkedListNode<T> node)
-		{
-			lock (SyncRoot)
-				_inner.AddFirst(node);
-		}
+	/// <summary>
+	/// Adds the specified new node before the specified existing node.
+	/// </summary>
+	/// <param name="node">The node before which the new node should be added.</param>
+	/// <param name="newNode">The new node to add.</param>
+	public virtual void AddBefore(LinkedListNode<T> node, LinkedListNode<T> newNode)
+	{
+		lock (SyncRoot)
+			_inner.AddBefore(node, newNode);
+	}
 
-		/// <summary>
-		/// Adds a new node containing the specified value at the end of the linked list.
-		/// </summary>
-		/// <param name="value">The value to add to the linked list.</param>
-		public virtual void AddLast(T value)
-		{
-			lock (SyncRoot)
-				_inner.AddLast(value);
-		}
+	/// <summary>
+	/// Adds a new node containing the specified value at the start of the linked list.
+	/// </summary>
+	/// <param name="value">The value to add to the linked list.</param>
+	public virtual void AddFirst(T value)
+	{
+		lock (SyncRoot)
+			_inner.AddFirst(value);
+	}
 
-		/// <summary>
-		/// Adds the specified new node at the end of the linked list.
-		/// </summary>
-		/// <param name="node">The new node to add.</param>
-		public virtual void AddLast(LinkedListNode<T> node)
-		{
-			lock (SyncRoot)
-				_inner.AddLast(node);
-		}
+	/// <summary>
+	/// Adds the specified new node at the start of the linked list.
+	/// </summary>
+	/// <param name="node">The new node to add.</param>
+	public virtual void AddFirst(LinkedListNode<T> node)
+	{
+		lock (SyncRoot)
+			_inner.AddFirst(node);
+	}
 
-		/// <summary>
-		/// Removes the specified node from the linked list.
-		/// </summary>
-		/// <param name="node">The node to remove.</param>
-		public virtual void Remove(LinkedListNode<T> node)
-		{
-			lock (SyncRoot)
-				_inner.Remove(node);
-		}
+	/// <summary>
+	/// Adds a new node containing the specified value at the end of the linked list.
+	/// </summary>
+	/// <param name="value">The value to add to the linked list.</param>
+	public virtual void AddLast(T value)
+	{
+		lock (SyncRoot)
+			_inner.AddLast(value);
+	}
 
-		/// <summary>
-		/// Removes the node at the start of the linked list.
-		/// </summary>
-		public virtual void RemoveFirst()
-		{
-			lock (SyncRoot)
-				_inner.RemoveFirst();
-		}
+	/// <summary>
+	/// Adds the specified new node at the end of the linked list.
+	/// </summary>
+	/// <param name="node">The new node to add.</param>
+	public virtual void AddLast(LinkedListNode<T> node)
+	{
+		lock (SyncRoot)
+			_inner.AddLast(node);
+	}
 
-		/// <summary>
-		/// Removes the node at the end of the linked list.
-		/// </summary>
-		public virtual void RemoveLast()
-		{
-			lock (SyncRoot)
-				_inner.RemoveLast();
-		}
+	/// <summary>
+	/// Removes the specified node from the linked list.
+	/// </summary>
+	/// <param name="node">The node to remove.</param>
+	public virtual void Remove(LinkedListNode<T> node)
+	{
+		lock (SyncRoot)
+			_inner.Remove(node);
+	}
 
-		/// <summary>
-		/// Finds the first node that contains the specified value.
-		/// </summary>
-		/// <param name="value">The value to locate in the linked list.</param>
-		/// <returns>The first node that contains the specified value, if found; otherwise, <c>null</c>.</returns>
-		public virtual LinkedListNode<T> Find(T value)
-		{
-			lock (SyncRoot)
-				return _inner.Find(value);
-		}
+	/// <summary>
+	/// Removes the node at the start of the linked list.
+	/// </summary>
+	public virtual void RemoveFirst()
+	{
+		lock (SyncRoot)
+			_inner.RemoveFirst();
+	}
 
-		/// <summary>
-		/// Finds the last node that contains the specified value.
-		/// </summary>
-		/// <param name="value">The value to locate in the linked list.</param>
-		/// <returns>The last node that contains the specified value, if found; otherwise, <c>null</c>.</returns>
-		public virtual LinkedListNode<T> FindLast(T value)
-		{
-			lock (SyncRoot)
-				return _inner.FindLast(value);
-		}
+	/// <summary>
+	/// Removes the node at the end of the linked list.
+	/// </summary>
+	public virtual void RemoveLast()
+	{
+		lock (SyncRoot)
+			_inner.RemoveLast();
+	}
 
-		/// <summary>
-		/// Returns an enumerator that iterates through the linked list.
-		/// </summary>
-		/// <returns>An enumerator that can be used to iterate through the linked list.</returns>
-		public IEnumerator<T> GetEnumerator()
-		{
-			lock (SyncRoot)
-				return _inner.GetEnumerator();
-		}
+	/// <summary>
+	/// Finds the first node that contains the specified value.
+	/// </summary>
+	/// <param name="value">The value to locate in the linked list.</param>
+	/// <returns>The first node that contains the specified value, if found; otherwise, <c>null</c>.</returns>
+	public virtual LinkedListNode<T> Find(T value)
+	{
+		lock (SyncRoot)
+			return _inner.Find(value);
+	}
 
-		/// <summary>
-		/// Returns an enumerator that iterates through the linked list.
-		/// </summary>
-		/// <returns>An enumerator that can be used to iterate through the linked list.</returns>
-		IEnumerator IEnumerable.GetEnumerator()
-		{
-			return GetEnumerator();
-		}
+	/// <summary>
+	/// Finds the last node that contains the specified value.
+	/// </summary>
+	/// <param name="value">The value to locate in the linked list.</param>
+	/// <returns>The last node that contains the specified value, if found; otherwise, <c>null</c>.</returns>
+	public virtual LinkedListNode<T> FindLast(T value)
+	{
+		lock (SyncRoot)
+			return _inner.FindLast(value);
+	}
 
-		/// <summary>
-		/// Adds an item to the linked list.
-		/// </summary>
-		/// <param name="item">The item to add to the linked list.</param>
-		void ICollection<T>.Add(T item)
-		{
-			lock (SyncRoot)
-				((ICollection<T>)_inner).Add(item);
-		}
+	/// <summary>
+	/// Returns an enumerator that iterates through the linked list.
+	/// </summary>
+	/// <returns>An enumerator that can be used to iterate through the linked list.</returns>
+	public IEnumerator<T> GetEnumerator()
+	{
+		lock (SyncRoot)
+			return _inner.GetEnumerator();
+	}
 
-		/// <summary>
-		/// Removes all nodes from the linked list.
-		/// </summary>
-		public void Clear()
-		{
-			lock (SyncRoot)
-				_inner.Clear();
-		}
+	/// <summary>
+	/// Returns an enumerator that iterates through the linked list.
+	/// </summary>
+	/// <returns>An enumerator that can be used to iterate through the linked list.</returns>
+	IEnumerator IEnumerable.GetEnumerator()
+	{
+		return GetEnumerator();
+	}
 
-		/// <summary>
-		/// Determines whether the linked list contains the specified value.
-		/// </summary>
-		/// <param name="item">The value to locate in the linked list.</param>
-		/// <returns><c>true</c> if the value is found in the linked list; otherwise, <c>false</c>.</returns>
-		public bool Contains(T item)
-		{
-			lock (SyncRoot)
-				return _inner.Contains(item);
-		}
+	/// <summary>
+	/// Adds an item to the linked list.
+	/// </summary>
+	/// <param name="item">The item to add to the linked list.</param>
+	void ICollection<T>.Add(T item)
+	{
+		lock (SyncRoot)
+			((ICollection<T>)_inner).Add(item);
+	}
 
-		/// <summary>
-		/// Copies the elements of the linked list to an array, starting at a particular array index.
-		/// </summary>
-		/// <param name="array">The one-dimensional array that is the destination of the elements copied from the linked list.</param>
-		/// <param name="arrayIndex">The zero-based index in <paramref name="array"/> at which copying begins.</param>
-		public void CopyTo(T[] array, int arrayIndex)
-		{
-			lock (SyncRoot)
-				_inner.CopyTo(array, arrayIndex);
-		}
+	/// <summary>
+	/// Removes all nodes from the linked list.
+	/// </summary>
+	public void Clear()
+	{
+		lock (SyncRoot)
+			_inner.Clear();
+	}
 
-		/// <summary>
-		/// Removes the first occurrence of the specified value from the linked list.
-		/// </summary>
-		/// <param name="item">The value to remove from the linked list.</param>
-		/// <returns><c>true</c> if the value was successfully removed; otherwise, <c>false</c>.</returns>
-		public bool Remove(T item)
-		{
-			lock (SyncRoot)
-				return _inner.Remove(item);
-		}
+	/// <summary>
+	/// Determines whether the linked list contains the specified value.
+	/// </summary>
+	/// <param name="item">The value to locate in the linked list.</param>
+	/// <returns><c>true</c> if the value is found in the linked list; otherwise, <c>false</c>.</returns>
+	public bool Contains(T item)
+	{
+		lock (SyncRoot)
+			return _inner.Contains(item);
+	}
 
-		/// <summary>
-		/// Gets the number of nodes contained in the linked list.
-		/// </summary>
-		public int Count
+	/// <summary>
+	/// Copies the elements of the linked list to an array, starting at a particular array index.
+	/// </summary>
+	/// <param name="array">The one-dimensional array that is the destination of the elements copied from the linked list.</param>
+	/// <param name="arrayIndex">The zero-based index in <paramref name="array"/> at which copying begins.</param>
+	public void CopyTo(T[] array, int arrayIndex)
+	{
+		lock (SyncRoot)
+			_inner.CopyTo(array, arrayIndex);
+	}
+
+	/// <summary>
+	/// Removes the first occurrence of the specified value from the linked list.
+	/// </summary>
+	/// <param name="item">The value to remove from the linked list.</param>
+	/// <returns><c>true</c> if the value was successfully removed; otherwise, <c>false</c>.</returns>
+	public bool Remove(T item)
+	{
+		lock (SyncRoot)
+			return _inner.Remove(item);
+	}
+
+	/// <summary>
+	/// Gets the number of nodes contained in the linked list.
+	/// </summary>
+	public int Count
+	{
+		get
 		{
-			get
-			{
-				lock (SyncRoot)
-					return _inner.Count;
-			}
+			lock (SyncRoot)
+				return _inner.Count;
 		}
-
-		/// <summary>
-		/// Gets a value indicating whether the linked list is read-only.
-		/// </summary>
-		bool ICollection<T>.IsReadOnly => false;
 	}
+
+	/// <summary>
+	/// Gets a value indicating whether the linked list is read-only.
+	/// </summary>
+	bool ICollection<T>.IsReadOnly => false;
 }
\ No newline at end of file
diff --git a/Collections/SynchronizedList.cs b/Collections/SynchronizedList.cs
index 05595b83..d47d96c2 100644
--- a/Collections/SynchronizedList.cs
+++ b/Collections/SynchronizedList.cs
@@ -1,172 +1,171 @@
-namespace Ecng.Collections
+namespace Ecng.Collections;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using Ecng.Common;
+
+/// <summary>
+/// Represents a thread-safe list that supports range operations and notification events.
+/// </summary>
+/// <typeparam name="T">The type of elements in the list.</typeparam>
+[Serializable]
+public class SynchronizedList<T>(int capacity) : SynchronizedCollection<T, List<T>>(new List<T>(capacity)), INotifyListEx<T>
 {
-	using System;
-	using System.Collections.Generic;
-	using System.Linq;
+	/// <summary>
+	/// Initializes a new instance of the <see cref="SynchronizedList{T}"/> class with default capacity.
+	/// </summary>
+	public SynchronizedList()
+		: this(0)
+	{
+	}
 
-	using Ecng.Common;
+	/// <summary>
+	/// Retrieves an item at the specified index from the inner list.
+	/// </summary>
+	/// <param name="index">The zero-based index of the item to retrieve.</param>
+	/// <returns>The item at the specified index.</returns>
+	protected override T OnGetItem(int index)
+	{
+		return InnerCollection[index];
+	}
 
 	/// <summary>
-	/// Represents a thread-safe list that supports range operations and notification events.
+	/// Inserts an item into the inner list at the specified index.
 	/// </summary>
-	/// <typeparam name="T">The type of elements in the list.</typeparam>
-	[Serializable]
-	public class SynchronizedList<T>(int capacity) : SynchronizedCollection<T, List<T>>(new List<T>(capacity)), INotifyListEx<T>
+	/// <param name="index">The zero-based index at which to insert the item.</param>
+	/// <param name="item">The item to insert.</param>
+	protected override void OnInsert(int index, T item)
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="SynchronizedList{T}"/> class with default capacity.
-		/// </summary>
-		public SynchronizedList()
-			: this(0)
-		{
-		}
+		InnerCollection.Insert(index, item);
+	}
 
-		/// <summary>
-		/// Retrieves an item at the specified index from the inner list.
-		/// </summary>
-		/// <param name="index">The zero-based index of the item to retrieve.</param>
-		/// <returns>The item at the specified index.</returns>
-		protected override T OnGetItem(int index)
-		{
-			return InnerCollection[index];
-		}
+	/// <summary>
+	/// Removes an item from the inner list at the specified index.
+	/// </summary>
+	/// <param name="index">The zero-based index of the item to remove.</param>
+	protected override void OnRemoveAt(int index)
+	{
+		InnerCollection.RemoveAt(index);
+	}
 
-		/// <summary>
-		/// Inserts an item into the inner list at the specified index.
-		/// </summary>
-		/// <param name="index">The zero-based index at which to insert the item.</param>
-		/// <param name="item">The item to insert.</param>
-		protected override void OnInsert(int index, T item)
-		{
-			InnerCollection.Insert(index, item);
-		}
+	/// <summary>
+	/// Returns the index of the specified item in the inner list.
+	/// </summary>
+	/// <param name="item">The item to locate.</param>
+	/// <returns>The zero-based index of the item, or -1 if not found.</returns>
+	protected override int OnIndexOf(T item)
+	{
+		return InnerCollection.IndexOf(item);
+	}
 
-		/// <summary>
-		/// Removes an item from the inner list at the specified index.
-		/// </summary>
-		/// <param name="index">The zero-based index of the item to remove.</param>
-		protected override void OnRemoveAt(int index)
-		{
-			InnerCollection.RemoveAt(index);
-		}
+	/// <summary>
+	/// Occurs when a range of items is added to the list.
+	/// </summary>
+	public event Action<IEnumerable<T>> AddedRange;
 
-		/// <summary>
-		/// Returns the index of the specified item in the inner list.
-		/// </summary>
-		/// <param name="item">The item to locate.</param>
-		/// <returns>The zero-based index of the item, or -1 if not found.</returns>
-		protected override int OnIndexOf(T item)
-		{
-			return InnerCollection.IndexOf(item);
-		}
+	/// <summary>
+	/// Occurs when a range of items is removed from the list.
+	/// </summary>
+	public event Action<IEnumerable<T>> RemovedRange;
 
-		/// <summary>
-		/// Occurs when a range of items is added to the list.
-		/// </summary>
-		public event Action<IEnumerable<T>> AddedRange;
-
-		/// <summary>
-		/// Occurs when a range of items is removed from the list.
-		/// </summary>
-		public event Action<IEnumerable<T>> RemovedRange;
-
-		/// <summary>
-		/// Called after an item is added to the list, raising the <see cref="AddedRange"/> event.
-		/// </summary>
-		/// <param name="item">The item that was added.</param>
-		protected override void OnAdded(T item)
-		{
-			base.OnAdded(item);
+	/// <summary>
+	/// Called after an item is added to the list, raising the <see cref="AddedRange"/> event.
+	/// </summary>
+	/// <param name="item">The item that was added.</param>
+	protected override void OnAdded(T item)
+	{
+		base.OnAdded(item);
 
-			var evt = AddedRange;
-			evt?.Invoke([item]);
-		}
+		var evt = AddedRange;
+		evt?.Invoke([item]);
+	}
 
-		/// <summary>
-		/// Called after an item is removed from the list, raising the <see cref="RemovedRange"/> event.
-		/// </summary>
-		/// <param name="item">The item that was removed.</param>
-		protected override void OnRemoved(T item)
-		{
-			base.OnRemoved(item);
+	/// <summary>
+	/// Called after an item is removed from the list, raising the <see cref="RemovedRange"/> event.
+	/// </summary>
+	/// <param name="item">The item that was removed.</param>
+	protected override void OnRemoved(T item)
+	{
+		base.OnRemoved(item);
 
-			var evt = RemovedRange;
-			evt?.Invoke([item]);
-		}
+		var evt = RemovedRange;
+		evt?.Invoke([item]);
+	}
 
-		/// <summary>
-		/// Adds a range of items to the list in a thread-safe manner.
-		/// </summary>
-		/// <param name="items">The items to add.</param>
-		/// <exception cref="ArgumentNullException">Thrown when an item is null and <see cref="BaseCollection{TItem,TCollection}.CheckNullableItems"/> is true.</exception>
-		public void AddRange(IEnumerable<T> items)
+	/// <summary>
+	/// Adds a range of items to the list in a thread-safe manner.
+	/// </summary>
+	/// <param name="items">The items to add.</param>
+	/// <exception cref="ArgumentNullException">Thrown when an item is null and <see cref="BaseCollection{TItem,TCollection}.CheckNullableItems"/> is true.</exception>
+	public void AddRange(IEnumerable<T> items)
+	{
+		lock (SyncRoot)
 		{
-			lock (SyncRoot)
+			var filteredItems = items.Where(t =>
 			{
-				var filteredItems = items.Where(t =>
-				{
-					if (CheckNullableItems && t.IsNull())
-						throw new ArgumentNullException(nameof(t));
-
-					return OnAdding(t);
-				}).ToArray();
-				InnerCollection.AddRange(filteredItems);
-				filteredItems.ForEach(base.OnAdded);
-
-				AddedRange?.Invoke(filteredItems);
-			}
-		}
+				if (CheckNullableItems && t.IsNull())
+					throw new ArgumentNullException(nameof(t));
 
-		/// <summary>
-		/// Removes a range of items from the list in a thread-safe manner.
-		/// </summary>
-		/// <param name="items">The items to remove.</param>
-		public void RemoveRange(IEnumerable<T> items)
-		{
-			lock (SyncRoot)
-			{
-				var filteredItems = items.Where(OnRemoving).ToArray();
-				InnerCollection.RemoveRange(filteredItems);
-				filteredItems.ForEach(base.OnRemoved);
+				return OnAdding(t);
+			}).ToArray();
+			InnerCollection.AddRange(filteredItems);
+			filteredItems.ForEach(base.OnAdded);
 
-				RemovedRange?.Invoke(filteredItems);
-			}
+			AddedRange?.Invoke(filteredItems);
 		}
+	}
 
-		/// <summary>
-		/// Removes a range of items from the list starting at the specified index, in a thread-safe manner.
-		/// </summary>
-		/// <param name="index">The zero-based starting index of the range to remove.</param>
-		/// <param name="count">The number of items to remove.</param>
-		/// <returns>The number of items actually removed.</returns>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="index"/> is less than -1 or <paramref name="count"/> is less than or equal to zero.</exception>
-		public int RemoveRange(int index, int count)
+	/// <summary>
+	/// Removes a range of items from the list in a thread-safe manner.
+	/// </summary>
+	/// <param name="items">The items to remove.</param>
+	public void RemoveRange(IEnumerable<T> items)
+	{
+		lock (SyncRoot)
 		{
-			if (index < -1)
-				throw new ArgumentOutOfRangeException(nameof(index));
-
-			if (count <= 0)
-				throw new ArgumentOutOfRangeException(nameof(count));
+			var filteredItems = items.Where(OnRemoving).ToArray();
+			InnerCollection.RemoveRange(filteredItems);
+			filteredItems.ForEach(base.OnRemoved);
 
-			lock (SyncRoot)
-			{
-				var realCount = Count;
-				realCount -= index;
-				InnerCollection.RemoveRange(index, count);
-				return (realCount.Min(count)).Max(0);
-			}
+			RemovedRange?.Invoke(filteredItems);
 		}
+	}
 
-		/// <summary>
-		/// Retrieves a range of items from the list starting at the specified index, in a thread-safe manner.
-		/// </summary>
-		/// <param name="index">The zero-based starting index of the range to retrieve.</param>
-		/// <param name="count">The number of items to retrieve.</param>
-		/// <returns>An enumerable containing the specified range of items.</returns>
-		public IEnumerable<T> GetRange(int index, int count)
+	/// <summary>
+	/// Removes a range of items from the list starting at the specified index, in a thread-safe manner.
+	/// </summary>
+	/// <param name="index">The zero-based starting index of the range to remove.</param>
+	/// <param name="count">The number of items to remove.</param>
+	/// <returns>The number of items actually removed.</returns>
+	/// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="index"/> is less than -1 or <paramref name="count"/> is less than or equal to zero.</exception>
+	public int RemoveRange(int index, int count)
+	{
+		if (index < -1)
+			throw new ArgumentOutOfRangeException(nameof(index));
+
+		if (count <= 0)
+			throw new ArgumentOutOfRangeException(nameof(count));
+
+		lock (SyncRoot)
 		{
-			lock (SyncRoot)
-				return InnerCollection.GetRange(index, count);
+			var realCount = Count;
+			realCount -= index;
+			InnerCollection.RemoveRange(index, count);
+			return (realCount.Min(count)).Max(0);
 		}
 	}
+
+	/// <summary>
+	/// Retrieves a range of items from the list starting at the specified index, in a thread-safe manner.
+	/// </summary>
+	/// <param name="index">The zero-based starting index of the range to retrieve.</param>
+	/// <param name="count">The number of items to retrieve.</param>
+	/// <returns>An enumerable containing the specified range of items.</returns>
+	public IEnumerable<T> GetRange(int index, int count)
+	{
+		lock (SyncRoot)
+			return InnerCollection.GetRange(index, count);
+	}
 }
\ No newline at end of file
diff --git a/Collections/SynchronizedOrderedDictionary.cs b/Collections/SynchronizedOrderedDictionary.cs
index 8e994b8e..513552fd 100644
--- a/Collections/SynchronizedOrderedDictionary.cs
+++ b/Collections/SynchronizedOrderedDictionary.cs
@@ -1,37 +1,36 @@
-namespace Ecng.Collections
-{
-	using System;
-	using System.Collections.Generic;
+namespace Ecng.Collections;
+
+using System;
+using System.Collections.Generic;
 
+/// <summary>
+/// Provides a thread-safe dictionary with keys ordered by a specified comparer.
+/// </summary>
+public class SynchronizedOrderedDictionary<TKey, TValue> : SynchronizedDictionary<TKey, TValue>
+{
 	/// <summary>
-	/// Provides a thread-safe dictionary with keys ordered by a specified comparer.
+	/// Initializes a new instance of the <see cref="SynchronizedOrderedDictionary{TKey,TValue}"/> class using the default comparer.
 	/// </summary>
-	public class SynchronizedOrderedDictionary<TKey, TValue> : SynchronizedDictionary<TKey, TValue>
+	public SynchronizedOrderedDictionary()
+		: base(new SortedDictionary<TKey, TValue>())
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="SynchronizedOrderedDictionary{TKey,TValue}"/> class using the default comparer.
-		/// </summary>
-		public SynchronizedOrderedDictionary()
-			: base(new SortedDictionary<TKey, TValue>())
-		{
-		}
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="SynchronizedOrderedDictionary{TKey,TValue}"/> class using the specified comparer.
-		/// </summary>
-		/// <param name="comparer">The comparer used to sort the keys.</param>
-		public SynchronizedOrderedDictionary(IComparer<TKey> comparer)
-			: base(new SortedDictionary<TKey, TValue>(comparer))
-		{
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="SynchronizedOrderedDictionary{TKey,TValue}"/> class using the specified comparer.
+	/// </summary>
+	/// <param name="comparer">The comparer used to sort the keys.</param>
+	public SynchronizedOrderedDictionary(IComparer<TKey> comparer)
+		: base(new SortedDictionary<TKey, TValue>(comparer))
+	{
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="SynchronizedOrderedDictionary{TKey,TValue}"/> class using a custom comparison function.
-		/// </summary>
-		/// <param name="comparer">A function that compares two keys and returns an integer indicating their relative order.</param>
-		public SynchronizedOrderedDictionary(Func<TKey, TKey, int> comparer)
-			: this(comparer.ToComparer())
-		{
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="SynchronizedOrderedDictionary{TKey,TValue}"/> class using a custom comparison function.
+	/// </summary>
+	/// <param name="comparer">A function that compares two keys and returns an integer indicating their relative order.</param>
+	public SynchronizedOrderedDictionary(Func<TKey, TKey, int> comparer)
+		: this(comparer.ToComparer())
+	{
 	}
 }
\ No newline at end of file
diff --git a/Collections/SynchronizedPairSet.cs b/Collections/SynchronizedPairSet.cs
index 115db48b..bb8b3cbf 100644
--- a/Collections/SynchronizedPairSet.cs
+++ b/Collections/SynchronizedPairSet.cs
@@ -1,268 +1,267 @@
-namespace Ecng.Collections
+namespace Ecng.Collections;
+
+using System;
+using System.Collections.Generic;
+
+/// <summary>
+/// Represents a thread-safe collection that maintains key/value pairs and allows bidirectional lookups.
+/// </summary>
+[Serializable]
+public class SynchronizedPairSet<TKey, TValue> : SynchronizedKeyedCollection<TKey, TValue>
 {
-	using System;
-	using System.Collections.Generic;
+	#region Private Fields
+
+	private readonly Dictionary<TValue, TKey> _values;
+
+	#endregion
 
 	/// <summary>
-	/// Represents a thread-safe collection that maintains key/value pairs and allows bidirectional lookups.
+	/// Initializes a new instance of the <see cref="SynchronizedPairSet{TKey, TValue}"/> class.
 	/// </summary>
-	[Serializable]
-	public class SynchronizedPairSet<TKey, TValue> : SynchronizedKeyedCollection<TKey, TValue>
+	public SynchronizedPairSet()
 	{
-		#region Private Fields
-
-		private readonly Dictionary<TValue, TKey> _values;
+		_values = [];
+	}
 
-		#endregion
+	/// <summary>
+	/// Initializes a new instance of the <see cref="SynchronizedPairSet{TKey, TValue}"/> class with a specified comparer for keys.
+	/// </summary>
+	/// <param name="comparer">An equality comparer for keys.</param>
+	public SynchronizedPairSet(IEqualityComparer<TKey> comparer)
+		: base(comparer)
+	{
+		_values = [];
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="SynchronizedPairSet{TKey, TValue}"/> class.
-		/// </summary>
-		public SynchronizedPairSet()
-		{
-			_values = [];
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="SynchronizedPairSet{TKey, TValue}"/> class with specified comparers for keys and values.
+	/// </summary>
+	/// <param name="keyComparer">An equality comparer for keys.</param>
+	/// <param name="valueComparer">An equality comparer for values.</param>
+	public SynchronizedPairSet(IEqualityComparer<TKey> keyComparer, IEqualityComparer<TValue> valueComparer)
+		: base(keyComparer)
+	{
+		_values = new Dictionary<TValue, TKey>(valueComparer);
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="SynchronizedPairSet{TKey, TValue}"/> class with a specified comparer for keys.
-		/// </summary>
-		/// <param name="comparer">An equality comparer for keys.</param>
-		public SynchronizedPairSet(IEqualityComparer<TKey> comparer)
-			: base(comparer)
-		{
-			_values = [];
-		}
+	/// <summary>
+	/// Adds the specified key and value to the collection.
+	/// </summary>
+	/// <param name="key">The key to insert.</param>
+	/// <param name="value">The value to insert.</param>
+	public override void Add(TKey key, TValue value)
+	{
+		lock (SyncRoot)
+			base.Add(key, value);
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="SynchronizedPairSet{TKey, TValue}"/> class with specified comparers for keys and values.
-		/// </summary>
-		/// <param name="keyComparer">An equality comparer for keys.</param>
-		/// <param name="valueComparer">An equality comparer for values.</param>
-		public SynchronizedPairSet(IEqualityComparer<TKey> keyComparer, IEqualityComparer<TValue> valueComparer)
-			: base(keyComparer)
-		{
-			_values = new Dictionary<TValue, TKey>(valueComparer);
-		}
+	#region Item
 
-		/// <summary>
-		/// Adds the specified key and value to the collection.
-		/// </summary>
-		/// <param name="key">The key to insert.</param>
-		/// <param name="value">The value to insert.</param>
-		public override void Add(TKey key, TValue value)
+	/// <summary>
+	/// Gets the key associated with the specified value.
+	/// </summary>
+	/// <param name="value">The value for which to retrieve the key.</param>
+	/// <returns>The key corresponding to the specified value.</returns>
+	public TKey this[TValue value]
+	{
+		get
 		{
 			lock (SyncRoot)
-				base.Add(key, value);
-		}
-
-		#region Item
-
-		/// <summary>
-		/// Gets the key associated with the specified value.
-		/// </summary>
-		/// <param name="value">The value for which to retrieve the key.</param>
-		/// <returns>The key corresponding to the specified value.</returns>
-		public TKey this[TValue value]
-		{
-			get
-			{
-				lock (SyncRoot)
-					return _values[value];
-			}
+				return _values[value];
 		}
+	}
 
-		#endregion
+	#endregion
 
-		#region GetKey
+	#region GetKey
 
-		/// <summary>
-		/// Retrieves the key associated with the specified value.
-		/// </summary>
-		/// <param name="value">The value whose key is requested.</param>
-		/// <returns>The key associated with the given value.</returns>
-		public TKey GetKey(TValue value)
-		{
-			return this[value];
-		}
+	/// <summary>
+	/// Retrieves the key associated with the specified value.
+	/// </summary>
+	/// <param name="value">The value whose key is requested.</param>
+	/// <returns>The key associated with the given value.</returns>
+	public TKey GetKey(TValue value)
+	{
+		return this[value];
+	}
 
-		#endregion
+	#endregion
 
-		#region GetValue
+	#region GetValue
 
-		/// <summary>
-		/// Retrieves the value associated with the specified key.
-		/// </summary>
-		/// <param name="key">The key whose value is requested.</param>
-		/// <returns>The value associated with the given key.</returns>
-		public TValue GetValue(TKey key)
-		{
-			return base[key];
-		}
+	/// <summary>
+	/// Retrieves the value associated with the specified key.
+	/// </summary>
+	/// <param name="key">The key whose value is requested.</param>
+	/// <returns>The value associated with the given key.</returns>
+	public TValue GetValue(TKey key)
+	{
+		return base[key];
+	}
 
-		#endregion
+	#endregion
 
-		/// <summary>
-		/// Removes the old pair for the specified key and adds the new key/value pair. Raises an event when setting.
-		/// </summary>
-		/// <param name="key">The key to set.</param>
-		/// <param name="value">The value to associate with the key.</param>
-		public void SetKey(TKey key, TValue value)
+	/// <summary>
+	/// Removes the old pair for the specified key and adds the new key/value pair. Raises an event when setting.
+	/// </summary>
+	/// <param name="key">The key to set.</param>
+	/// <param name="value">The value to associate with the key.</param>
+	public void SetKey(TKey key, TValue value)
+	{
+		lock (SyncRoot)
 		{
-			lock (SyncRoot)
-			{
-				Remove(key);
+			Remove(key);
 
-				Add(key, value);
-				OnSetting(key, value);
-			}
+			Add(key, value);
+			OnSetting(key, value);
 		}
+	}
 
-		#region SetValue
+	#region SetValue
 
-		/// <summary>
-		/// Updates the value associated with a key.
-		/// </summary>
-		/// <param name="key">The key to update.</param>
-		/// <param name="value">The new value.</param>
-		public void SetValue(TKey key, TValue value)
-		{
-			lock (SyncRoot)
-				this[key] = value;
-		}
+	/// <summary>
+	/// Updates the value associated with a key.
+	/// </summary>
+	/// <param name="key">The key to update.</param>
+	/// <param name="value">The new value.</param>
+	public void SetValue(TKey key, TValue value)
+	{
+		lock (SyncRoot)
+			this[key] = value;
+	}
 
-		#endregion
+	#endregion
 
-		/// <summary>
-		/// Determines whether a key/value pair can be added based on whether the value is already present.
-		/// </summary>
-		/// <param name="key">The key to be added.</param>
-		/// <param name="value">The value to be added.</param>
-		/// <returns><c>true</c> if the value is not already contained; otherwise <c>false</c>.</returns>
-		protected override bool CanAdd(TKey key, TValue value)
-		{
-			return !_values.ContainsKey(value);
-		}
+	/// <summary>
+	/// Determines whether a key/value pair can be added based on whether the value is already present.
+	/// </summary>
+	/// <param name="key">The key to be added.</param>
+	/// <param name="value">The value to be added.</param>
+	/// <returns><c>true</c> if the value is not already contained; otherwise <c>false</c>.</returns>
+	protected override bool CanAdd(TKey key, TValue value)
+	{
+		return !_values.ContainsKey(value);
+	}
 
-		#region SynchronizedKeyedCollection<TKey, TValue> Members
+	#region SynchronizedKeyedCollection<TKey, TValue> Members
 
-		/// <summary>
-		/// Called when an item is being added. Adds the value/key mapping to the internal dictionary.
-		/// </summary>
-		/// <param name="key">The key being added.</param>
-		/// <param name="value">The value being added.</param>
-		protected override void OnAdding(TKey key, TValue value)
-		{
-			_values.Add(value, key);
-		}
+	/// <summary>
+	/// Called when an item is being added. Adds the value/key mapping to the internal dictionary.
+	/// </summary>
+	/// <param name="key">The key being added.</param>
+	/// <param name="value">The value being added.</param>
+	protected override void OnAdding(TKey key, TValue value)
+	{
+		_values.Add(value, key);
+	}
 
-		/// <summary>
-		/// Called when an existing item is being set. Updates the value/key mapping in the internal dictionary.
-		/// </summary>
-		/// <param name="key">The key being set.</param>
-		/// <param name="value">The value being set.</param>
-		protected override void OnSetting(TKey key, TValue value)
-		{
-			_values[value] = key;
-		}
+	/// <summary>
+	/// Called when an existing item is being set. Updates the value/key mapping in the internal dictionary.
+	/// </summary>
+	/// <param name="key">The key being set.</param>
+	/// <param name="value">The value being set.</param>
+	protected override void OnSetting(TKey key, TValue value)
+	{
+		_values[value] = key;
+	}
 
-		/// <summary>
-		/// Called when the collection is being cleared. Clears the internal dictionary.
-		/// </summary>
-		protected override void OnClearing()
-		{
-			_values.Clear();
-		}
+	/// <summary>
+	/// Called when the collection is being cleared. Clears the internal dictionary.
+	/// </summary>
+	protected override void OnClearing()
+	{
+		_values.Clear();
+	}
 
-		/// <summary>
-		/// Called when an item is being removed. Removes the value/key mapping from the internal dictionary.
-		/// </summary>
-		/// <param name="key">The key being removed.</param>
-		/// <param name="value">The value being removed.</param>
-		protected override void OnRemoving(TKey key, TValue value)
-		{
-			_values.Remove(value);
-		}
+	/// <summary>
+	/// Called when an item is being removed. Removes the value/key mapping from the internal dictionary.
+	/// </summary>
+	/// <param name="key">The key being removed.</param>
+	/// <param name="value">The value being removed.</param>
+	protected override void OnRemoving(TKey key, TValue value)
+	{
+		_values.Remove(value);
+	}
 
-		#endregion
+	#endregion
 
-		/// <summary>
-		/// Attempts to add a new key/value pair if neither key nor value is already present.
-		/// </summary>
-		/// <param name="key">The key to add.</param>
-		/// <param name="value">The value to add.</param>
-		/// <returns><c>true</c> if the pair was added; otherwise <c>false</c>.</returns>
-		public bool TryAdd(TKey key, TValue value)
+	/// <summary>
+	/// Attempts to add a new key/value pair if neither key nor value is already present.
+	/// </summary>
+	/// <param name="key">The key to add.</param>
+	/// <param name="value">The value to add.</param>
+	/// <returns><c>true</c> if the pair was added; otherwise <c>false</c>.</returns>
+	public bool TryAdd(TKey key, TValue value)
+	{
+		lock (SyncRoot)
 		{
-			lock (SyncRoot)
-			{
-				if (ContainsKey(key) || _values.ContainsKey(value))
-					return false;
+			if (ContainsKey(key) || _values.ContainsKey(value))
+				return false;
 
-				Add(key, value);
-				return true;
-			}
+			Add(key, value);
+			return true;
 		}
+	}
 
-		/// <summary>
-		/// Attempts to get a key for the specified value.
-		/// </summary>
-		/// <param name="value">The value whose key is requested.</param>
-		/// <returns>The key if found; otherwise the default.</returns>
-		public TKey TryGetKey(TValue value)
-		{
-			lock (SyncRoot)
-				return _values.TryGetValue(value);
-		}
+	/// <summary>
+	/// Attempts to get a key for the specified value.
+	/// </summary>
+	/// <param name="value">The value whose key is requested.</param>
+	/// <returns>The key if found; otherwise the default.</returns>
+	public TKey TryGetKey(TValue value)
+	{
+		lock (SyncRoot)
+			return _values.TryGetValue(value);
+	}
 
-		/// <summary>
-		/// Attempts to get a key for the specified value, returning a boolean indicating success.
-		/// </summary>
-		/// <param name="value">The value whose key is requested.</param>
-		/// <param name="key">When this method returns, contains the key if found.</param>
-		/// <returns><c>true</c> if the key was found; otherwise <c>false</c>.</returns>
-		public bool TryGetKey(TValue value, out TKey key)
-		{
-			lock (SyncRoot)
-				return _values.TryGetValue(value, out key);
-		}
+	/// <summary>
+	/// Attempts to get a key for the specified value, returning a boolean indicating success.
+	/// </summary>
+	/// <param name="value">The value whose key is requested.</param>
+	/// <param name="key">When this method returns, contains the key if found.</param>
+	/// <returns><c>true</c> if the key was found; otherwise <c>false</c>.</returns>
+	public bool TryGetKey(TValue value, out TKey key)
+	{
+		lock (SyncRoot)
+			return _values.TryGetValue(value, out key);
+	}
 
-		/// <summary>
-		/// Attempts to get and remove the key associated with the specified value.
-		/// </summary>
-		/// <param name="value">The value for which to retrieve and remove the key.</param>
-		/// <param name="key">When this method returns, contains the removed key if found.</param>
-		/// <returns><c>true</c> if the key was removed successfully; otherwise <c>false</c>.</returns>
-		public bool TryGetKeyAndRemove(TValue value, out TKey key)
+	/// <summary>
+	/// Attempts to get and remove the key associated with the specified value.
+	/// </summary>
+	/// <param name="value">The value for which to retrieve and remove the key.</param>
+	/// <param name="key">When this method returns, contains the removed key if found.</param>
+	/// <returns><c>true</c> if the key was removed successfully; otherwise <c>false</c>.</returns>
+	public bool TryGetKeyAndRemove(TValue value, out TKey key)
+	{
+		lock (SyncRoot)
 		{
-			lock (SyncRoot)
-			{
-				if (!_values.TryGetAndRemove(value, out key))
-					return false;
+			if (!_values.TryGetAndRemove(value, out key))
+				return false;
 
-				return base.Remove(key);
-			}
+			return base.Remove(key);
 		}
+	}
 
-		/// <summary>
-		/// Removes the element with the specified value if it is found.
-		/// </summary>
-		/// <param name="value">The value to remove.</param>
-		/// <returns><c>true</c> if the item was removed; otherwise <c>false</c>.</returns>
-		public bool RemoveByValue(TValue value)
-		{
-			lock (SyncRoot)
-				return _values.ContainsKey(value) && Remove(_values[value]);
-		}
+	/// <summary>
+	/// Removes the element with the specified value if it is found.
+	/// </summary>
+	/// <param name="value">The value to remove.</param>
+	/// <returns><c>true</c> if the item was removed; otherwise <c>false</c>.</returns>
+	public bool RemoveByValue(TValue value)
+	{
+		lock (SyncRoot)
+			return _values.ContainsKey(value) && Remove(_values[value]);
+	}
 
-		/// <summary>
-		/// Determines whether the collection contains an entry with the specified value.
-		/// </summary>
-		/// <param name="value">The value to locate.</param>
-		/// <returns><c>true</c> if the value is found; otherwise <c>false</c>.</returns>
-		public bool ContainsValue(TValue value)
-		{
-			lock (SyncRoot)
-				return _values.ContainsKey(value);
-		}
+	/// <summary>
+	/// Determines whether the collection contains an entry with the specified value.
+	/// </summary>
+	/// <param name="value">The value to locate.</param>
+	/// <returns><c>true</c> if the value is found; otherwise <c>false</c>.</returns>
+	public bool ContainsValue(TValue value)
+	{
+		lock (SyncRoot)
+			return _values.ContainsKey(value);
 	}
 }
\ No newline at end of file
diff --git a/Collections/SynchronizedQueue.cs b/Collections/SynchronizedQueue.cs
index bc1a52a9..79eb38ab 100644
--- a/Collections/SynchronizedQueue.cs
+++ b/Collections/SynchronizedQueue.cs
@@ -1,93 +1,92 @@
-namespace Ecng.Collections
-{
-	using System;
+namespace Ecng.Collections;
+
+using System;
 
+/// <summary>
+/// Provides a thread-safe queue based on the <see cref="QueueEx{T}"/> collection.
+/// </summary>
+/// <typeparam name="T">The type of elements in the queue.</typeparam>
+[Serializable]
+public class SynchronizedQueue<T> : SynchronizedCollection<T, QueueEx<T>>
+{
 	/// <summary>
-	/// Provides a thread-safe queue based on the <see cref="QueueEx{T}"/> collection.
+	/// Initializes a new instance of the <see cref="SynchronizedQueue{T}"/> class.
 	/// </summary>
-	/// <typeparam name="T">The type of elements in the queue.</typeparam>
-	[Serializable]
-	public class SynchronizedQueue<T> : SynchronizedCollection<T, QueueEx<T>>
+	public SynchronizedQueue()
+		: base(new QueueEx<T>())
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="SynchronizedQueue{T}"/> class.
-		/// </summary>
-		public SynchronizedQueue()
-			: base(new QueueEx<T>())
-		{
-		}
+	}
 
-		/// <summary>
-		/// Adds an item to the queue in a thread-safe manner.
-		/// </summary>
-		/// <param name="item">The item to enqueue.</param>
-		public void Enqueue(T item)
-		{
-			lock (SyncRoot)
-				InnerCollection.Enqueue(item);
-		}
+	/// <summary>
+	/// Adds an item to the queue in a thread-safe manner.
+	/// </summary>
+	/// <param name="item">The item to enqueue.</param>
+	public void Enqueue(T item)
+	{
+		lock (SyncRoot)
+			InnerCollection.Enqueue(item);
+	}
 
-		/// <summary>
-		/// Removes and returns the item at the beginning of the queue in a thread-safe manner.
-		/// </summary>
-		/// <returns>The item that was removed from the queue.</returns>
-		public T Dequeue()
-		{
-			lock (SyncRoot)
-				return InnerCollection.Dequeue();
-		}
+	/// <summary>
+	/// Removes and returns the item at the beginning of the queue in a thread-safe manner.
+	/// </summary>
+	/// <returns>The item that was removed from the queue.</returns>
+	public T Dequeue()
+	{
+		lock (SyncRoot)
+			return InnerCollection.Dequeue();
+	}
 
-		/// <summary>
-		/// Returns the item at the beginning of the queue without removing it, in a thread-safe manner.
-		/// </summary>
-		/// <returns>The item at the beginning of the queue.</returns>
-		public T Peek()
-		{
-			lock (SyncRoot)
-				return InnerCollection.Peek();
-		}
+	/// <summary>
+	/// Returns the item at the beginning of the queue without removing it, in a thread-safe manner.
+	/// </summary>
+	/// <returns>The item at the beginning of the queue.</returns>
+	public T Peek()
+	{
+		lock (SyncRoot)
+			return InnerCollection.Peek();
+	}
 
-		/// <summary>
-		/// Throws a <see cref="NotSupportedException"/> as this operation is not supported for a queue.
-		/// </summary>
-		/// <param name="index">The index of the item to retrieve.</param>
-		/// <returns>This method always throws an exception.</returns>
-		/// <exception cref="NotSupportedException">This operation is not supported for a queue.</exception>
-		protected override T OnGetItem(int index)
-		{
-			throw new NotSupportedException();
-		}
+	/// <summary>
+	/// Throws a <see cref="NotSupportedException"/> as this operation is not supported for a queue.
+	/// </summary>
+	/// <param name="index">The index of the item to retrieve.</param>
+	/// <returns>This method always throws an exception.</returns>
+	/// <exception cref="NotSupportedException">This operation is not supported for a queue.</exception>
+	protected override T OnGetItem(int index)
+	{
+		throw new NotSupportedException();
+	}
 
-		/// <summary>
-		/// Throws a <see cref="NotSupportedException"/> as this operation is not supported for a queue.
-		/// </summary>
-		/// <param name="index">The index at which the item should be inserted.</param>
-		/// <param name="item">The item to insert.</param>
-		/// <exception cref="NotSupportedException">This operation is not supported for a queue.</exception>
-		protected override void OnInsert(int index, T item)
-		{
-			throw new NotSupportedException();
-		}
+	/// <summary>
+	/// Throws a <see cref="NotSupportedException"/> as this operation is not supported for a queue.
+	/// </summary>
+	/// <param name="index">The index at which the item should be inserted.</param>
+	/// <param name="item">The item to insert.</param>
+	/// <exception cref="NotSupportedException">This operation is not supported for a queue.</exception>
+	protected override void OnInsert(int index, T item)
+	{
+		throw new NotSupportedException();
+	}
 
-		/// <summary>
-		/// Throws a <see cref="NotSupportedException"/> as this operation is not supported for a queue.
-		/// </summary>
-		/// <param name="index">The index of the item to remove.</param>
-		/// <exception cref="NotSupportedException">This operation is not supported for a queue.</exception>
-		protected override void OnRemoveAt(int index)
-		{
-			throw new NotSupportedException();
-		}
+	/// <summary>
+	/// Throws a <see cref="NotSupportedException"/> as this operation is not supported for a queue.
+	/// </summary>
+	/// <param name="index">The index of the item to remove.</param>
+	/// <exception cref="NotSupportedException">This operation is not supported for a queue.</exception>
+	protected override void OnRemoveAt(int index)
+	{
+		throw new NotSupportedException();
+	}
 
-		/// <summary>
-		/// Throws a <see cref="NotSupportedException"/> as this operation is not supported for a queue.
-		/// </summary>
-		/// <param name="item">The item to locate in the queue.</param>
-		/// <returns>This method always throws an exception.</returns>
-		/// <exception cref="NotSupportedException">This operation is not supported for a queue.</exception>
-		protected override int OnIndexOf(T item)
-		{
-			throw new NotSupportedException();
-		}
+	/// <summary>
+	/// Throws a <see cref="NotSupportedException"/> as this operation is not supported for a queue.
+	/// </summary>
+	/// <param name="item">The item to locate in the queue.</param>
+	/// <returns>This method always throws an exception.</returns>
+	/// <exception cref="NotSupportedException">This operation is not supported for a queue.</exception>
+	protected override int OnIndexOf(T item)
+	{
+		throw new NotSupportedException();
 	}
 }
\ No newline at end of file
diff --git a/Collections/SynchronizedSet.cs b/Collections/SynchronizedSet.cs
index 6449c070..fba3e93c 100644
--- a/Collections/SynchronizedSet.cs
+++ b/Collections/SynchronizedSet.cs
@@ -1,466 +1,465 @@
-namespace Ecng.Collections
-{
-	using System;
-	using System.Collections.Generic;
-	using System.Linq;
+namespace Ecng.Collections;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
-	using Ecng.Common;
+using Ecng.Common;
+
+/// <summary>
+/// Represents a thread-safe set that supports optional indexing and range-based operations.
+/// </summary>
+/// <typeparam name="T">The element type.</typeparam>
+[Serializable]
+public class SynchronizedSet<T> : SynchronizedCollection<T, ISet<T>>, ISet<T>, ICollectionEx<T>
+{
+	private readonly PairSet<int, T> _indecies;
+	private int _maxIndex = -1;
+	private bool _raiseRangeEvents = true;
 
 	/// <summary>
-	/// Represents a thread-safe set that supports optional indexing and range-based operations.
+	/// Initializes a new instance of the <see cref="SynchronizedSet{T}"/> class.
 	/// </summary>
-	/// <typeparam name="T">The element type.</typeparam>
-	[Serializable]
-	public class SynchronizedSet<T> : SynchronizedCollection<T, ISet<T>>, ISet<T>, ICollectionEx<T>
-	{
-		private readonly PairSet<int, T> _indecies;
-		private int _maxIndex = -1;
-		private bool _raiseRangeEvents = true;
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="SynchronizedSet{T}"/> class.
-		/// </summary>
-		public SynchronizedSet()
-			: this(false)
-		{
-		}
+	public SynchronizedSet()
+		: this(false)
+	{
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="SynchronizedSet{T}"/> class with an option to enable indexing.
-		/// </summary>
-		/// <param name="allowIndexing">True to enable indexing; otherwise, false.</param>
-		public SynchronizedSet(bool allowIndexing)
-			: this(allowIndexing, EqualityComparer<T>.Default)
-		{
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="SynchronizedSet{T}"/> class with an option to enable indexing.
+	/// </summary>
+	/// <param name="allowIndexing">True to enable indexing; otherwise, false.</param>
+	public SynchronizedSet(bool allowIndexing)
+		: this(allowIndexing, EqualityComparer<T>.Default)
+	{
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="SynchronizedSet{T}"/> class with a specified comparer.
-		/// </summary>
-		/// <param name="comparer">The comparer to use for comparing elements.</param>
-		public SynchronizedSet(IEqualityComparer<T> comparer)
-			: this(false, comparer)
-		{
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="SynchronizedSet{T}"/> class with a specified comparer.
+	/// </summary>
+	/// <param name="comparer">The comparer to use for comparing elements.</param>
+	public SynchronizedSet(IEqualityComparer<T> comparer)
+		: this(false, comparer)
+	{
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="SynchronizedSet{T}"/> class with indexing and a custom comparer.
-		/// </summary>
-		/// <param name="allowIndexing">True to enable indexing; otherwise, false.</param>
-		/// <param name="comparer">The comparer to use for comparing elements.</param>
-		public SynchronizedSet(bool allowIndexing, IEqualityComparer<T> comparer)
-			: this(allowIndexing, new HashSet<T>(comparer))
-		{
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="SynchronizedSet{T}"/> class with indexing and a custom comparer.
+	/// </summary>
+	/// <param name="allowIndexing">True to enable indexing; otherwise, false.</param>
+	/// <param name="comparer">The comparer to use for comparing elements.</param>
+	public SynchronizedSet(bool allowIndexing, IEqualityComparer<T> comparer)
+		: this(allowIndexing, new HashSet<T>(comparer))
+	{
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="SynchronizedSet{T}"/> class from an existing collection.
-		/// </summary>
-		/// <param name="collection">The collection whose elements are copied to the new set.</param>
-		public SynchronizedSet(IEnumerable<T> collection)
-			: this(collection, EqualityComparer<T>.Default)
-		{
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="SynchronizedSet{T}"/> class from an existing collection.
+	/// </summary>
+	/// <param name="collection">The collection whose elements are copied to the new set.</param>
+	public SynchronizedSet(IEnumerable<T> collection)
+		: this(collection, EqualityComparer<T>.Default)
+	{
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="SynchronizedSet{T}"/> class from an existing collection and comparer.
-		/// </summary>
-		/// <param name="collection">The collection whose elements are copied to the new set.</param>
-		/// <param name="comparer">The comparer to use for comparing elements.</param>
-		public SynchronizedSet(IEnumerable<T> collection, IEqualityComparer<T> comparer)
-			: this(false, collection, comparer)
-		{
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="SynchronizedSet{T}"/> class from an existing collection and comparer.
+	/// </summary>
+	/// <param name="collection">The collection whose elements are copied to the new set.</param>
+	/// <param name="comparer">The comparer to use for comparing elements.</param>
+	public SynchronizedSet(IEnumerable<T> collection, IEqualityComparer<T> comparer)
+		: this(false, collection, comparer)
+	{
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="SynchronizedSet{T}"/> class with control over indexing, an existing collection, and comparer.
-		/// </summary>
-		/// <param name="allowIndexing">True to enable indexing; otherwise, false.</param>
-		/// <param name="collection">The collection whose elements are copied to the new set.</param>
-		/// <param name="comparer">The comparer to use for comparing elements.</param>
-		public SynchronizedSet(bool allowIndexing, IEnumerable<T> collection, IEqualityComparer<T> comparer)
-			: this(allowIndexing, new HashSet<T>(collection, comparer))
-		{
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="SynchronizedSet{T}"/> class with control over indexing, an existing collection, and comparer.
+	/// </summary>
+	/// <param name="allowIndexing">True to enable indexing; otherwise, false.</param>
+	/// <param name="collection">The collection whose elements are copied to the new set.</param>
+	/// <param name="comparer">The comparer to use for comparing elements.</param>
+	public SynchronizedSet(bool allowIndexing, IEnumerable<T> collection, IEqualityComparer<T> comparer)
+		: this(allowIndexing, new HashSet<T>(collection, comparer))
+	{
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="SynchronizedSet{T}"/> class using the specified set as the inner collection.
-		/// </summary>
-		/// <param name="allowIndexing">True to enable indexing; otherwise, false.</param>
-		/// <param name="innerCollection">The inner set for the synchronized collection.</param>
-		protected SynchronizedSet(bool allowIndexing, ISet<T> innerCollection)
-			: base(innerCollection)
-		{
-			if (allowIndexing)
-				_indecies = [];
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="SynchronizedSet{T}"/> class using the specified set as the inner collection.
+	/// </summary>
+	/// <param name="allowIndexing">True to enable indexing; otherwise, false.</param>
+	/// <param name="innerCollection">The inner set for the synchronized collection.</param>
+	protected SynchronizedSet(bool allowIndexing, ISet<T> innerCollection)
+		: base(innerCollection)
+	{
+		if (allowIndexing)
+			_indecies = [];
+	}
 
-		/// <summary>
-		/// Gets or sets a value indicating whether an exception is thrown when adding a duplicate element.
-		/// </summary>
-		public bool ThrowIfDuplicate { get; set; }
+	/// <summary>
+	/// Gets or sets a value indicating whether an exception is thrown when adding a duplicate element.
+	/// </summary>
+	public bool ThrowIfDuplicate { get; set; }
 
-		private void Duplicate()
-		{
-			if (ThrowIfDuplicate)
-				throw new InvalidOperationException("Duplicate element.");
-		}
+	private void Duplicate()
+	{
+		if (ThrowIfDuplicate)
+			throw new InvalidOperationException("Duplicate element.");
+	}
 
-		private void CheckIndexingEnabled()
-		{
-			if (_indecies is null)
-				throw new InvalidOperationException("Indexing not switched on.");
-		}
+	private void CheckIndexingEnabled()
+	{
+		if (_indecies is null)
+			throw new InvalidOperationException("Indexing not switched on.");
+	}
 
-		private void AddIndicies(T item)
-		{
-			if (_indecies is null)
-				return;
+	private void AddIndicies(T item)
+	{
+		if (_indecies is null)
+			return;
 
-			_maxIndex = Count - 1;
-			_indecies.Add(_maxIndex, item);
-		}
+		_maxIndex = Count - 1;
+		_indecies.Add(_maxIndex, item);
+	}
 
-		private bool RemoveIndicies(T item)
-		{
-			if (_indecies is null)
-				return true;
+	private bool RemoveIndicies(T item)
+	{
+		if (_indecies is null)
+			return true;
 
-			if (_maxIndex == -1)
-				throw new InvalidOperationException();
+		if (_maxIndex == -1)
+			throw new InvalidOperationException();
 
-			var index = _indecies.GetKey(item);
-			_indecies.RemoveByValue(item);
+		var index = _indecies.GetKey(item);
+		_indecies.RemoveByValue(item);
 
-			for (var i = index + 1; i <= _maxIndex; i++)
-			{
-				_indecies.SetKey(_indecies[i], i - 1);
-			}
+		for (var i = index + 1; i <= _maxIndex; i++)
+		{
+			_indecies.SetKey(_indecies[i], i - 1);
+		}
 
-			_maxIndex--;
+		_maxIndex--;
 
-			return true;
-		}
+		return true;
+	}
 
-		/// <inheritdoc/>
-		protected override bool OnAdding(T item)
+	/// <inheritdoc/>
+	protected override bool OnAdding(T item)
+	{
+		if (InnerCollection.Contains(item))
 		{
-			if (InnerCollection.Contains(item))
-			{
-				Duplicate();
-				return false;
-			}
-
-			return base.OnAdding(item);
+			Duplicate();
+			return false;
 		}
 
-		/// <inheritdoc/>
-		protected override T OnGetItem(int index)
-		{
-			CheckIndexingEnabled();
+		return base.OnAdding(item);
+	}
 
-			return _indecies[index];
-		}
+	/// <inheritdoc/>
+	protected override T OnGetItem(int index)
+	{
+		CheckIndexingEnabled();
 
-		/// <inheritdoc/>
-		protected override void OnInsert(int index, T item)
-		{
-			if (!InnerCollection.Add(item))
-				return;
+		return _indecies[index];
+	}
 
-			if (_indecies is null)
-				return;
+	/// <inheritdoc/>
+	protected override void OnInsert(int index, T item)
+	{
+		if (!InnerCollection.Add(item))
+			return;
 
-			if (_maxIndex == -1)
-				throw new InvalidOperationException();
+		if (_indecies is null)
+			return;
 
-			for (var i = _maxIndex; i >= index; i--)
-				_indecies.SetKey(_indecies[i], i + 1);
+		if (_maxIndex == -1)
+			throw new InvalidOperationException();
 
-			_indecies[index] = item;
-			_maxIndex++;
-		}
+		for (var i = _maxIndex; i >= index; i--)
+			_indecies.SetKey(_indecies[i], i + 1);
 
-		/// <inheritdoc/>
-		protected override void OnRemoveAt(int index)
-		{
-			CheckIndexingEnabled();
+		_indecies[index] = item;
+		_maxIndex++;
+	}
 
-			if (_indecies.ContainsKey(index))
-				Remove(_indecies.GetValue(index));
-		}
+	/// <inheritdoc/>
+	protected override void OnRemoveAt(int index)
+	{
+		CheckIndexingEnabled();
 
-		/// <inheritdoc/>
-		protected override void OnAdd(T item)
-		{
-			if (!InnerCollection.Add(item))
-				return;
+		if (_indecies.ContainsKey(index))
+			Remove(_indecies.GetValue(index));
+	}
 
-			AddIndicies(item);
-		}
+	/// <inheritdoc/>
+	protected override void OnAdd(T item)
+	{
+		if (!InnerCollection.Add(item))
+			return;
 
-		/// <inheritdoc/>
-		protected override bool OnRemove(T item)
-		{
-			if (!base.OnRemove(item))
-				return false;
+		AddIndicies(item);
+	}
 
-			return RemoveIndicies(item);
-		}
+	/// <inheritdoc/>
+	protected override bool OnRemove(T item)
+	{
+		if (!base.OnRemove(item))
+			return false;
 
-		/// <inheritdoc/>
-		protected override void OnClear()
-		{
-			base.OnClear();
+		return RemoveIndicies(item);
+	}
 
-			_indecies?.Clear();
-			_maxIndex = -1;
-		}
+	/// <inheritdoc/>
+	protected override void OnClear()
+	{
+		base.OnClear();
 
-		/// <inheritdoc/>
-		protected override int OnIndexOf(T item)
-		{
-			CheckIndexingEnabled();
+		_indecies?.Clear();
+		_maxIndex = -1;
+	}
 
-			return _indecies.GetKey(item);
-		}
+	/// <inheritdoc/>
+	protected override int OnIndexOf(T item)
+	{
+		CheckIndexingEnabled();
 
-		#region Implementation of ISet<T>
+		return _indecies.GetKey(item);
+	}
 
-		/// <summary>
-		/// Modifies the current set so that it contains all elements that are present in both the current set and in the specified collection.
-		/// </summary>
-		/// <param name="other">The collection to compare to the current set.</param>
-		public void UnionWith(IEnumerable<T> other)
-		{
-			AddRange(other);
-		}
+	#region Implementation of ISet<T>
 
-		/// <summary>
-		/// Modifies the current set so that it contains only elements that are also in a specified collection.
-		/// </summary>
-		/// <param name="other">The collection to compare to the current set.</param>
-		public void IntersectWith(IEnumerable<T> other)
-		{
-			throw new NotImplementedException();
-		}
+	/// <summary>
+	/// Modifies the current set so that it contains all elements that are present in both the current set and in the specified collection.
+	/// </summary>
+	/// <param name="other">The collection to compare to the current set.</param>
+	public void UnionWith(IEnumerable<T> other)
+	{
+		AddRange(other);
+	}
 
-		/// <summary>
-		/// Removes all elements in the specified collection from the current set.
-		/// </summary>
-		/// <param name="other">The collection of items to remove from the set.</param>
-		public void ExceptWith(IEnumerable<T> other)
-		{
-			RemoveRange(other);
-		}
+	/// <summary>
+	/// Modifies the current set so that it contains only elements that are also in a specified collection.
+	/// </summary>
+	/// <param name="other">The collection to compare to the current set.</param>
+	public void IntersectWith(IEnumerable<T> other)
+	{
+		throw new NotImplementedException();
+	}
 
-		/// <summary>
-		/// Modifies the current set so that it contains only elements that are present either in the current set or in the specified collection, but not both.
-		/// </summary>
-		/// <param name="other">The collection to compare to the current set.</param>
-		public void SymmetricExceptWith(IEnumerable<T> other)
-		{
-			throw new NotImplementedException();
-		}
+	/// <summary>
+	/// Removes all elements in the specified collection from the current set.
+	/// </summary>
+	/// <param name="other">The collection of items to remove from the set.</param>
+	public void ExceptWith(IEnumerable<T> other)
+	{
+		RemoveRange(other);
+	}
 
-		/// <summary>
-		/// Determines whether the current set is a subset of a specified collection.
-		/// </summary>
-		/// <param name="other">The collection to compare to the current set.</param>
-		/// <returns>True if the set is a subset of other; otherwise, false.</returns>
-		public bool IsSubsetOf(IEnumerable<T> other)
-		{
-			lock (SyncRoot)
-				return InnerCollection.IsSubsetOf(other);
-		}
+	/// <summary>
+	/// Modifies the current set so that it contains only elements that are present either in the current set or in the specified collection, but not both.
+	/// </summary>
+	/// <param name="other">The collection to compare to the current set.</param>
+	public void SymmetricExceptWith(IEnumerable<T> other)
+	{
+		throw new NotImplementedException();
+	}
 
-		/// <summary>
-		/// Determines whether the current set is a superset of a specified collection.
-		/// </summary>
-		/// <param name="other">The collection to compare to the current set.</param>
-		/// <returns>True if the set is a superset of other; otherwise, false.</returns>
-		public bool IsSupersetOf(IEnumerable<T> other)
-		{
-			lock (SyncRoot)
-				return InnerCollection.IsSupersetOf(other);
-		}
+	/// <summary>
+	/// Determines whether the current set is a subset of a specified collection.
+	/// </summary>
+	/// <param name="other">The collection to compare to the current set.</param>
+	/// <returns>True if the set is a subset of other; otherwise, false.</returns>
+	public bool IsSubsetOf(IEnumerable<T> other)
+	{
+		lock (SyncRoot)
+			return InnerCollection.IsSubsetOf(other);
+	}
 
-		/// <summary>
-		/// Determines whether the current set is a proper superset of a specified collection.
-		/// </summary>
-		/// <param name="other">The collection to compare to the current set.</param>
-		/// <returns>True if the set is a proper superset of other; otherwise, false.</returns>
-		public bool IsProperSupersetOf(IEnumerable<T> other)
-		{
-			lock (SyncRoot)
-				return InnerCollection.Overlaps(other);
-		}
+	/// <summary>
+	/// Determines whether the current set is a superset of a specified collection.
+	/// </summary>
+	/// <param name="other">The collection to compare to the current set.</param>
+	/// <returns>True if the set is a superset of other; otherwise, false.</returns>
+	public bool IsSupersetOf(IEnumerable<T> other)
+	{
+		lock (SyncRoot)
+			return InnerCollection.IsSupersetOf(other);
+	}
 
-		/// <summary>
-		/// Determines whether the current set is a proper subset of a specified collection.
-		/// </summary>
-		/// <param name="other">The collection to compare to the current set.</param>
-		/// <returns>True if the set is a proper subset of other; otherwise, false.</returns>
-		public bool IsProperSubsetOf(IEnumerable<T> other)
-		{
-			lock (SyncRoot)
-				return InnerCollection.IsProperSubsetOf(other);
-		}
+	/// <summary>
+	/// Determines whether the current set is a proper superset of a specified collection.
+	/// </summary>
+	/// <param name="other">The collection to compare to the current set.</param>
+	/// <returns>True if the set is a proper superset of other; otherwise, false.</returns>
+	public bool IsProperSupersetOf(IEnumerable<T> other)
+	{
+		lock (SyncRoot)
+			return InnerCollection.Overlaps(other);
+	}
 
-		/// <summary>
-		/// Determines whether the current set overlaps with the specified collection.
-		/// </summary>
-		/// <param name="other">The collection to compare to the current set.</param>
-		/// <returns>True if the sets overlap; otherwise, false.</returns>
-		public bool Overlaps(IEnumerable<T> other)
-		{
-			lock (SyncRoot)
-				return InnerCollection.Overlaps(other);
-		}
+	/// <summary>
+	/// Determines whether the current set is a proper subset of a specified collection.
+	/// </summary>
+	/// <param name="other">The collection to compare to the current set.</param>
+	/// <returns>True if the set is a proper subset of other; otherwise, false.</returns>
+	public bool IsProperSubsetOf(IEnumerable<T> other)
+	{
+		lock (SyncRoot)
+			return InnerCollection.IsProperSubsetOf(other);
+	}
 
-		/// <summary>
-		/// Determines whether the current set and a specified collection contain the same elements.
-		/// </summary>
-		/// <param name="other">The collection to compare to the current set.</param>
-		/// <returns>True if the sets contain the same elements; otherwise, false.</returns>
-		public bool SetEquals(IEnumerable<T> other)
-		{
-			throw new NotImplementedException();
-		}
+	/// <summary>
+	/// Determines whether the current set overlaps with the specified collection.
+	/// </summary>
+	/// <param name="other">The collection to compare to the current set.</param>
+	/// <returns>True if the sets overlap; otherwise, false.</returns>
+	public bool Overlaps(IEnumerable<T> other)
+	{
+		lock (SyncRoot)
+			return InnerCollection.Overlaps(other);
+	}
 
-		/// <summary>
-		/// Adds an item to the current set and returns a value to indicate if the item was successfully added.
-		/// </summary>
-		/// <param name="item">The element to add to the set.</param>
-		/// <returns>True if the item is added to the set; otherwise, false.</returns>
-		bool ISet<T>.Add(T item)
-		{
-			return TryAdd(item);
-		}
+	/// <summary>
+	/// Determines whether the current set and a specified collection contain the same elements.
+	/// </summary>
+	/// <param name="other">The collection to compare to the current set.</param>
+	/// <returns>True if the sets contain the same elements; otherwise, false.</returns>
+	public bool SetEquals(IEnumerable<T> other)
+	{
+		throw new NotImplementedException();
+	}
+
+	/// <summary>
+	/// Adds an item to the current set and returns a value to indicate if the item was successfully added.
+	/// </summary>
+	/// <param name="item">The element to add to the set.</param>
+	/// <returns>True if the item is added to the set; otherwise, false.</returns>
+	bool ISet<T>.Add(T item)
+	{
+		return TryAdd(item);
+	}
 
-		#endregion
+	#endregion
 
-		/// <summary>
-		/// Attempts to add the specified item to the set without throwing an exception for duplicates.
-		/// </summary>
-		/// <param name="item">The item to add.</param>
-		/// <returns>True if the item was added; otherwise, false.</returns>
-		public bool TryAdd(T item)
+	/// <summary>
+	/// Attempts to add the specified item to the set without throwing an exception for duplicates.
+	/// </summary>
+	/// <param name="item">The item to add.</param>
+	/// <returns>True if the item was added; otherwise, false.</returns>
+	public bool TryAdd(T item)
+	{
+		lock (SyncRoot)
 		{
-			lock (SyncRoot)
+			if (InnerCollection.Contains(item))
 			{
-				if (InnerCollection.Contains(item))
-				{
-					Duplicate();
-					return false;
-				}
-
-				Add(item);
-				return true;
+				Duplicate();
+				return false;
 			}
+
+			Add(item);
+			return true;
 		}
+	}
 
-		/// <summary>
-		/// Occurs when multiple items have been added to the set.
-		/// </summary>
-		public event Action<IEnumerable<T>> AddedRange;
+	/// <summary>
+	/// Occurs when multiple items have been added to the set.
+	/// </summary>
+	public event Action<IEnumerable<T>> AddedRange;
 
-		/// <summary>
-		/// Occurs when multiple items have been removed from the set.
-		/// </summary>
-		public event Action<IEnumerable<T>> RemovedRange;
+	/// <summary>
+	/// Occurs when multiple items have been removed from the set.
+	/// </summary>
+	public event Action<IEnumerable<T>> RemovedRange;
 
-		/// <inheritdoc/>
-		protected override void OnAdded(T item)
-		{
-			base.OnAdded(item);
+	/// <inheritdoc/>
+	protected override void OnAdded(T item)
+	{
+		base.OnAdded(item);
 
-			if (_raiseRangeEvents)
-				AddedRange?.Invoke([item]);
-		}
+		if (_raiseRangeEvents)
+			AddedRange?.Invoke([item]);
+	}
 
-		/// <inheritdoc/>
-		protected override void OnRemoved(T item)
-		{
-			base.OnRemoved(item);
+	/// <inheritdoc/>
+	protected override void OnRemoved(T item)
+	{
+		base.OnRemoved(item);
 
-			if (_raiseRangeEvents)
-				RemovedRange?.Invoke([item]);
-		}
+		if (_raiseRangeEvents)
+			RemovedRange?.Invoke([item]);
+	}
 
-		/// <summary>
-		/// Adds a range of items to the set.
-		/// </summary>
-		/// <param name="items">The items to add.</param>
-		public void AddRange(IEnumerable<T> items)
+	/// <summary>
+	/// Adds a range of items to the set.
+	/// </summary>
+	/// <param name="items">The items to add.</param>
+	public void AddRange(IEnumerable<T> items)
+	{
+		lock (SyncRoot)
 		{
-			lock (SyncRoot)
+			var filteredItems = items.Where(t =>
 			{
-				var filteredItems = items.Where(t =>
-				{
-					if (CheckNullableItems && t.IsNull())
-						throw new ArgumentNullException(nameof(t));
+				if (CheckNullableItems && t.IsNull())
+					throw new ArgumentNullException(nameof(t));
 
-					return OnAdding(t);
-				}).ToArray();
-				InnerCollection.AddRange(filteredItems);
+				return OnAdding(t);
+			}).ToArray();
+			InnerCollection.AddRange(filteredItems);
 
-				ProcessRange(filteredItems, item =>
-				{
-					//AddIndicies(item);
+			ProcessRange(filteredItems, item =>
+			{
+				//AddIndicies(item);
 
-					if (_indecies != null)
-					{
-						_indecies.Add(_maxIndex + 1, item);
-						_maxIndex++;
-					}
+				if (_indecies != null)
+				{
+					_indecies.Add(_maxIndex + 1, item);
+					_maxIndex++;
+				}
 
-					OnAdded(item);
-				});
+				OnAdded(item);
+			});
 
-				AddedRange?.Invoke(filteredItems);
-			}
+			AddedRange?.Invoke(filteredItems);
 		}
+	}
 
-		/// <summary>
-		/// Removes a range of items from the set.
-		/// </summary>
-		/// <param name="items">The items to remove.</param>
-		public void RemoveRange(IEnumerable<T> items)
+	/// <summary>
+	/// Removes a range of items from the set.
+	/// </summary>
+	/// <param name="items">The items to remove.</param>
+	public void RemoveRange(IEnumerable<T> items)
+	{
+		lock (SyncRoot)
 		{
-			lock (SyncRoot)
+			var filteredItems = items.Where(OnRemoving).ToArray();
+			InnerCollection.RemoveRange(filteredItems);
+			ProcessRange(filteredItems, item =>
 			{
-				var filteredItems = items.Where(OnRemoving).ToArray();
-				InnerCollection.RemoveRange(filteredItems);
-				ProcessRange(filteredItems, item =>
-				{
-					RemoveIndicies(item);
-					OnRemoved(item);
-				});
+				RemoveIndicies(item);
+				OnRemoved(item);
+			});
 
-				RemovedRange?.Invoke(filteredItems);
-			}
+			RemovedRange?.Invoke(filteredItems);
 		}
+	}
 
-		private void ProcessRange(IEnumerable<T> items, Action<T> action)
-		{
-			_raiseRangeEvents = false;
+	private void ProcessRange(IEnumerable<T> items, Action<T> action)
+	{
+		_raiseRangeEvents = false;
 
-			items.ForEach(action);
+		items.ForEach(action);
 
-			_raiseRangeEvents = true;
-		}
+		_raiseRangeEvents = true;
+	}
 
-		/// <summary>
-		/// Removes a specified number of items starting at the given index. Not yet implemented.
-		/// </summary>
-		/// <param name="index">The starting index.</param>
-		/// <param name="count">The number of items to remove.</param>
-		/// <returns>The number of items removed.</returns>
-		/// <exception cref="NotImplementedException">Always thrown.</exception>
-		public int RemoveRange(int index, int count)
-		{
-			throw new NotImplementedException();
-		}
+	/// <summary>
+	/// Removes a specified number of items starting at the given index. Not yet implemented.
+	/// </summary>
+	/// <param name="index">The starting index.</param>
+	/// <param name="count">The number of items to remove.</param>
+	/// <returns>The number of items removed.</returns>
+	/// <exception cref="NotImplementedException">Always thrown.</exception>
+	public int RemoveRange(int index, int count)
+	{
+		throw new NotImplementedException();
 	}
 }
\ No newline at end of file
diff --git a/Collections/SynchronizedStack.cs b/Collections/SynchronizedStack.cs
index 8f6ce28b..3ad0810c 100644
--- a/Collections/SynchronizedStack.cs
+++ b/Collections/SynchronizedStack.cs
@@ -1,93 +1,92 @@
-namespace Ecng.Collections
-{
-	using System;
+namespace Ecng.Collections;
+
+using System;
 
+/// <summary>
+/// Represents a synchronized stack of items.
+/// </summary>
+/// <typeparam name="T">The type of elements in the stack.</typeparam>
+[Serializable]
+public class SynchronizedStack<T> : SynchronizedCollection<T, StackEx<T>>
+{
 	/// <summary>
-	/// Represents a synchronized stack of items.
+	/// Initializes a new instance of the <see cref="SynchronizedStack{T}"/> class.
 	/// </summary>
-	/// <typeparam name="T">The type of elements in the stack.</typeparam>
-	[Serializable]
-	public class SynchronizedStack<T> : SynchronizedCollection<T, StackEx<T>>
+	public SynchronizedStack()
+		: base(new StackEx<T>())
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="SynchronizedStack{T}"/> class.
-		/// </summary>
-		public SynchronizedStack()
-			: base(new StackEx<T>())
-		{
-		}
+	}
 
-		/// <summary>
-		/// Adds an item to the top of this stack.
-		/// </summary>
-		/// <param name="item">The item to add.</param>
-		public void Push(T item)
-		{
-			lock (SyncRoot)
-				InnerCollection.Push(item);
-		}
+	/// <summary>
+	/// Adds an item to the top of this stack.
+	/// </summary>
+	/// <param name="item">The item to add.</param>
+	public void Push(T item)
+	{
+		lock (SyncRoot)
+			InnerCollection.Push(item);
+	}
 
-		/// <summary>
-		/// Removes and returns the object at the top of this stack.
-		/// </summary>
-		/// <returns>The item removed from the top.</returns>
-		public T Pop()
-		{
-			lock (SyncRoot)
-				return InnerCollection.Pop();
-		}
+	/// <summary>
+	/// Removes and returns the object at the top of this stack.
+	/// </summary>
+	/// <returns>The item removed from the top.</returns>
+	public T Pop()
+	{
+		lock (SyncRoot)
+			return InnerCollection.Pop();
+	}
 
-		/// <summary>
-		/// Returns the object at the top of this stack without removing it.
-		/// </summary>
-		/// <returns>The item at the top.</returns>
-		public T Peek()
-		{
-			lock (SyncRoot)
-				return InnerCollection.Peek();
-		}
+	/// <summary>
+	/// Returns the object at the top of this stack without removing it.
+	/// </summary>
+	/// <returns>The item at the top.</returns>
+	public T Peek()
+	{
+		lock (SyncRoot)
+			return InnerCollection.Peek();
+	}
 
-		/// <summary>
-		/// Throws a <see cref="NotSupportedException"/> as this operation is not supported for a stack.
-		/// </summary>
-		/// <param name="index">The index of the item to retrieve.</param>
-		/// <returns>This method always throws an exception.</returns>
-		/// <exception cref="NotSupportedException">This operation is not supported for a stack.</exception>
-		protected override T OnGetItem(int index)
-		{
-			throw new NotSupportedException();
-		}
+	/// <summary>
+	/// Throws a <see cref="NotSupportedException"/> as this operation is not supported for a stack.
+	/// </summary>
+	/// <param name="index">The index of the item to retrieve.</param>
+	/// <returns>This method always throws an exception.</returns>
+	/// <exception cref="NotSupportedException">This operation is not supported for a stack.</exception>
+	protected override T OnGetItem(int index)
+	{
+		throw new NotSupportedException();
+	}
 
-		/// <summary>
-		/// Throws a <see cref="NotSupportedException"/> as this operation is not supported for a stack.
-		/// </summary>
-		/// <param name="index">The index at which the item should be inserted.</param>
-		/// <param name="item">The item to insert.</param>
-		/// <exception cref="NotSupportedException">This operation is not supported for a stack.</exception>
-		protected override void OnInsert(int index, T item)
-		{
-			throw new NotSupportedException();
-		}
+	/// <summary>
+	/// Throws a <see cref="NotSupportedException"/> as this operation is not supported for a stack.
+	/// </summary>
+	/// <param name="index">The index at which the item should be inserted.</param>
+	/// <param name="item">The item to insert.</param>
+	/// <exception cref="NotSupportedException">This operation is not supported for a stack.</exception>
+	protected override void OnInsert(int index, T item)
+	{
+		throw new NotSupportedException();
+	}
 
-		/// <summary>
-		/// Throws a <see cref="NotSupportedException"/> as this operation is not supported for a stack.
-		/// </summary>
-		/// <param name="index">The index of the item to remove.</param>
-		/// <exception cref="NotSupportedException">This operation is not supported for a stack.</exception>
-		protected override void OnRemoveAt(int index)
-		{
-			throw new NotSupportedException();
-		}
+	/// <summary>
+	/// Throws a <see cref="NotSupportedException"/> as this operation is not supported for a stack.
+	/// </summary>
+	/// <param name="index">The index of the item to remove.</param>
+	/// <exception cref="NotSupportedException">This operation is not supported for a stack.</exception>
+	protected override void OnRemoveAt(int index)
+	{
+		throw new NotSupportedException();
+	}
 
-		/// <summary>
-		/// Throws a <see cref="NotSupportedException"/> as this operation is not supported for a stack.
-		/// </summary>
-		/// <param name="item">The item to locate in the stack.</param>
-		/// <returns>This method always throws an exception.</returns>
-		/// <exception cref="NotSupportedException">This operation is not supported for a stack.</exception>
-		protected override int OnIndexOf(T item)
-		{
-			throw new NotSupportedException();
-		}
+	/// <summary>
+	/// Throws a <see cref="NotSupportedException"/> as this operation is not supported for a stack.
+	/// </summary>
+	/// <param name="item">The item to locate in the stack.</param>
+	/// <returns>This method always throws an exception.</returns>
+	/// <exception cref="NotSupportedException">This operation is not supported for a stack.</exception>
+	protected override int OnIndexOf(T item)
+	{
+		throw new NotSupportedException();
 	}
 }
\ No newline at end of file
diff --git a/Common/AllocationArray.cs b/Common/AllocationArray.cs
index c77658f8..7d354c18 100644
--- a/Common/AllocationArray.cs
+++ b/Common/AllocationArray.cs
@@ -1,242 +1,241 @@
-namespace Ecng.Common
-{
-	using System;
-	using System.Collections;
-	using System.Collections.Generic;
+namespace Ecng.Common;
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
 
+/// <summary>
+/// Represents a dynamically resizing array allocation.
+/// </summary>
+/// <typeparam name="T">The type of elements stored in the array.</typeparam>
+public class AllocationArray<T> : IEnumerable<T>
+{
 	/// <summary>
-	/// Represents a dynamically resizing array allocation.
+	/// Enumerator for the AllocationArray.
 	/// </summary>
-	/// <typeparam name="T">The type of elements stored in the array.</typeparam>
-	public class AllocationArray<T> : IEnumerable<T>
+	private class AllocationArrayEnumerator(AllocationArray<T> parent) : IEnumerator<T>
 	{
+		private readonly AllocationArray<T> _parent = parent ?? throw new ArgumentNullException(nameof(parent));
+		private T _current;
+		private int _pos;
+
 		/// <summary>
-		/// Enumerator for the AllocationArray.
+		/// Releases resources used by the enumerator.
 		/// </summary>
-		private class AllocationArrayEnumerator(AllocationArray<T> parent) : IEnumerator<T>
+		void IDisposable.Dispose() => _pos = 0;
+
+		/// <summary>
+		/// Advances the enumerator to the next element.
+		/// </summary>
+		/// <returns>true if the enumerator was successfully advanced; otherwise, false.</returns>
+		bool IEnumerator.MoveNext()
 		{
-			private readonly AllocationArray<T> _parent = parent ?? throw new ArgumentNullException(nameof(parent));
-			private T _current;
-			private int _pos;
-
-			/// <summary>
-			/// Releases resources used by the enumerator.
-			/// </summary>
-			void IDisposable.Dispose() => _pos = 0;
-
-			/// <summary>
-			/// Advances the enumerator to the next element.
-			/// </summary>
-			/// <returns>true if the enumerator was successfully advanced; otherwise, false.</returns>
-			bool IEnumerator.MoveNext()
+			if (_pos < _parent._count)
 			{
-				if (_pos < _parent._count)
-				{
-					_current = _parent._buffer[_pos++];
-					return true;
-				}
-
-				return false;
+				_current = _parent._buffer[_pos++];
+				return true;
 			}
 
-			/// <summary>
-			/// Resets the enumerator to its initial position.
-			/// </summary>
-			void IEnumerator.Reset() => _pos = 0;
-
-			/// <summary>
-			/// Gets the current element in the array.
-			/// </summary>
-			T IEnumerator<T>.Current => _current;
-
-			/// <summary>
-			/// Gets the current element in the array.
-			/// </summary>
-			object IEnumerator.Current => _current;
+			return false;
 		}
 
-		//private readonly int _capacity;
-		private T[] _buffer;
-		private readonly AllocationArrayEnumerator _enumerator;
-
 		/// <summary>
-		/// Initializes a new instance of the <see cref="AllocationArray{T}"/> class with the specified capacity.
+		/// Resets the enumerator to its initial position.
 		/// </summary>
-		/// <param name="capacity">The initial capacity of the array. Must be at least 1.</param>
-		public AllocationArray(int capacity = 1)
-		{
-			if (capacity < 1)
-				throw new ArgumentOutOfRangeException(nameof(capacity));
-
-			//_capacity = capacity;
-			_buffer = new T[capacity];
-			_enumerator = new AllocationArrayEnumerator(this);
-		}
+		void IEnumerator.Reset() => _pos = 0;
 
 		/// <summary>
-		/// Gets or sets the maximum allowed count of elements.
+		/// Gets the current element in the array.
 		/// </summary>
-		public int MaxCount { get; set; } = int.MaxValue / 4;
-
-		private int _count;
+		T IEnumerator<T>.Current => _current;
 
 		/// <summary>
-		/// Gets or sets the current number of elements in the array.
+		/// Gets the current element in the array.
 		/// </summary>
-		public int Count
-		{
-			get => _count;
-			set
-			{
-				if (_buffer.Length < value)
-				{
-					if (value > MaxCount)
-						throw new ArgumentOutOfRangeException();
+		object IEnumerator.Current => _current;
+	}
 
-					Resize(value);
-				}
+	//private readonly int _capacity;
+	private T[] _buffer;
+	private readonly AllocationArrayEnumerator _enumerator;
 
-				_count = value;
-			}
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="AllocationArray{T}"/> class with the specified capacity.
+	/// </summary>
+	/// <param name="capacity">The initial capacity of the array. Must be at least 1.</param>
+	public AllocationArray(int capacity = 1)
+	{
+		if (capacity < 1)
+			throw new ArgumentOutOfRangeException(nameof(capacity));
 
-		/// <summary>
-		/// Gets or sets the element at the specified index.
-		/// </summary>
-		/// <param name="index">The zero-based index of the element to get or set.</param>
-		/// <returns>The element at the specified index.</returns>
-		public T this[int index]
+		//_capacity = capacity;
+		_buffer = new T[capacity];
+		_enumerator = new AllocationArrayEnumerator(this);
+	}
+
+	/// <summary>
+	/// Gets or sets the maximum allowed count of elements.
+	/// </summary>
+	public int MaxCount { get; set; } = int.MaxValue / 4;
+
+	private int _count;
+
+	/// <summary>
+	/// Gets or sets the current number of elements in the array.
+	/// </summary>
+	public int Count
+	{
+		get => _count;
+		set
 		{
-			get
+			if (_buffer.Length < value)
 			{
-				if (index >= Count)
+				if (value > MaxCount)
 					throw new ArgumentOutOfRangeException();
 
-				return _buffer[index];
+				Resize(value);
 			}
-			set
-			{
-				if (index >= Count)
-					Count = index + 1;
 
-				_buffer[index] = value;
-			}
+			_count = value;
 		}
+	}
 
-		/// <summary>
-		/// Gets the underlying buffer array.
-		/// </summary>
-		public T[] Buffer => _buffer;
-
-		/// <summary>
-		/// Resets the array, clearing all elements and optionally resizing the buffer.
-		/// </summary>
-		/// <param name="capacity">The desired capacity. Must be at least 1.</param>
-		public void Reset(int capacity = 1)
+	/// <summary>
+	/// Gets or sets the element at the specified index.
+	/// </summary>
+	/// <param name="index">The zero-based index of the element to get or set.</param>
+	/// <returns>The element at the specified index.</returns>
+	public T this[int index]
+	{
+		get
 		{
-			if (capacity < 1)
-				throw new ArgumentOutOfRangeException(nameof(capacity));
+			if (index >= Count)
+				throw new ArgumentOutOfRangeException();
 
-			_count = 0;
+			return _buffer[index];
+		}
+		set
+		{
+			if (index >= Count)
+				Count = index + 1;
 
-			if (_buffer.Length < capacity)
-				Resize(capacity);
+			_buffer[index] = value;
 		}
+	}
 
-		/// <summary>
-		/// Ensures that the array has the specified new size capacity.
-		/// </summary>
-		/// <param name="newSize">The required size.</param>
-		private void EnsureCapacity(int newSize)
-		{
-			if (_buffer.Length > newSize)
-				return;
+	/// <summary>
+	/// Gets the underlying buffer array.
+	/// </summary>
+	public T[] Buffer => _buffer;
 
-			if (newSize > MaxCount)
-				throw new ArgumentOutOfRangeException();
+	/// <summary>
+	/// Resets the array, clearing all elements and optionally resizing the buffer.
+	/// </summary>
+	/// <param name="capacity">The desired capacity. Must be at least 1.</param>
+	public void Reset(int capacity = 1)
+	{
+		if (capacity < 1)
+			throw new ArgumentOutOfRangeException(nameof(capacity));
 
-			Resize(newSize * 2);
-		}
+		_count = 0;
 
-		/// <summary>
-		/// Adds an item to the end of the array.
-		/// </summary>
-		/// <param name="item">The item to add.</param>
-		public void Add(T item)
-		{
-			EnsureCapacity(_count + 1);
+		if (_buffer.Length < capacity)
+			Resize(capacity);
+	}
 
-			_buffer[_count] = item;
-			_count++;
-		}
+	/// <summary>
+	/// Ensures that the array has the specified new size capacity.
+	/// </summary>
+	/// <param name="newSize">The required size.</param>
+	private void EnsureCapacity(int newSize)
+	{
+		if (_buffer.Length > newSize)
+			return;
 
-		/// <summary>
-		/// Adds a range of items from an array to the end of the allocation array.
-		/// </summary>
-		/// <param name="items">The array of items to add.</param>
-		/// <param name="offset">The zero-based index at which to start copying from the source array.</param>
-		/// <param name="count">The number of items to copy.</param>
-		public void Add(T[] items, int offset, int count)
-		{
-			EnsureCapacity(_count + count);
+		if (newSize > MaxCount)
+			throw new ArgumentOutOfRangeException();
 
-			Array.Copy(items, offset, _buffer, _count, count);
-			_count += count;
-		}
+		Resize(newSize * 2);
+	}
 
-		/// <summary>
-		/// Removes the item at the specified index.
-		/// </summary>
-		/// <param name="index">The zero-based index of the item to remove.</param>
-		public void RemoveAt(int index)
-		{
-			RemoveRange(index, 1);
-		}
+	/// <summary>
+	/// Adds an item to the end of the array.
+	/// </summary>
+	/// <param name="item">The item to add.</param>
+	public void Add(T item)
+	{
+		EnsureCapacity(_count + 1);
 
-		/// <summary>
-		/// Removes a range of items from the array.
-		/// </summary>
-		/// <param name="startIndex">The zero-based starting index of the range to remove.</param>
-		/// <param name="count">The number of items to remove.</param>
-		public void RemoveRange(int startIndex, int count)
-		{
-			if (startIndex < 0)
-				throw new ArgumentOutOfRangeException(nameof(startIndex));
+		_buffer[_count] = item;
+		_count++;
+	}
 
-			if (count <= 0)
-				throw new ArgumentOutOfRangeException(nameof(count));
+	/// <summary>
+	/// Adds a range of items from an array to the end of the allocation array.
+	/// </summary>
+	/// <param name="items">The array of items to add.</param>
+	/// <param name="offset">The zero-based index at which to start copying from the source array.</param>
+	/// <param name="count">The number of items to copy.</param>
+	public void Add(T[] items, int offset, int count)
+	{
+		EnsureCapacity(_count + count);
 
-			var begin = startIndex + count;
-			var countOfMove = _count - begin;
+		Array.Copy(items, offset, _buffer, _count, count);
+		_count += count;
+	}
 
-			if (countOfMove < 0)
-				throw new ArgumentOutOfRangeException(nameof(count));
+	/// <summary>
+	/// Removes the item at the specified index.
+	/// </summary>
+	/// <param name="index">The zero-based index of the item to remove.</param>
+	public void RemoveAt(int index)
+	{
+		RemoveRange(index, 1);
+	}
 
-			if (countOfMove > 0)
-				Array.Copy(_buffer, begin, _buffer, startIndex, countOfMove);
+	/// <summary>
+	/// Removes a range of items from the array.
+	/// </summary>
+	/// <param name="startIndex">The zero-based starting index of the range to remove.</param>
+	/// <param name="count">The number of items to remove.</param>
+	public void RemoveRange(int startIndex, int count)
+	{
+		if (startIndex < 0)
+			throw new ArgumentOutOfRangeException(nameof(startIndex));
 
-			_count -= count;
-		}
+		if (count <= 0)
+			throw new ArgumentOutOfRangeException(nameof(count));
 
-		/// <summary>
-		/// Returns an enumerator that iterates through the collection.
-		/// </summary>
-		/// <returns>An enumerator for the allocation array.</returns>
-		public IEnumerator<T> GetEnumerator() => _enumerator;
+		var begin = startIndex + count;
+		var countOfMove = _count - begin;
 
-		/// <summary>
-		/// Returns an enumerator that iterates through the collection.
-		/// </summary>
-		/// <returns>An enumerator for the allocation array.</returns>
-		IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+		if (countOfMove < 0)
+			throw new ArgumentOutOfRangeException(nameof(count));
 
-		/// <summary>
-		/// Resizes the buffer array to the specified capacity.
-		/// </summary>
-		/// <param name="capacity">The new capacity of the buffer.</param>
-		private void Resize(int capacity)
-		{
-			Array.Resize(ref _buffer, capacity);
-		}
+		if (countOfMove > 0)
+			Array.Copy(_buffer, begin, _buffer, startIndex, countOfMove);
+
+		_count -= count;
+	}
+
+	/// <summary>
+	/// Returns an enumerator that iterates through the collection.
+	/// </summary>
+	/// <returns>An enumerator for the allocation array.</returns>
+	public IEnumerator<T> GetEnumerator() => _enumerator;
+
+	/// <summary>
+	/// Returns an enumerator that iterates through the collection.
+	/// </summary>
+	/// <returns>An enumerator for the allocation array.</returns>
+	IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+	/// <summary>
+	/// Resizes the buffer array to the specified capacity.
+	/// </summary>
+	/// <param name="capacity">The new capacity of the buffer.</param>
+	private void Resize(int capacity)
+	{
+		Array.Resize(ref _buffer, capacity);
 	}
 }
\ No newline at end of file
diff --git a/Common/ArrayHelper.cs b/Common/ArrayHelper.cs
index 6c4875f8..34665f2f 100644
--- a/Common/ArrayHelper.cs
+++ b/Common/ArrayHelper.cs
@@ -1,185 +1,184 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+using System;
+using System.Collections.Generic;
+
+/// <summary>
+/// Utility class for common array operations.
+/// </summary>
+public static class ArrayHelper
 {
-	using System;
-	using System.Collections.Generic;
+	/// <summary>
+	/// Sets all of the elements in the specified <see cref="Array"/> to zero, false, or null, depending on the element type.
+	/// </summary>
+	/// <param name="array">The array whose elements need to be cleared.</param>
+	/// <exception cref="ArgumentNullException">Thrown when the array is null.</exception>
+	public static void Clear(this Array array)
+	{
+		if (array is null)
+			throw new ArgumentNullException(nameof(array));
+
+		Clear(array, 0, array.Length);
+	}
+
+	/// <summary>
+	/// Sets a range of elements in the specified <see cref="Array"/> to zero, false, or null, depending on the element type.
+	/// </summary>
+	/// <param name="array">The array whose elements need to be cleared.</param>
+	/// <param name="index">The starting index of the range of elements to clear.</param>
+	/// <param name="count">The number of elements to clear.</param>
+	/// <exception cref="ArgumentNullException">Thrown when the array is null.</exception>
+	public static void Clear(this Array array, int index, int count)
+	{
+		Array.Clear(array, index, count);
+	}
 
 	/// <summary>
-	/// Utility class for common array operations.
+	/// Returns a subarray that starts at the specified index and extends to the end of the array.
 	/// </summary>
-	public static class ArrayHelper
+	/// <typeparam name="T">The type of elements in the array.</typeparam>
+	/// <param name="array">The source array.</param>
+	/// <param name="index">The starting index of the subarray.</param>
+	/// <returns>A new array containing the elements from the specified index to the end of the source array.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when the array is null.</exception>
+	public static T[] Range<T>(this T[] array, int index)
 	{
-		/// <summary>
-		/// Sets all of the elements in the specified <see cref="Array"/> to zero, false, or null, depending on the element type.
-		/// </summary>
-		/// <param name="array">The array whose elements need to be cleared.</param>
-		/// <exception cref="ArgumentNullException">Thrown when the array is null.</exception>
-		public static void Clear(this Array array)
-		{
-			if (array is null)
-				throw new ArgumentNullException(nameof(array));
-
-			Clear(array, 0, array.Length);
-		}
-
-		/// <summary>
-		/// Sets a range of elements in the specified <see cref="Array"/> to zero, false, or null, depending on the element type.
-		/// </summary>
-		/// <param name="array">The array whose elements need to be cleared.</param>
-		/// <param name="index">The starting index of the range of elements to clear.</param>
-		/// <param name="count">The number of elements to clear.</param>
-		/// <exception cref="ArgumentNullException">Thrown when the array is null.</exception>
-		public static void Clear(this Array array, int index, int count)
-		{
-			Array.Clear(array, index, count);
-		}
-
-		/// <summary>
-		/// Returns a subarray that starts at the specified index and extends to the end of the array.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the array.</typeparam>
-		/// <param name="array">The source array.</param>
-		/// <param name="index">The starting index of the subarray.</param>
-		/// <returns>A new array containing the elements from the specified index to the end of the source array.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when the array is null.</exception>
-		public static T[] Range<T>(this T[] array, int index)
-		{
-			if (array is null)
-				throw new ArgumentNullException(nameof(array));
-
-			return array.Range(index, array.Length - index);
-		}
-
-		/// <summary>
-		/// Returns a subarray that begins at the specified index and contains the specified number of elements.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the array.</typeparam>
-		/// <param name="array">The source array.</param>
-		/// <param name="index">The starting index of the subarray.</param>
-		/// <param name="count">The number of elements to include in the subarray.</param>
-		/// <returns>A new array containing the specified range of elements from the source array.</returns>
-		public static T[] Range<T>(this T[] array, int index, int count)
-		{
-			var range = new T[count];
-			Array.Copy(array, index, range, 0, count);
-			return range;
-		}
-
-		/// <summary>
-		/// Creates a one-dimensional <see cref="Array"/> of the specified <see cref="Type"/> and length, with zero-based indexing.
-		/// </summary>
-		/// <param name="type">The type of the array to create.</param>
-		/// <param name="count">The size of the array to create.</param>
-		/// <returns>A new array of the specified type and length.</returns>
-		public static Array CreateArray(this Type type, int count)
-		{
-			return Array.CreateInstance(type, count);
-		}
-
-		/// <summary>
-		/// Searches for the specified object and returns the index of the first occurrence within the entire one-dimensional array.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the array.</typeparam>
-		/// <param name="array">The one-dimensional array to search.</param>
-		/// <param name="item">The object to locate in the array.</param>
-		/// <returns>
-		/// The index of the first occurrence of value within the entire array, if found; otherwise, the lower bound of the array minus 1.
-		/// </returns>
-		public static int IndexOf<T>(this T[] array, T item)
-		{
-			return Array.IndexOf(array, item);
-		}
-
-		/// <summary>
-		/// Creates a shallow copy of the specified array.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the array.</typeparam>
-		/// <param name="array">The source array.</param>
-		/// <returns>A new array that is a shallow copy of the source array.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when the array is null.</exception>
-		public static T[] Clone<T>(this T[] array)
-		{
-			if (array is null)
-				throw new ArgumentNullException(nameof(array));
-
-			return (T[])array.Clone();
-		}
-
-		/// <summary>
-		/// Returns a reversed copy of the specified array.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the array.</typeparam>
-		/// <param name="array">The source array.</param>
-		/// <returns>A new array with the elements in reverse order.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when the array is null.</exception>
-		public static T[] Reverse<T>(this T[] array)
-		{
-			if (array is null)
-				throw new ArgumentNullException(nameof(array));
-
-			var clone = (T[])array.Clone();
-			Array.Reverse(clone);
-			return clone;
-		}
-
-		/// <summary>
-		/// Concatenates two arrays into a single new array.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the arrays.</typeparam>
-		/// <param name="first">The first array to concatenate.</param>
-		/// <param name="second">The second array to concatenate.</param>
-		/// <returns>A new array that contains the elements of the first array followed by the elements of the second array.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when either of the arrays is null.</exception>
-		public static T[] Concat<T>(this T[] first, T[] second)
-		{
-			if (first is null)
-				throw new ArgumentNullException(nameof(first));
-
-			if (second is null)
-				throw new ArgumentNullException(nameof(second));
-
-			var result = new T[first.Length + second.Length];
-
-			if (result.Length == 0)
-				return result;
-
-			Array.Copy(first, result, first.Length);
-			Array.Copy(second, 0, result, first.Length, second.Length);
+		if (array is null)
+			throw new ArgumentNullException(nameof(array));
 
+		return array.Range(index, array.Length - index);
+	}
+
+	/// <summary>
+	/// Returns a subarray that begins at the specified index and contains the specified number of elements.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the array.</typeparam>
+	/// <param name="array">The source array.</param>
+	/// <param name="index">The starting index of the subarray.</param>
+	/// <param name="count">The number of elements to include in the subarray.</param>
+	/// <returns>A new array containing the specified range of elements from the source array.</returns>
+	public static T[] Range<T>(this T[] array, int index, int count)
+	{
+		var range = new T[count];
+		Array.Copy(array, index, range, 0, count);
+		return range;
+	}
+
+	/// <summary>
+	/// Creates a one-dimensional <see cref="Array"/> of the specified <see cref="Type"/> and length, with zero-based indexing.
+	/// </summary>
+	/// <param name="type">The type of the array to create.</param>
+	/// <param name="count">The size of the array to create.</param>
+	/// <returns>A new array of the specified type and length.</returns>
+	public static Array CreateArray(this Type type, int count)
+	{
+		return Array.CreateInstance(type, count);
+	}
+
+	/// <summary>
+	/// Searches for the specified object and returns the index of the first occurrence within the entire one-dimensional array.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the array.</typeparam>
+	/// <param name="array">The one-dimensional array to search.</param>
+	/// <param name="item">The object to locate in the array.</param>
+	/// <returns>
+	/// The index of the first occurrence of value within the entire array, if found; otherwise, the lower bound of the array minus 1.
+	/// </returns>
+	public static int IndexOf<T>(this T[] array, T item)
+	{
+		return Array.IndexOf(array, item);
+	}
+
+	/// <summary>
+	/// Creates a shallow copy of the specified array.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the array.</typeparam>
+	/// <param name="array">The source array.</param>
+	/// <returns>A new array that is a shallow copy of the source array.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when the array is null.</exception>
+	public static T[] Clone<T>(this T[] array)
+	{
+		if (array is null)
+			throw new ArgumentNullException(nameof(array));
+
+		return (T[])array.Clone();
+	}
+
+	/// <summary>
+	/// Returns a reversed copy of the specified array.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the array.</typeparam>
+	/// <param name="array">The source array.</param>
+	/// <returns>A new array with the elements in reverse order.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when the array is null.</exception>
+	public static T[] Reverse<T>(this T[] array)
+	{
+		if (array is null)
+			throw new ArgumentNullException(nameof(array));
+
+		var clone = (T[])array.Clone();
+		Array.Reverse(clone);
+		return clone;
+	}
+
+	/// <summary>
+	/// Concatenates two arrays into a single new array.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the arrays.</typeparam>
+	/// <param name="first">The first array to concatenate.</param>
+	/// <param name="second">The second array to concatenate.</param>
+	/// <returns>A new array that contains the elements of the first array followed by the elements of the second array.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when either of the arrays is null.</exception>
+	public static T[] Concat<T>(this T[] first, T[] second)
+	{
+		if (first is null)
+			throw new ArgumentNullException(nameof(first));
+
+		if (second is null)
+			throw new ArgumentNullException(nameof(second));
+
+		var result = new T[first.Length + second.Length];
+
+		if (result.Length == 0)
 			return result;
-		}
-
-		/// <summary>
-		/// Creates a copy of the source array.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the array.</typeparam>
-		/// <param name="source">The source array.</param>
-		/// <returns>A new array containing the same elements as the source array.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when the source array is null.</exception>
-		public static T[] CopyArray<T>(this T[] source)
-		{
-			if (source is null)
-				throw new ArgumentNullException(nameof(source));
-
-			var copy = new T[source.Length];
-			source.CopyTo(copy, 0);
-			return copy;
-		}
-
-		/// <summary>
-		/// Creates a copy of the elements from the specified collection into a new array.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the collection.</typeparam>
-		/// <param name="source">The source collection.</param>
-		/// <returns>A new array containing the elements of the source collection.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when the source collection is null.</exception>
-		public static T[] CopyArray<T>(this ICollection<T> source)
-		{
-			if (source is null)
-				throw new ArgumentNullException(nameof(source));
-
-			var copy = new T[source.Count];
-			source.CopyTo(copy, 0);
-			return copy;
-		}
+
+		Array.Copy(first, result, first.Length);
+		Array.Copy(second, 0, result, first.Length, second.Length);
+
+		return result;
+	}
+
+	/// <summary>
+	/// Creates a copy of the source array.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the array.</typeparam>
+	/// <param name="source">The source array.</param>
+	/// <returns>A new array containing the same elements as the source array.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when the source array is null.</exception>
+	public static T[] CopyArray<T>(this T[] source)
+	{
+		if (source is null)
+			throw new ArgumentNullException(nameof(source));
+
+		var copy = new T[source.Length];
+		source.CopyTo(copy, 0);
+		return copy;
+	}
+
+	/// <summary>
+	/// Creates a copy of the elements from the specified collection into a new array.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the collection.</typeparam>
+	/// <param name="source">The source collection.</param>
+	/// <returns>A new array containing the elements of the source collection.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when the source collection is null.</exception>
+	public static T[] CopyArray<T>(this ICollection<T> source)
+	{
+		if (source is null)
+			throw new ArgumentNullException(nameof(source));
+
+		var copy = new T[source.Count];
+		source.CopyTo(copy, 0);
+		return copy;
 	}
 }
\ No newline at end of file
diff --git a/Common/AttributeHelper.cs b/Common/AttributeHelper.cs
index 46ab5f29..bae5b843 100644
--- a/Common/AttributeHelper.cs
+++ b/Common/AttributeHelper.cs
@@ -1,134 +1,133 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Reflection;
+
+/// <summary>
+/// Provides helper methods for working with custom attributes including caching support.
+/// </summary>
+public static class AttributeHelper
 {
-	using System;
-	using System.Collections.Generic;
-	using System.ComponentModel;
-	using System.Linq;
-	using System.Reflection;
+	private static readonly Dictionary<(Type, ICustomAttributeProvider), Attribute> _attrCache = new();
 
 	/// <summary>
-	/// Provides helper methods for working with custom attributes including caching support.
+	/// Gets or sets a value indicating whether attribute caching is enabled.
 	/// </summary>
-	public static class AttributeHelper
+	public static bool CacheEnabled { get; set; } = true;
+
+	/// <summary>
+	/// Clears the internal attribute cache.
+	/// </summary>
+	public static void ClearCache() => _attrCache.Clear();
+
+	/// <summary>
+	/// Retrieves the first custom attribute of the specified type, optionally searching the ancestors.
+	/// If caching is enabled, the attribute is stored and reused.
+	/// </summary>
+	/// <typeparam name="TAttribute">The type of the custom attribute to retrieve.</typeparam>
+	/// <param name="provider">The attribute provider to search.</param>
+	/// <param name="inherit">true to inspect the ancestors of the provider; otherwise, false.</param>
+	/// <returns>
+	/// The first attribute of type <typeparamref name="TAttribute"/> found on the provider; otherwise, null.
+	/// </returns>
+	public static TAttribute GetAttribute<TAttribute>(this ICustomAttributeProvider provider, bool inherit = true)
+		where TAttribute : Attribute
 	{
-		private static readonly Dictionary<(Type, ICustomAttributeProvider), Attribute> _attrCache = new();
-
-		/// <summary>
-		/// Gets or sets a value indicating whether attribute caching is enabled.
-		/// </summary>
-		public static bool CacheEnabled { get; set; } = true;
-
-		/// <summary>
-		/// Clears the internal attribute cache.
-		/// </summary>
-		public static void ClearCache() => _attrCache.Clear();
-
-		/// <summary>
-		/// Retrieves the first custom attribute of the specified type, optionally searching the ancestors.
-		/// If caching is enabled, the attribute is stored and reused.
-		/// </summary>
-		/// <typeparam name="TAttribute">The type of the custom attribute to retrieve.</typeparam>
-		/// <param name="provider">The attribute provider to search.</param>
-		/// <param name="inherit">true to inspect the ancestors of the provider; otherwise, false.</param>
-		/// <returns>
-		/// The first attribute of type <typeparamref name="TAttribute"/> found on the provider; otherwise, null.
-		/// </returns>
-		public static TAttribute GetAttribute<TAttribute>(this ICustomAttributeProvider provider, bool inherit = true)
-			where TAttribute : Attribute
-		{
-			if (provider is null)
-				throw new ArgumentNullException(nameof(provider));
+		if (provider is null)
+			throw new ArgumentNullException(nameof(provider));
 
-			TAttribute GetAttribute()
-				=> provider.GetCustomAttributes(typeof(TAttribute), inherit).Cast<TAttribute>().FirstOrDefault();
+		TAttribute GetAttribute()
+			=> provider.GetCustomAttributes(typeof(TAttribute), inherit).Cast<TAttribute>().FirstOrDefault();
 
-			if (!CacheEnabled)
-				return GetAttribute();
+		if (!CacheEnabled)
+			return GetAttribute();
 
-			return (TAttribute)_attrCache.SafeAdd(new(typeof(TAttribute), provider),
-				key => GetAttribute());
-		}
+		return (TAttribute)_attrCache.SafeAdd(new(typeof(TAttribute), provider),
+			key => GetAttribute());
+	}
 
-		/// <summary>
-		/// Retrieves all custom attributes of the specified type from the provider, optionally searching the ancestors.
-		/// </summary>
-		/// <typeparam name="TAttribute">The type of the custom attributes to retrieve.</typeparam>
-		/// <param name="provider">The attribute provider to search.</param>
-		/// <param name="inherit">true to inspect the ancestors of the provider; otherwise, false.</param>
-		/// <returns>An enumerable collection of attributes of type <typeparamref name="TAttribute"/>.</returns>
-		public static IEnumerable<TAttribute> GetAttributes<TAttribute>(this ICustomAttributeProvider provider, bool inherit = true)
-			where TAttribute : Attribute
-		{
-			if (provider is null)
-				throw new ArgumentNullException(nameof(provider));
+	/// <summary>
+	/// Retrieves all custom attributes of the specified type from the provider, optionally searching the ancestors.
+	/// </summary>
+	/// <typeparam name="TAttribute">The type of the custom attributes to retrieve.</typeparam>
+	/// <param name="provider">The attribute provider to search.</param>
+	/// <param name="inherit">true to inspect the ancestors of the provider; otherwise, false.</param>
+	/// <returns>An enumerable collection of attributes of type <typeparamref name="TAttribute"/>.</returns>
+	public static IEnumerable<TAttribute> GetAttributes<TAttribute>(this ICustomAttributeProvider provider, bool inherit = true)
+		where TAttribute : Attribute
+	{
+		if (provider is null)
+			throw new ArgumentNullException(nameof(provider));
 
-			return provider.GetCustomAttributes(typeof(TAttribute), inherit).Cast<TAttribute>();
-		}
+		return provider.GetCustomAttributes(typeof(TAttribute), inherit).Cast<TAttribute>();
+	}
 
-		/// <summary>
-		/// Retrieves all custom attributes from the provider, optionally searching the ancestors.
-		/// </summary>
-		/// <param name="provider">The attribute provider to search.</param>
-		/// <param name="inherit">true to inspect the ancestors of the provider; otherwise, false.</param>
-		/// <returns>An enumerable collection of custom attributes.</returns>
-		public static IEnumerable<Attribute> GetAttributes(this ICustomAttributeProvider provider, bool inherit = true)
-		{
-			if (provider is null)
-				throw new ArgumentNullException(nameof(provider));
+	/// <summary>
+	/// Retrieves all custom attributes from the provider, optionally searching the ancestors.
+	/// </summary>
+	/// <param name="provider">The attribute provider to search.</param>
+	/// <param name="inherit">true to inspect the ancestors of the provider; otherwise, false.</param>
+	/// <returns>An enumerable collection of custom attributes.</returns>
+	public static IEnumerable<Attribute> GetAttributes(this ICustomAttributeProvider provider, bool inherit = true)
+	{
+		if (provider is null)
+			throw new ArgumentNullException(nameof(provider));
 
-			return provider.GetCustomAttributes(inherit).Cast<Attribute>();
-		}
+		return provider.GetCustomAttributes(inherit).Cast<Attribute>();
+	}
 
-		// Note: This private method does not require XML documentation.
-		private static TValue SafeAdd<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key, Func<TKey, TValue> handler)
-		{
-			if (dictionary is null)
-				throw new ArgumentNullException(nameof(dictionary));
+	// Note: This private method does not require XML documentation.
+	private static TValue SafeAdd<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key, Func<TKey, TValue> handler)
+	{
+		if (dictionary is null)
+			throw new ArgumentNullException(nameof(dictionary));
 
-			if (handler is null)
-				throw new ArgumentNullException(nameof(handler));
+		if (handler is null)
+			throw new ArgumentNullException(nameof(handler));
 
-			if (!dictionary.TryGetValue(key, out var value))
+		if (!dictionary.TryGetValue(key, out var value))
+		{
+			lock (dictionary)
 			{
-				lock (dictionary)
+				if (!dictionary.TryGetValue(key, out value))
 				{
-					if (!dictionary.TryGetValue(key, out value))
-					{
-						value = handler(key);
-						dictionary.Add(key, value);
-					}
+					value = handler(key);
+					dictionary.Add(key, value);
 				}
 			}
-
-			return value;
 		}
 
-		/// <summary>
-		/// Determines whether the provider is marked with the <see cref="ObsoleteAttribute"/>.
-		/// </summary>
-		/// <param name="provider">The attribute provider to check.</param>
-		/// <returns>true if the provider has the <see cref="ObsoleteAttribute"/>; otherwise, false.</returns>
-		public static bool IsObsolete(this ICustomAttributeProvider provider)
-		{
-			if (provider is null)
-				throw new ArgumentNullException(nameof(provider));
+		return value;
+	}
 
-			return provider.GetAttribute<ObsoleteAttribute>() != null;
-		}
+	/// <summary>
+	/// Determines whether the provider is marked with the <see cref="ObsoleteAttribute"/>.
+	/// </summary>
+	/// <param name="provider">The attribute provider to check.</param>
+	/// <returns>true if the provider has the <see cref="ObsoleteAttribute"/>; otherwise, false.</returns>
+	public static bool IsObsolete(this ICustomAttributeProvider provider)
+	{
+		if (provider is null)
+			throw new ArgumentNullException(nameof(provider));
 
-		/// <summary>
-		/// Determines whether the provider is marked as browsable via the <see cref="BrowsableAttribute"/>.
-		/// </summary>
-		/// <param name="provider">The attribute provider to check.</param>
-		/// <returns>
-		/// true if the <see cref="BrowsableAttribute"/> is not present or its <see cref="BrowsableAttribute.Browsable"/> property is true; otherwise, false.
-		/// </returns>
-		public static bool IsBrowsable(this ICustomAttributeProvider provider)
-		{
-			if (provider is null)
-				throw new ArgumentNullException(nameof(provider));
+		return provider.GetAttribute<ObsoleteAttribute>() != null;
+	}
 
-			return provider.GetAttribute<BrowsableAttribute>()?.Browsable != false;
-		}
+	/// <summary>
+	/// Determines whether the provider is marked as browsable via the <see cref="BrowsableAttribute"/>.
+	/// </summary>
+	/// <param name="provider">The attribute provider to check.</param>
+	/// <returns>
+	/// true if the <see cref="BrowsableAttribute"/> is not present or its <see cref="BrowsableAttribute.Browsable"/> property is true; otherwise, false.
+	/// </returns>
+	public static bool IsBrowsable(this ICustomAttributeProvider provider)
+	{
+		if (provider is null)
+			throw new ArgumentNullException(nameof(provider));
+
+		return provider.GetAttribute<BrowsableAttribute>()?.Browsable != false;
 	}
 }
\ No newline at end of file
diff --git a/Common/CloneHelper.cs b/Common/CloneHelper.cs
index 8739baf7..0e42015a 100644
--- a/Common/CloneHelper.cs
+++ b/Common/CloneHelper.cs
@@ -1,27 +1,26 @@
-namespace Ecng.Common
-{
-	using System;
+namespace Ecng.Common;
+
+using System;
 
+/// <summary>
+/// Provides helper methods for performing cloning operations on objects that implement the ICloneable interface.
+/// </summary>
+public static class CloneHelper
+{
 	/// <summary>
-	/// Provides helper methods for performing cloning operations on objects that implement the ICloneable interface.
+	/// Creates a clone of the specified object.
 	/// </summary>
-	public static class CloneHelper
+	/// <typeparam name="T">A type that implements ICloneable.</typeparam>
+	/// <param name="value">The object to clone.</param>
+	/// <returns>A cloned instance of the object.</returns>
+	public static T TypedClone<T>(this T value)
+		where T : ICloneable
 	{
-		/// <summary>
-		/// Creates a clone of the specified object.
-		/// </summary>
-		/// <typeparam name="T">A type that implements ICloneable.</typeparam>
-		/// <param name="value">The object to clone.</param>
-		/// <returns>A cloned instance of the object.</returns>
-		public static T TypedClone<T>(this T value)
-			where T : ICloneable
-		{
-			return (T)value.Clone();
-		}
-
-		/// <summary>
-		/// Represents a marker helper class indicating that UI-related parts should be excluded during cloning.
-		/// </summary>
-		public class CloneWithoutUI {}
+		return (T)value.Clone();
 	}
+
+	/// <summary>
+	/// Represents a marker helper class indicating that UI-related parts should be excluded during cloning.
+	/// </summary>
+	public class CloneWithoutUI {}
 }
diff --git a/Common/Cloneable.cs b/Common/Cloneable.cs
index 8c69543d..384c685c 100644
--- a/Common/Cloneable.cs
+++ b/Common/Cloneable.cs
@@ -1,40 +1,35 @@
-namespace Ecng.Common
-{
-	#region Using Directives
-
-	using System;
+namespace Ecng.Common;
 
-	#endregion
+using System;
 
+/// <summary>
+/// The base class for objects that can be cloned.
+/// </summary>
+/// <typeparam name="T">The type of cloned object.</typeparam>
+[Serializable]
+public abstract class Cloneable<T> : ICloneable<T>
+	//where T : Cloneable<T>
+{
 	/// <summary>
-	/// The base class for objects that can be cloned.
+	/// Creates a new object that is a copy of the current instance.
 	/// </summary>
-	/// <typeparam name="T">The type of cloned object.</typeparam>
-	[Serializable]
-	public abstract class Cloneable<T> : ICloneable<T>
-		//where T : Cloneable<T>
-	{
-		/// <summary>
-		/// Creates a new object that is a copy of the current instance.
-		/// </summary>
-		/// <returns>
-		/// A new object that is a copy of this instance.
-		/// </returns>
-		public abstract T Clone();
-
-		#region ICloneable Members
+	/// <returns>
+	/// A new object that is a copy of this instance.
+	/// </returns>
+	public abstract T Clone();
 
-		/// <summary>
-		/// Creates a new object that is a copy of the current instance.
-		/// </summary>
-		/// <returns>
-		/// A new object that is a copy of this instance.
-		/// </returns>
-		object ICloneable.Clone()
-		{
-			return Clone();
-		}
+	#region ICloneable Members
 
-		#endregion
+	/// <summary>
+	/// Creates a new object that is a copy of the current instance.
+	/// </summary>
+	/// <returns>
+	/// A new object that is a copy of this instance.
+	/// </returns>
+	object ICloneable.Clone()
+	{
+		return Clone();
 	}
+
+	#endregion
 }
\ No newline at end of file
diff --git a/Common/CompareHelper.cs b/Common/CompareHelper.cs
index 1ef28add..69ff02f0 100644
--- a/Common/CompareHelper.cs
+++ b/Common/CompareHelper.cs
@@ -1,177 +1,176 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+using System;
+using System.Collections.Generic;
+using System.Net;
+
+/// <summary>
+/// Provides helper methods for comparing various types including IPAddress, Type, object, and Version.
+/// </summary>
+public static class CompareHelper
 {
-	using System;
-	using System.Collections.Generic;
-	using System.Net;
+	/// <summary>
+	/// Compares two IPAddress instances by converting them to a numeric value.
+	/// </summary>
+	/// <param name="first">The first IPAddress to compare.</param>
+	/// <param name="second">The second IPAddress to compare.</param>
+	/// <returns>
+	/// A signed integer that indicates the relative values of the two IP addresses.
+	/// Less than zero if first is less than second, zero if equal, and greater than zero if first is greater than second.
+	/// </returns>
+	public static int Compare(this IPAddress first, IPAddress second)
+	{
+		return first.To<long>().CompareTo(second.To<long>());
+	}
 
 	/// <summary>
-	/// Provides helper methods for comparing various types including IPAddress, Type, object, and Version.
+	/// Compares two Type instances for equality with an option to consider inheritance.
 	/// </summary>
-	public static class CompareHelper
+	/// <param name="first">The first Type to compare.</param>
+	/// <param name="second">The second Type to compare.</param>
+	/// <param name="useInheritance">If set to true, uses inheritance to determine equality.</param>
+	/// <returns>
+	/// True if the types are considered equal; otherwise, false.
+	/// </returns>
+	/// <exception cref="ArgumentNullException">Thrown if either <paramref name="first"/> or <paramref name="second"/> is null.</exception>
+	public static bool Compare(this Type first, Type second, bool useInheritance)
 	{
-		/// <summary>
-		/// Compares two IPAddress instances by converting them to a numeric value.
-		/// </summary>
-		/// <param name="first">The first IPAddress to compare.</param>
-		/// <param name="second">The second IPAddress to compare.</param>
-		/// <returns>
-		/// A signed integer that indicates the relative values of the two IP addresses.
-		/// Less than zero if first is less than second, zero if equal, and greater than zero if first is greater than second.
-		/// </returns>
-		public static int Compare(this IPAddress first, IPAddress second)
-		{
-			return first.To<long>().CompareTo(second.To<long>());
-		}
+		if (first is null)
+			throw new ArgumentNullException(nameof(first));
 
-		/// <summary>
-		/// Compares two Type instances for equality with an option to consider inheritance.
-		/// </summary>
-		/// <param name="first">The first Type to compare.</param>
-		/// <param name="second">The second Type to compare.</param>
-		/// <param name="useInheritance">If set to true, uses inheritance to determine equality.</param>
-		/// <returns>
-		/// True if the types are considered equal; otherwise, false.
-		/// </returns>
-		/// <exception cref="ArgumentNullException">Thrown if either <paramref name="first"/> or <paramref name="second"/> is null.</exception>
-		public static bool Compare(this Type first, Type second, bool useInheritance)
-		{
-			if (first is null)
-				throw new ArgumentNullException(nameof(first));
+		if (second is null)
+			throw new ArgumentNullException(nameof(second));
 
-			if (second is null)
-				throw new ArgumentNullException(nameof(second));
+		if (useInheritance)
+			return second.Is(first);
+		else
+			return first == second;
+	}
 
-			if (useInheritance)
-				return second.Is(first);
-			else
-				return first == second;
-		}
+	/// <summary>
+	/// Compares two Type instances with inheritance ordering.
+	/// </summary>
+	/// <param name="first">The first Type to compare.</param>
+	/// <param name="second">The second Type to compare.</param>
+	/// <returns>
+	/// 0 if the types are identical; 1 if <paramref name="second"/> is assignable from <paramref name="first"/>; otherwise, -1.
+	/// </returns>
+	/// <exception cref="ArgumentNullException">Thrown if either <paramref name="first"/> or <paramref name="second"/> is null.</exception>
+	public static int Compare(this Type first, Type second)
+	{
+		if (first is null)
+			throw new ArgumentNullException(nameof(first));
+
+		if (second is null)
+			throw new ArgumentNullException(nameof(second));
+
+		if (first == second)
+			return 0;
+		else if (second.Is(first))
+			return 1;
+		else
+			return -1;
+	}
 
-		/// <summary>
-		/// Compares two Type instances with inheritance ordering.
-		/// </summary>
-		/// <param name="first">The first Type to compare.</param>
-		/// <param name="second">The second Type to compare.</param>
-		/// <returns>
-		/// 0 if the types are identical; 1 if <paramref name="second"/> is assignable from <paramref name="first"/>; otherwise, -1.
-		/// </returns>
-		/// <exception cref="ArgumentNullException">Thrown if either <paramref name="first"/> or <paramref name="second"/> is null.</exception>
-		public static int Compare(this Type first, Type second)
-		{
-			if (first is null)
-				throw new ArgumentNullException(nameof(first));
+	/// <summary>
+	/// Compares two objects of the same type that implement <see cref="IComparable"/>.
+	/// </summary>
+	/// <param name="value1">The first object to compare.</param>
+	/// <param name="value2">The second object to compare.</param>
+	/// <returns>
+	/// A signed integer that indicates the relative values of the two objects.
+	/// Less than zero if <paramref name="value1"/> is less than <paramref name="value2"/>, zero if equal, and greater than zero if greater.
+	/// </returns>
+	/// <exception cref="ArgumentException">
+	/// Thrown if the objects are not of the same type or if they do not implement <see cref="IComparable"/>.
+	/// </exception>
+	public static int Compare(this object value1, object value2)
+	{
+		if (value1 is null && value2 is null)
+			return 0;
 
-			if (second is null)
-				throw new ArgumentNullException(nameof(second));
+		if (value1 is null)
+			return -1;
 
-			if (first == second)
-				return 0;
-			else if (second.Is(first))
-				return 1;
-			else
-				return -1;
-		}
+		if (value2 is null)
+			return 1;
 
-		/// <summary>
-		/// Compares two objects of the same type that implement <see cref="IComparable"/>.
-		/// </summary>
-		/// <param name="value1">The first object to compare.</param>
-		/// <param name="value2">The second object to compare.</param>
-		/// <returns>
-		/// A signed integer that indicates the relative values of the two objects.
-		/// Less than zero if <paramref name="value1"/> is less than <paramref name="value2"/>, zero if equal, and greater than zero if greater.
-		/// </returns>
-		/// <exception cref="ArgumentException">
-		/// Thrown if the objects are not of the same type or if they do not implement <see cref="IComparable"/>.
-		/// </exception>
-		public static int Compare(this object value1, object value2)
-		{
-			if (value1 is null && value2 is null)
-				return 0;
+		if (value1.GetType() != value2.GetType())
+			throw new ArgumentException("The values must be a same types.", nameof(value2));
 
-			if (value1 is null)
-				return -1;
 
-			if (value2 is null)
-				return 1;
-
-			if (value1.GetType() != value2.GetType())
-				throw new ArgumentException("The values must be a same types.", nameof(value2));
+		if (value1 is IComparable compare1)
+			return compare1.CompareTo(value2);
 
+		throw new ArgumentException("The values must be IComparable.");
+	}
 
-			if (value1 is IComparable compare1)
-				return compare1.CompareTo(value2);
+	/// <summary>
+	/// Determines whether a value is equal to its default value.
+	/// </summary>
+	/// <typeparam name="T">The type of the value.</typeparam>
+	/// <param name="value">The value to check.</param>
+	/// <returns>
+	/// True if the value equals the default value of its type; otherwise, false.
+	/// </returns>
+	public static bool IsDefault<T>(this T value)
+	{
+		return EqualityComparer<T>.Default.Equals(value, default);
+	}
 
-			throw new ArgumentException("The values must be IComparable.");
-		}
+	/// <summary>
+	/// Determines whether a value is equal to the default value as computed at runtime.
+	/// </summary>
+	/// <typeparam name="T">The type of the value.</typeparam>
+	/// <param name="value">The value to check.</param>
+	/// <returns>
+	/// True if the value equals the runtime default value; otherwise, false.
+	/// </returns>
+	public static bool IsRuntimeDefault<T>(this T value)
+	{
+		return EqualityComparer<T>.Default.Equals(value, (T)value.GetType().GetDefaultValue());
+	}
 
-		/// <summary>
-		/// Determines whether a value is equal to its default value.
-		/// </summary>
-		/// <typeparam name="T">The type of the value.</typeparam>
-		/// <param name="value">The value to check.</param>
-		/// <returns>
-		/// True if the value equals the default value of its type; otherwise, false.
-		/// </returns>
-		public static bool IsDefault<T>(this T value)
+	/// <summary>
+	/// Compares two Version instances.
+	/// </summary>
+	/// <param name="first">The first Version to compare.</param>
+	/// <param name="second">The second Version to compare.</param>
+	/// <returns>
+	/// A signed integer that indicates the relative values of the two versions.
+	/// Less than zero if <paramref name="first"/> is less than <paramref name="second"/>, zero if equal, and greater than zero if greater.
+	/// </returns>
+	public static int Compare(this Version first, Version second)
+	{
+		if (first is null)
 		{
-			return EqualityComparer<T>.Default.Equals(value, default);
-		}
+			if (second is null)
+				return 0;
 
-		/// <summary>
-		/// Determines whether a value is equal to the default value as computed at runtime.
-		/// </summary>
-		/// <typeparam name="T">The type of the value.</typeparam>
-		/// <param name="value">The value to check.</param>
-		/// <returns>
-		/// True if the value equals the runtime default value; otherwise, false.
-		/// </returns>
-		public static bool IsRuntimeDefault<T>(this T value)
-		{
-			return EqualityComparer<T>.Default.Equals(value, (T)value.GetType().GetDefaultValue());
+			return -1;
 		}
 
-		/// <summary>
-		/// Compares two Version instances.
-		/// </summary>
-		/// <param name="first">The first Version to compare.</param>
-		/// <param name="second">The second Version to compare.</param>
-		/// <returns>
-		/// A signed integer that indicates the relative values of the two versions.
-		/// Less than zero if <paramref name="first"/> is less than <paramref name="second"/>, zero if equal, and greater than zero if greater.
-		/// </returns>
-		public static int Compare(this Version first, Version second)
-		{
-			if (first is null)
-			{
-				if (second is null)
-					return 0;
-
-				return -1;
-			}
-
-			if (second is null)
-				return 1;
+		if (second is null)
+			return 1;
 
-			var firstBuild = first.Build != -1 ? first.Build : 0;
-			var firstRevision = first.Revision != -1 ? first.Revision : 0;
+		var firstBuild = first.Build != -1 ? first.Build : 0;
+		var firstRevision = first.Revision != -1 ? first.Revision : 0;
 
-			var secondBuild = second.Build != -1 ? second.Build : 0;
-			var secondRevision = second.Revision != -1 ? second.Revision : 0;
+		var secondBuild = second.Build != -1 ? second.Build : 0;
+		var secondRevision = second.Revision != -1 ? second.Revision : 0;
 
-			if (first.Major != second.Major)
-				return first.Major > second.Major ? 1 : -1;
-			
-			if (first.Minor != second.Minor)
-				return first.Minor > second.Minor ? 1 : -1;
+		if (first.Major != second.Major)
+			return first.Major > second.Major ? 1 : -1;
+		
+		if (first.Minor != second.Minor)
+			return first.Minor > second.Minor ? 1 : -1;
 
-			if (firstBuild != secondBuild)
-				return firstBuild > secondBuild ? 1 : -1;
+		if (firstBuild != secondBuild)
+			return firstBuild > secondBuild ? 1 : -1;
 
-			if (firstRevision == secondRevision)
-				return 0;
+		if (firstRevision == secondRevision)
+			return 0;
 
-			return firstRevision > secondRevision ? 1 : -1;
-		}
+		return firstRevision > secondRevision ? 1 : -1;
 	}
 }
\ No newline at end of file
diff --git a/Common/ComparisonOperator.cs b/Common/ComparisonOperator.cs
index 4e7cf4f1..72ad8110 100644
--- a/Common/ComparisonOperator.cs
+++ b/Common/ComparisonOperator.cs
@@ -1,58 +1,57 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+using System.ComponentModel.DataAnnotations;
+
+/// <summary>
+/// Represents the method for comparing two parameter values.
+/// </summary>
+public enum ComparisonOperator
 {
-	using System.ComponentModel.DataAnnotations;
-
-	/// <summary>
-	/// Represents the method for comparing two parameter values.
-	/// </summary>
-	public enum ComparisonOperator
-	{
-		/// <summary>
-		/// Indicates that the parameter values are equal.
-		/// </summary>
-		[Display(Name = "=")]
-		Equal,
-
-		/// <summary>
-		/// Indicates that the parameter values are not equal.
-		/// </summary>
-		[Display(Name = "!=")]
-		NotEqual,
-
-		/// <summary>
-		/// Indicates that the left parameter value is strictly greater than the right parameter value.
-		/// </summary>
-		[Display(Name = ">")]
-		Greater,
-
-		/// <summary>
-		/// Indicates that the left parameter value is greater than or equal to the right parameter value.
-		/// </summary>
-		[Display(Name = ">=")]
-		GreaterOrEqual,
-
-		/// <summary>
-		/// Indicates that the left parameter value is strictly less than the right parameter value.
-		/// </summary>
-		[Display(Name = "<")]
-		Less,
-
-		/// <summary>
-		/// Indicates that the left parameter value is less than or equal to the right parameter value.
-		/// </summary>
-		[Display(Name = "<=")]
-		LessOrEqual,
-
-		/// <summary>
-		/// Indicates that the left parameter value can be any value.
-		/// </summary>
-		[Display(Name = "Any")]
-		Any,
-
-		/// <summary>
-		/// Indicates that the left parameter value is contained within the right parameter value.
-		/// </summary>
-		[Display(Name = "IN")]
-		In,
-	}
+	/// <summary>
+	/// Indicates that the parameter values are equal.
+	/// </summary>
+	[Display(Name = "=")]
+	Equal,
+
+	/// <summary>
+	/// Indicates that the parameter values are not equal.
+	/// </summary>
+	[Display(Name = "!=")]
+	NotEqual,
+
+	/// <summary>
+	/// Indicates that the left parameter value is strictly greater than the right parameter value.
+	/// </summary>
+	[Display(Name = ">")]
+	Greater,
+
+	/// <summary>
+	/// Indicates that the left parameter value is greater than or equal to the right parameter value.
+	/// </summary>
+	[Display(Name = ">=")]
+	GreaterOrEqual,
+
+	/// <summary>
+	/// Indicates that the left parameter value is strictly less than the right parameter value.
+	/// </summary>
+	[Display(Name = "<")]
+	Less,
+
+	/// <summary>
+	/// Indicates that the left parameter value is less than or equal to the right parameter value.
+	/// </summary>
+	[Display(Name = "<=")]
+	LessOrEqual,
+
+	/// <summary>
+	/// Indicates that the left parameter value can be any value.
+	/// </summary>
+	[Display(Name = "Any")]
+	Any,
+
+	/// <summary>
+	/// Indicates that the left parameter value is contained within the right parameter value.
+	/// </summary>
+	[Display(Name = "IN")]
+	In,
 }
diff --git a/Common/ConsoleHelper.cs b/Common/ConsoleHelper.cs
index 6ea77ea6..a0da02b3 100644
--- a/Common/ConsoleHelper.cs
+++ b/Common/ConsoleHelper.cs
@@ -1,136 +1,135 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+using System;
+using System.Security;
+
+/// <summary>
+/// Provides helper methods for writing colored messages to the console and reading secure passwords.
+/// </summary>
+public static class ConsoleHelper
 {
-	using System;
-	using System.Security;
+	/// <summary>
+	/// Gets or sets the color used to display information messages.
+	/// </summary>
+	public static ConsoleColor Info = ConsoleColor.White;
+
+	/// <summary>
+	/// Gets or sets the color used to display warning messages.
+	/// </summary>
+	public static ConsoleColor Warning = ConsoleColor.Yellow;
 
 	/// <summary>
-	/// Provides helper methods for writing colored messages to the console and reading secure passwords.
+	/// Gets or sets the color used to display error messages.
 	/// </summary>
-	public static class ConsoleHelper
+	public static ConsoleColor Error = ConsoleColor.Red;
+
+	/// <summary>
+	/// Gets or sets the color used to display success messages.
+	/// </summary>
+	public static ConsoleColor Success = ConsoleColor.Green;
+
+	/// <summary>
+	/// Writes an information message to the console.
+	/// </summary>
+	/// <param name="message">The message to write.</param>
+	public static void ConsoleInfo(this string message)
 	{
-		/// <summary>
-		/// Gets or sets the color used to display information messages.
-		/// </summary>
-		public static ConsoleColor Info = ConsoleColor.White;
-
-		/// <summary>
-		/// Gets or sets the color used to display warning messages.
-		/// </summary>
-		public static ConsoleColor Warning = ConsoleColor.Yellow;
-
-		/// <summary>
-		/// Gets or sets the color used to display error messages.
-		/// </summary>
-		public static ConsoleColor Error = ConsoleColor.Red;
-
-		/// <summary>
-		/// Gets or sets the color used to display success messages.
-		/// </summary>
-		public static ConsoleColor Success = ConsoleColor.Green;
-
-		/// <summary>
-		/// Writes an information message to the console.
-		/// </summary>
-		/// <param name="message">The message to write.</param>
-		public static void ConsoleInfo(this string message)
-		{
-			Console.WriteLine(message);
-		}
+		Console.WriteLine(message);
+	}
 
-		/// <summary>
-		/// Writes a warning message to the console using the predefined warning color.
-		/// </summary>
-		/// <param name="message">The warning message to write.</param>
-		public static void ConsoleWarning(this string message)
-		{
-			message.ConsoleWithColor(Warning);
-		}
+	/// <summary>
+	/// Writes a warning message to the console using the predefined warning color.
+	/// </summary>
+	/// <param name="message">The warning message to write.</param>
+	public static void ConsoleWarning(this string message)
+	{
+		message.ConsoleWithColor(Warning);
+	}
 
-		/// <summary>
-		/// Writes an error message to the console using the predefined error color.
-		/// </summary>
-		/// <param name="message">The error message to write.</param>
-		public static void ConsoleError(this string message)
-		{
-			message.ConsoleWithColor(Error);
-		}
+	/// <summary>
+	/// Writes an error message to the console using the predefined error color.
+	/// </summary>
+	/// <param name="message">The error message to write.</param>
+	public static void ConsoleError(this string message)
+	{
+		message.ConsoleWithColor(Error);
+	}
 
-		/// <summary>
-		/// Writes a success message to the console using the predefined success color.
-		/// </summary>
-		/// <param name="message">The success message to write.</param>
-		public static void ConsoleSuccess(this string message)
-		{
-			message.ConsoleWithColor(Success);
-		}
+	/// <summary>
+	/// Writes a success message to the console using the predefined success color.
+	/// </summary>
+	/// <param name="message">The success message to write.</param>
+	public static void ConsoleSuccess(this string message)
+	{
+		message.ConsoleWithColor(Success);
+	}
 
-		/// <summary>
-		/// Writes a message to the console with the specified color.
-		/// </summary>
-		/// <param name="message">The message to write.</param>
-		/// <param name="color">The color to use for the message.</param>
-		public static void ConsoleWithColor(this string message, ConsoleColor color)
-		{
-			ConsoleWithColor(() => Console.WriteLine(message), color);
-		}
+	/// <summary>
+	/// Writes a message to the console with the specified color.
+	/// </summary>
+	/// <param name="message">The message to write.</param>
+	/// <param name="color">The color to use for the message.</param>
+	public static void ConsoleWithColor(this string message, ConsoleColor color)
+	{
+		ConsoleWithColor(() => Console.WriteLine(message), color);
+	}
+
+	private static readonly SyncObject _lock = new();
 
-		private static readonly SyncObject _lock = new();
+	/// <summary>
+	/// Executes the provided action while displaying console output in the specified color.
+	/// </summary>
+	/// <param name="handler">The action to execute.</param>
+	/// <param name="color">The color to use for the console output.</param>
+	/// <exception cref="ArgumentNullException">Thrown when the handler is null.</exception>
+	public static void ConsoleWithColor(this Action handler, ConsoleColor color)
+	{
+		if (handler is null)
+			throw new ArgumentNullException(nameof(handler));
 
-		/// <summary>
-		/// Executes the provided action while displaying console output in the specified color.
-		/// </summary>
-		/// <param name="handler">The action to execute.</param>
-		/// <param name="color">The color to use for the console output.</param>
-		/// <exception cref="ArgumentNullException">Thrown when the handler is null.</exception>
-		public static void ConsoleWithColor(this Action handler, ConsoleColor color)
+		lock (_lock)
 		{
-			if (handler is null)
-				throw new ArgumentNullException(nameof(handler));
+			var prevColor = Console.ForegroundColor;
 
-			lock (_lock)
+			Console.ForegroundColor = color;
+
+			try
 			{
-				var prevColor = Console.ForegroundColor;
-
-				Console.ForegroundColor = color;
-
-				try
-				{
-					handler();
-				}
-				finally
-				{
-					Console.ForegroundColor = prevColor;
-				}
+				handler();
+			}
+			finally
+			{
+				Console.ForegroundColor = prevColor;
 			}
 		}
+	}
+
+	/// <summary>
+	/// Reads a password from the console without displaying it, outputting a masked version.
+	/// </summary>
+	/// <returns>A <see cref="SecureString"/> that contains the password.</returns>
+	public static SecureString ReadPassword()
+	{
+		var pass = new SecureString();
+		ConsoleKeyInfo key;
 
-		/// <summary>
-		/// Reads a password from the console without displaying it, outputting a masked version.
-		/// </summary>
-		/// <returns>A <see cref="SecureString"/> that contains the password.</returns>
-		public static SecureString ReadPassword()
+		do
 		{
-			var pass = new SecureString();
-			ConsoleKeyInfo key;
+			key = Console.ReadKey(true);
 
-			do
+			if (!char.IsControl(key.KeyChar))
 			{
-				key = Console.ReadKey(true);
-
-				if (!char.IsControl(key.KeyChar))
-				{
-					pass.AppendChar(key.KeyChar);
-					Console.Write("*");
-				}
-				else if (key.Key == ConsoleKey.Backspace && pass.Length > 0)
-				{
-					pass.RemoveAt(pass.Length - 1);
-					Console.Write("\b \b");
-				}
+				pass.AppendChar(key.KeyChar);
+				Console.Write("*");
+			}
+			else if (key.Key == ConsoleKey.Backspace && pass.Length > 0)
+			{
+				pass.RemoveAt(pass.Length - 1);
+				Console.Write("\b \b");
 			}
-			while (key.Key != ConsoleKey.Enter);
-
-			return pass;
 		}
+		while (key.Key != ConsoleKey.Enter);
+
+		return pass;
 	}
 }
\ No newline at end of file
diff --git a/Common/Converter.cs b/Common/Converter.cs
index 5ed562db..8953824e 100644
--- a/Common/Converter.cs
+++ b/Common/Converter.cs
@@ -1,1151 +1,1150 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Data.Common;
+using System.IO;
+using System.Net;
+using System.Net.Sockets;
+using System.Reflection;
+using System.Security;
+using System.Text;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Globalization;
+using System.Threading;
+using System.Xml;
+using System.Xml.Linq;
+
+using TimeZoneConverter;
+
+/// <summary>
+/// The converter class.
+/// </summary>
+public static class Converter
 {
-	using System;
-	using System.Collections;
-	using System.Collections.Generic;
-	using System.ComponentModel;
-	using System.Data;
-	using System.Data.Common;
-	using System.IO;
-	using System.Net;
-	using System.Net.Sockets;
-	using System.Reflection;
-	using System.Security;
-	using System.Text;
-	using System.Linq;
-	using System.Runtime.InteropServices;
-	using System.Globalization;
-	using System.Threading;
-	using System.Xml;
-	using System.Xml.Linq;
-
-	using TimeZoneConverter;
+	private static readonly Dictionary<Type, DbType> _dbTypes = [];
+	private static readonly Dictionary<string, Type> _sharpAliases = [];
+	private static readonly Dictionary<Type, string> _sharpAliasesByValue = [];
+	private static readonly Dictionary<string, Type> _typeCache = [];
 
-	/// <summary>
-	/// The converter class.
-	/// </summary>
-	public static class Converter
-	{
-		private static readonly Dictionary<Type, DbType> _dbTypes = [];
-		private static readonly Dictionary<string, Type> _sharpAliases = [];
-		private static readonly Dictionary<Type, string> _sharpAliasesByValue = [];
-		private static readonly Dictionary<string, Type> _typeCache = [];
-
-		private static readonly Dictionary<(Type, Type), Delegate> _typedConverters = [];
-		private static readonly Dictionary<(Type, Type), Func<object, object>> _typedConverters2 = [];
+	private static readonly Dictionary<(Type, Type), Delegate> _typedConverters = [];
+	private static readonly Dictionary<(Type, Type), Func<object, object>> _typedConverters2 = [];
 
-		static Converter()
+	static Converter()
+	{
+		_dbTypes.Add(typeof(string), DbType.String);
+		_dbTypes.Add(typeof(char), DbType.String);
+		_dbTypes.Add(typeof(short), DbType.Int16);
+		_dbTypes.Add(typeof(int), DbType.Int32);
+		_dbTypes.Add(typeof(long), DbType.Int64);
+		_dbTypes.Add(typeof(ushort), DbType.UInt16);
+		_dbTypes.Add(typeof(uint), DbType.UInt32);
+		_dbTypes.Add(typeof(ulong), DbType.UInt64);
+		_dbTypes.Add(typeof(float), DbType.Single);
+		_dbTypes.Add(typeof(double), DbType.Double);
+		_dbTypes.Add(typeof(decimal), DbType.Decimal);
+		_dbTypes.Add(typeof(DateTime), DbType.DateTime);
+		_dbTypes.Add(typeof(DateTimeOffset), DbType.DateTimeOffset);
+		_dbTypes.Add(typeof(TimeSpan), DbType.Time);
+		_dbTypes.Add(typeof(Guid), DbType.Guid);
+		_dbTypes.Add(typeof(byte[]), DbType.Binary);
+		_dbTypes.Add(typeof(byte), DbType.Byte);
+		_dbTypes.Add(typeof(sbyte), DbType.SByte);
+		_dbTypes.Add(typeof(bool), DbType.Boolean);
+		_dbTypes.Add(typeof(object), DbType.Object);
+
+		AddCSharpAlias(typeof(object), "object");
+		AddCSharpAlias(typeof(bool), "bool");
+		AddCSharpAlias(typeof(byte), "byte");
+		AddCSharpAlias(typeof(sbyte), "sbyte");
+		AddCSharpAlias(typeof(char), "char");
+		AddCSharpAlias(typeof(decimal), "decimal");
+		AddCSharpAlias(typeof(double), "double");
+		AddCSharpAlias(typeof(float), "float");
+		AddCSharpAlias(typeof(int), "int");
+		AddCSharpAlias(typeof(uint), "uint");
+		AddCSharpAlias(typeof(long), "long");
+		AddCSharpAlias(typeof(ulong), "ulong");
+		AddCSharpAlias(typeof(short), "short");
+		AddCSharpAlias(typeof(ushort), "ushort");
+		AddCSharpAlias(typeof(string), "string");
+		AddCSharpAlias(typeof(void), "void");
+
+		AddTypedConverter<Type, DbType>(input =>
 		{
-			_dbTypes.Add(typeof(string), DbType.String);
-			_dbTypes.Add(typeof(char), DbType.String);
-			_dbTypes.Add(typeof(short), DbType.Int16);
-			_dbTypes.Add(typeof(int), DbType.Int32);
-			_dbTypes.Add(typeof(long), DbType.Int64);
-			_dbTypes.Add(typeof(ushort), DbType.UInt16);
-			_dbTypes.Add(typeof(uint), DbType.UInt32);
-			_dbTypes.Add(typeof(ulong), DbType.UInt64);
-			_dbTypes.Add(typeof(float), DbType.Single);
-			_dbTypes.Add(typeof(double), DbType.Double);
-			_dbTypes.Add(typeof(decimal), DbType.Decimal);
-			_dbTypes.Add(typeof(DateTime), DbType.DateTime);
-			_dbTypes.Add(typeof(DateTimeOffset), DbType.DateTimeOffset);
-			_dbTypes.Add(typeof(TimeSpan), DbType.Time);
-			_dbTypes.Add(typeof(Guid), DbType.Guid);
-			_dbTypes.Add(typeof(byte[]), DbType.Binary);
-			_dbTypes.Add(typeof(byte), DbType.Byte);
-			_dbTypes.Add(typeof(sbyte), DbType.SByte);
-			_dbTypes.Add(typeof(bool), DbType.Boolean);
-			_dbTypes.Add(typeof(object), DbType.Object);
-
-			AddCSharpAlias(typeof(object), "object");
-			AddCSharpAlias(typeof(bool), "bool");
-			AddCSharpAlias(typeof(byte), "byte");
-			AddCSharpAlias(typeof(sbyte), "sbyte");
-			AddCSharpAlias(typeof(char), "char");
-			AddCSharpAlias(typeof(decimal), "decimal");
-			AddCSharpAlias(typeof(double), "double");
-			AddCSharpAlias(typeof(float), "float");
-			AddCSharpAlias(typeof(int), "int");
-			AddCSharpAlias(typeof(uint), "uint");
-			AddCSharpAlias(typeof(long), "long");
-			AddCSharpAlias(typeof(ulong), "ulong");
-			AddCSharpAlias(typeof(short), "short");
-			AddCSharpAlias(typeof(ushort), "ushort");
-			AddCSharpAlias(typeof(string), "string");
-			AddCSharpAlias(typeof(void), "void");
-
-			AddTypedConverter<Type, DbType>(input =>
-			{
-				if (input.IsNullable())
-					input = input.GetGenericArguments()[0];
+			if (input.IsNullable())
+				input = input.GetGenericArguments()[0];
 
-				if (input.IsEnum())
-					input = input.GetEnumBaseType();
+			if (input.IsEnum())
+				input = input.GetEnumBaseType();
 
 
-				if (_dbTypes.TryGetValue(input, out var dbType))
-					return dbType;
-				else
-					throw new ArgumentException($".NET type {input} doesn't have associated db type.");
-			});
-
-			AddTypedConverter<DbType, Type>(input => _dbTypes.First(pair => pair.Value == input).Key);
-			AddTypedConverter<string, byte[]>(input => input.Unicode());
-			AddTypedConverter<byte[], string>(input => input.Unicode());
-			AddTypedConverter<bool[], BitArray>(input => new BitArray(input));
-			AddTypedConverter<BitArray, bool[]>(input =>
-			{
-				var source = new bool[input.Length];
-				input.CopyTo(source, 0);
-				return source;
-			});
-			AddTypedConverter<byte[], BitArray>(input => new BitArray(input));
-			AddTypedConverter<BitArray, byte[]>(input =>
-			{
-				var source = new byte[(int)((double)input.Length / 8).Ceiling()];
-				input.CopyTo(source, 0);
-				return source;
-			});
-			AddTypedConverter<IPAddress, string>(input => input.ToString());
-			AddTypedConverter<string, IPAddress>(s => s.IsEmpty() ? null : IPAddress.Parse(s));
-			AddTypedConverter<IPAddress, byte[]>(input => input.GetAddressBytes());
-			AddTypedConverter<byte[], IPAddress>(input => new IPAddress(input));
-			AddTypedConverter<IPAddress, long>(input =>
+			if (_dbTypes.TryGetValue(input, out var dbType))
+				return dbType;
+			else
+				throw new ArgumentException($".NET type {input} doesn't have associated db type.");
+		});
+
+		AddTypedConverter<DbType, Type>(input => _dbTypes.First(pair => pair.Value == input).Key);
+		AddTypedConverter<string, byte[]>(input => input.Unicode());
+		AddTypedConverter<byte[], string>(input => input.Unicode());
+		AddTypedConverter<bool[], BitArray>(input => new BitArray(input));
+		AddTypedConverter<BitArray, bool[]>(input =>
+		{
+			var source = new bool[input.Length];
+			input.CopyTo(source, 0);
+			return source;
+		});
+		AddTypedConverter<byte[], BitArray>(input => new BitArray(input));
+		AddTypedConverter<BitArray, byte[]>(input =>
+		{
+			var source = new byte[(int)((double)input.Length / 8).Ceiling()];
+			input.CopyTo(source, 0);
+			return source;
+		});
+		AddTypedConverter<IPAddress, string>(input => input.ToString());
+		AddTypedConverter<string, IPAddress>(s => s.IsEmpty() ? null : IPAddress.Parse(s));
+		AddTypedConverter<IPAddress, byte[]>(input => input.GetAddressBytes());
+		AddTypedConverter<byte[], IPAddress>(input => new IPAddress(input));
+		AddTypedConverter<IPAddress, long>(input =>
+		{
+			switch (input.AddressFamily)
 			{
-				switch (input.AddressFamily)
+				case AddressFamily.InterNetworkV6:
 				{
-					case AddressFamily.InterNetworkV6:
-					{
-						return input.ScopeId;
-					}
-					case AddressFamily.InterNetwork:
-					{
-						var byteIp = input.GetAddressBytes();
-						return ((((byteIp[3] << 0x18) | (byteIp[2] << 0x10)) | (byteIp[1] << 8)) | byteIp[0]) & (0xffffffff);
-						//retVal = BitConverter.ToInt32(addr.GetAddressBytes(), 0);
-					}
-					default:
-						throw new ArgumentException("Can't convert IPAddress to long.", nameof(input));
+					return input.ScopeId;
 				}
-			});
-			AddTypedConverter<long, IPAddress>(input => new IPAddress(input));
-			AddTypedConverter<string, IPEndPoint>(input => (IPEndPoint)input.TypedTo<string, EndPoint>());
-			AddTypedConverter<string, DnsEndPoint>(input => (DnsEndPoint)input.TypedTo<string, EndPoint>());
-			AddTypedConverter<string, EndPoint>(input =>
-			{
-				var index = input.LastIndexOf(':');
-
-				if (index != -1)
+				case AddressFamily.InterNetwork:
 				{
-					var host = input.Substring(0, index);
+					var byteIp = input.GetAddressBytes();
+					return ((((byteIp[3] << 0x18) | (byteIp[2] << 0x10)) | (byteIp[1] << 8)) | byteIp[0]) & (0xffffffff);
+					//retVal = BitConverter.ToInt32(addr.GetAddressBytes(), 0);
+				}
+				default:
+					throw new ArgumentException("Can't convert IPAddress to long.", nameof(input));
+			}
+		});
+		AddTypedConverter<long, IPAddress>(input => new IPAddress(input));
+		AddTypedConverter<string, IPEndPoint>(input => (IPEndPoint)input.TypedTo<string, EndPoint>());
+		AddTypedConverter<string, DnsEndPoint>(input => (DnsEndPoint)input.TypedTo<string, EndPoint>());
+		AddTypedConverter<string, EndPoint>(input =>
+		{
+			var index = input.LastIndexOf(':');
 
-					var portStr = input.Substring(index + 1);
-					if (portStr.Length > 0 && portStr.Last() == '/')
-						portStr = portStr.Substring(0, portStr.Length - 1);
+			if (index != -1)
+			{
+				var host = input.Substring(0, index);
 
-					var port = portStr.To<int>();
+				var portStr = input.Substring(index + 1);
+				if (portStr.Length > 0 && portStr.Last() == '/')
+					portStr = portStr.Substring(0, portStr.Length - 1);
 
-					if (!IPAddress.TryParse(host, out var addr))
-						return new DnsEndPoint(host, port);
+				var port = portStr.To<int>();
 
-					return new IPEndPoint(addr, port);
-				}
-				else
-				{
-					if (input.IsEmpty())
-						return null;
+				if (!IPAddress.TryParse(host, out var addr))
+					return new DnsEndPoint(host, port);
 
-					throw new FormatException("Invalid endpoint format.");
-				}
-			});
-			AddTypedConverter<EndPoint, string>(input => input.GetHost() + ":" + input.GetPort());
-			AddTypedConverter<string, Type>(input =>
+				return new IPEndPoint(addr, port);
+			}
+			else
 			{
-				var key = input.ToLowerInvariant();
+				if (input.IsEmpty())
+					return null;
 
-				if (_sharpAliases.TryGetValue(key, out var type))
-					return type;
+				throw new FormatException("Invalid endpoint format.");
+			}
+		});
+		AddTypedConverter<EndPoint, string>(input => input.GetHost() + ":" + input.GetPort());
+		AddTypedConverter<string, Type>(input =>
+		{
+			var key = input.ToLowerInvariant();
+
+			if (_sharpAliases.TryGetValue(key, out var type))
+				return type;
+
+			if (_typeCache.TryGetValue(key, out type))
+				return type;
 
+			lock (_typeCache)
+			{
 				if (_typeCache.TryGetValue(key, out type))
 					return type;
 
-				lock (_typeCache)
-				{
-					if (_typeCache.TryGetValue(key, out type))
-						return type;
-
-					type = Type.GetType(input, false, true);
+				type = Type.GetType(input, false, true);
 
-					// в строке может быть записаное не AssemblyQualifiedName, а только полное имя типа + имя сборки.
-					if (type is null)
+				// в строке может быть записаное не AssemblyQualifiedName, а только полное имя типа + имя сборки.
+				if (type is null)
+				{
+					var parts = input.SplitBySep(", ");
+					if (parts.Length == 2 || parts.Length == 5)
 					{
-						var parts = input.SplitBySep(", ");
-						if (parts.Length == 2 || parts.Length == 5)
+						var asm = AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault(a => a.GetName().Name == parts[1]);
+						
+						if (asm is null)
 						{
-							var asm = AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault(a => a.GetName().Name == parts[1]);
-							
-							if (asm is null)
+							try
 							{
-								try
-								{
-									asm = Assembly.Load(parts[1]);
-								}
-								catch (FileNotFoundException)
-								{
-								}
+								asm = Assembly.Load(parts[1]);
 							}
-
-							if (asm != null)
+							catch (FileNotFoundException)
 							{
-								type = asm.GetType(parts[0]);
 							}
+						}
+
+						if (asm != null)
+						{
+							type = asm.GetType(parts[0]);
+						}
+
+						if (type is null)
+						{
+							var asmName = parts[1].Trim();
 
-							if (type is null)
+							if	(
+								asmName.EqualsIgnoreCase("System.Private.CoreLib") ||
+								asmName.EqualsIgnoreCase("mscorlib")
+								)
 							{
-								var asmName = parts[1].Trim();
-
-								if	(
-									asmName.EqualsIgnoreCase("System.Private.CoreLib") ||
-									asmName.EqualsIgnoreCase("mscorlib")
-									)
-								{
-									asm = typeof(object).Assembly;
-									type = asm.GetType(parts[0]);
-								}
+								asm = typeof(object).Assembly;
+								type = asm.GetType(parts[0]);
 							}
 						}
 					}
-
-					if (type != null)
-						_typeCache.Add(key, type);
-					else
-						throw new ArgumentException($"Type {input} doesn't exists.", nameof(input));
 				}
 
-				return type;
-			});
-			AddTypedConverter<Type, string>(input => input.AssemblyQualifiedName);
-			AddTypedConverter<StringBuilder, string>(input => input.ToString());
-			AddTypedConverter<string, StringBuilder>(input => new StringBuilder(input));
-			AddTypedConverter<DbConnectionStringBuilder, string>(input => input.ToString());
-			AddTypedConverter<string, DbConnectionStringBuilder>(input => new DbConnectionStringBuilder { ConnectionString = input });
-			AddTypedConverter<SecureString, string>(input => input.UnSecure());
-			AddTypedConverter<string, SecureString>(input => input.Secure());
-			AddTypedConverter<char[], SecureString>(input =>
+				if (type != null)
+					_typeCache.Add(key, type);
+				else
+					throw new ArgumentException($"Type {input} doesn't exists.", nameof(input));
+			}
+
+			return type;
+		});
+		AddTypedConverter<Type, string>(input => input.AssemblyQualifiedName);
+		AddTypedConverter<StringBuilder, string>(input => input.ToString());
+		AddTypedConverter<string, StringBuilder>(input => new StringBuilder(input));
+		AddTypedConverter<DbConnectionStringBuilder, string>(input => input.ToString());
+		AddTypedConverter<string, DbConnectionStringBuilder>(input => new DbConnectionStringBuilder { ConnectionString = input });
+		AddTypedConverter<SecureString, string>(input => input.UnSecure());
+		AddTypedConverter<string, SecureString>(input => input.Secure());
+		AddTypedConverter<char[], SecureString>(input =>
+		{
+			unsafe static SecureString Secure(char[] input)
 			{
-				unsafe static SecureString Secure(char[] input)
-				{
-					if (input.Length == 0)
-						return new();
+				if (input.Length == 0)
+					return new();
 
-					fixed (char* p = input)
-						return new(p, input.Length);
-				}
+				fixed (char* p = input)
+					return new(p, input.Length);
+			}
 
-				return Secure(input);
-			});
-			AddTypedConverter<byte[], SecureString>(input =>
-			{
-				var charArray = new char[input.Length / 2];
-
-				var offset = 0;
-				for (var i = 0; i < input.Length; i += 2)
-					charArray[offset++] = BitConverter.ToChar([input[i], input[i + 1]], 0);
-
-				return charArray.TypedTo<char[], SecureString>();
-			});
-			AddTypedConverter<string, char[]>(input => input.ToCharArray());
-			AddTypedConverter<char[], string>(input => new string(input));
-			AddTypedConverter<byte, byte[]>(input => [input]);
-			AddTypedConverter<byte[], byte>(input => input[0]);
-			AddTypedConverter<bool, byte[]>(BitConverter.GetBytes);
-			AddTypedConverter<byte[], bool>(input => BitConverter.ToBoolean(input, 0));
-			AddTypedConverter<char, byte[]>(BitConverter.GetBytes);
-			AddTypedConverter<byte[], char>(input => BitConverter.ToChar(input, 0));
-			AddTypedConverter<short, byte[]>(BitConverter.GetBytes);
-			AddTypedConverter<byte[], short>(input => BitConverter.ToInt16(input, 0));
-			AddTypedConverter<int, byte[]>(BitConverter.GetBytes);
-			AddTypedConverter<byte[], int>(input => BitConverter.ToInt32(input, 0));
-			AddTypedConverter<long, byte[]>(BitConverter.GetBytes);
-			AddTypedConverter<byte[], long>(input => BitConverter.ToInt64(input, 0));
-			AddTypedConverter<ushort, byte[]>(BitConverter.GetBytes);
-			AddTypedConverter<byte[], ushort>(input => BitConverter.ToUInt16(input, 0));
-			AddTypedConverter<uint, byte[]>(BitConverter.GetBytes);
-			AddTypedConverter<byte[], uint>(input => BitConverter.ToUInt32(input, 0));
-			AddTypedConverter<ulong, byte[]>(BitConverter.GetBytes);
-			AddTypedConverter<byte[], ulong>(input => BitConverter.ToUInt64(input, 0));
-			AddTypedConverter<float, byte[]>(BitConverter.GetBytes);
-			AddTypedConverter<byte[], float>(input => BitConverter.ToSingle(input, 0));
-			AddTypedConverter<double, byte[]>(BitConverter.GetBytes);
-			AddTypedConverter<byte[], double>(input => BitConverter.ToDouble(input, 0));
-			AddTypedConverter<DateTime, byte[]>(input => BitConverter.GetBytes(input.Ticks));
-			AddTypedConverter<byte[], DateTime>(input => new DateTime(BitConverter.ToInt64(input, 0)));
-			AddTypedConverter<DateTimeOffset, byte[]>(input => BitConverter.GetBytes(input.UtcTicks));
-			AddTypedConverter<byte[], DateTimeOffset>(input => new DateTimeOffset(BitConverter.ToInt64(input, 0), TimeSpan.Zero));
-			AddTypedConverter<TimeSpan, byte[]>(input => BitConverter.GetBytes(input.Ticks));
-			AddTypedConverter<byte[], TimeSpan>(input => new TimeSpan(BitConverter.ToInt64(input, 0)));
-			AddTypedConverter<Guid, byte[]>(input => input.ToByteArray());
-			AddTypedConverter<byte[], Guid>(input => new Guid(input));
-
-			AddTypedConverter<decimal, byte[]>(input =>
-			{
-				var bits = decimal.GetBits(input);
-
-				var lo = bits[0];
-				var mid = bits[1];
-				var hi = bits[2];
-				var flags = bits[3];
-
-				var bytes = new byte[16];
-
-				bytes[0] = (byte)lo;
-				bytes[1] = (byte)(lo >> 8);
-				bytes[2] = (byte)(lo >> 0x10);
-				bytes[3] = (byte)(lo >> 0x18);
-				bytes[4] = (byte)mid;
-				bytes[5] = (byte)(mid >> 8);
-				bytes[6] = (byte)(mid >> 0x10);
-				bytes[7] = (byte)(mid >> 0x18);
-				bytes[8] = (byte)hi;
-				bytes[9] = (byte)(hi >> 8);
-				bytes[10] = (byte)(hi >> 0x10);
-				bytes[11] = (byte)(hi >> 0x18);
-				bytes[12] = (byte)flags;
-				bytes[13] = (byte)(flags >> 8);
-				bytes[14] = (byte)(flags >> 0x10);
-				bytes[15] = (byte)(flags >> 0x18);
-
-				return bytes;
-			});
-			AddTypedConverter<byte[], decimal>(input =>
-			{
-				var bytes = input;
+			return Secure(input);
+		});
+		AddTypedConverter<byte[], SecureString>(input =>
+		{
+			var charArray = new char[input.Length / 2];
+
+			var offset = 0;
+			for (var i = 0; i < input.Length; i += 2)
+				charArray[offset++] = BitConverter.ToChar([input[i], input[i + 1]], 0);
+
+			return charArray.TypedTo<char[], SecureString>();
+		});
+		AddTypedConverter<string, char[]>(input => input.ToCharArray());
+		AddTypedConverter<char[], string>(input => new string(input));
+		AddTypedConverter<byte, byte[]>(input => [input]);
+		AddTypedConverter<byte[], byte>(input => input[0]);
+		AddTypedConverter<bool, byte[]>(BitConverter.GetBytes);
+		AddTypedConverter<byte[], bool>(input => BitConverter.ToBoolean(input, 0));
+		AddTypedConverter<char, byte[]>(BitConverter.GetBytes);
+		AddTypedConverter<byte[], char>(input => BitConverter.ToChar(input, 0));
+		AddTypedConverter<short, byte[]>(BitConverter.GetBytes);
+		AddTypedConverter<byte[], short>(input => BitConverter.ToInt16(input, 0));
+		AddTypedConverter<int, byte[]>(BitConverter.GetBytes);
+		AddTypedConverter<byte[], int>(input => BitConverter.ToInt32(input, 0));
+		AddTypedConverter<long, byte[]>(BitConverter.GetBytes);
+		AddTypedConverter<byte[], long>(input => BitConverter.ToInt64(input, 0));
+		AddTypedConverter<ushort, byte[]>(BitConverter.GetBytes);
+		AddTypedConverter<byte[], ushort>(input => BitConverter.ToUInt16(input, 0));
+		AddTypedConverter<uint, byte[]>(BitConverter.GetBytes);
+		AddTypedConverter<byte[], uint>(input => BitConverter.ToUInt32(input, 0));
+		AddTypedConverter<ulong, byte[]>(BitConverter.GetBytes);
+		AddTypedConverter<byte[], ulong>(input => BitConverter.ToUInt64(input, 0));
+		AddTypedConverter<float, byte[]>(BitConverter.GetBytes);
+		AddTypedConverter<byte[], float>(input => BitConverter.ToSingle(input, 0));
+		AddTypedConverter<double, byte[]>(BitConverter.GetBytes);
+		AddTypedConverter<byte[], double>(input => BitConverter.ToDouble(input, 0));
+		AddTypedConverter<DateTime, byte[]>(input => BitConverter.GetBytes(input.Ticks));
+		AddTypedConverter<byte[], DateTime>(input => new DateTime(BitConverter.ToInt64(input, 0)));
+		AddTypedConverter<DateTimeOffset, byte[]>(input => BitConverter.GetBytes(input.UtcTicks));
+		AddTypedConverter<byte[], DateTimeOffset>(input => new DateTimeOffset(BitConverter.ToInt64(input, 0), TimeSpan.Zero));
+		AddTypedConverter<TimeSpan, byte[]>(input => BitConverter.GetBytes(input.Ticks));
+		AddTypedConverter<byte[], TimeSpan>(input => new TimeSpan(BitConverter.ToInt64(input, 0)));
+		AddTypedConverter<Guid, byte[]>(input => input.ToByteArray());
+		AddTypedConverter<byte[], Guid>(input => new Guid(input));
+
+		AddTypedConverter<decimal, byte[]>(input =>
+		{
+			var bits = decimal.GetBits(input);
+
+			var lo = bits[0];
+			var mid = bits[1];
+			var hi = bits[2];
+			var flags = bits[3];
+
+			var bytes = new byte[16];
+
+			bytes[0] = (byte)lo;
+			bytes[1] = (byte)(lo >> 8);
+			bytes[2] = (byte)(lo >> 0x10);
+			bytes[3] = (byte)(lo >> 0x18);
+			bytes[4] = (byte)mid;
+			bytes[5] = (byte)(mid >> 8);
+			bytes[6] = (byte)(mid >> 0x10);
+			bytes[7] = (byte)(mid >> 0x18);
+			bytes[8] = (byte)hi;
+			bytes[9] = (byte)(hi >> 8);
+			bytes[10] = (byte)(hi >> 0x10);
+			bytes[11] = (byte)(hi >> 0x18);
+			bytes[12] = (byte)flags;
+			bytes[13] = (byte)(flags >> 8);
+			bytes[14] = (byte)(flags >> 0x10);
+			bytes[15] = (byte)(flags >> 0x18);
 
-				var bits = new[]
-				{
-					((bytes[0] | (bytes[1] << 8)) | (bytes[2] << 0x10)) | (bytes[3] << 0x18), //lo
-					((bytes[4] | (bytes[5] << 8)) | (bytes[6] << 0x10)) | (bytes[7] << 0x18), //mid
-					((bytes[8] | (bytes[9] << 8)) | (bytes[10] << 0x10)) | (bytes[11] << 0x18), //hi
-					((bytes[12] | (bytes[13] << 8)) | (bytes[14] << 0x10)) | (bytes[15] << 0x18) //flags
-				};
+			return bytes;
+		});
+		AddTypedConverter<byte[], decimal>(input =>
+		{
+			var bytes = input;
 
-				return new decimal(bits);
-			});
+			var bits = new[]
+			{
+				((bytes[0] | (bytes[1] << 8)) | (bytes[2] << 0x10)) | (bytes[3] << 0x18), //lo
+				((bytes[4] | (bytes[5] << 8)) | (bytes[6] << 0x10)) | (bytes[7] << 0x18), //mid
+				((bytes[8] | (bytes[9] << 8)) | (bytes[10] << 0x10)) | (bytes[11] << 0x18), //hi
+				((bytes[12] | (bytes[13] << 8)) | (bytes[14] << 0x10)) | (bytes[15] << 0x18) //flags
+			};
 
-			AddTypedConverter<int[], decimal>(input => new decimal(input));
-			AddTypedConverter<decimal, int[]>(decimal.GetBits);
+			return new decimal(bits);
+		});
 
-			AddTypedConverter<TimeSpan, long>(input => input.Ticks);
-			AddTypedConverter<long, TimeSpan>(input => new TimeSpan(input));
-			AddTypedConverter<DateTime, long>(input => input.Ticks);
-			AddTypedConverter<long, DateTime>(input => new DateTime(input));
-			AddTypedConverter<DateTimeOffset, long>(input => input.UtcTicks);
-			AddTypedConverter<long, DateTimeOffset>(input => new DateTimeOffset(input, TimeSpan.Zero));
+		AddTypedConverter<int[], decimal>(input => new decimal(input));
+		AddTypedConverter<decimal, int[]>(decimal.GetBits);
 
-			AddTypedConverter<DateTime, double>(input => input.ToOADate());
-			AddTypedConverter<double, DateTime>(DateTime.FromOADate);
+		AddTypedConverter<TimeSpan, long>(input => input.Ticks);
+		AddTypedConverter<long, TimeSpan>(input => new TimeSpan(input));
+		AddTypedConverter<DateTime, long>(input => input.Ticks);
+		AddTypedConverter<long, DateTime>(input => new DateTime(input));
+		AddTypedConverter<DateTimeOffset, long>(input => input.UtcTicks);
+		AddTypedConverter<long, DateTimeOffset>(input => new DateTimeOffset(input, TimeSpan.Zero));
 
-			AddTypedConverter<DateTime, DateTimeOffset>(input =>
-			{
-				if (input == DateTime.MinValue)
-					return DateTimeOffset.MinValue;
-				else if (input == DateTime.MaxValue)
-					return DateTimeOffset.MaxValue;
-				else
-					return new DateTimeOffset(input);
-			});
-			AddTypedConverter<DateTimeOffset, DateTime>(input =>
-			{
-				if (input == DateTimeOffset.MinValue)
-					return DateTime.MinValue;
-				else if (input == DateTimeOffset.MaxValue)
-					return DateTime.MaxValue;
-				else
-					return input.UtcDateTime;
-			});
-
-			AddTypedConverter<byte, string>(input => input.ToString());
-			AddTypedConverter<string, byte>(byte.Parse);
-			AddTypedConverter<sbyte, string>(input => input.ToString());
-			AddTypedConverter<string, sbyte>(sbyte.Parse);
-			AddTypedConverter<bool, string>(input => input.ToString());
-			AddTypedConverter<string, bool>(input =>
-			{
-				if (input == "1")
-					return true;
-				else if (input == "0")
-					return false;
-				else
-					return bool.Parse(input);
-			});
-			AddTypedConverter<string, bool?>(s => s.IsEmpty() ? null : s.To<bool>());
-			AddTypedConverter<float, string>(input => input.ToString());
-			AddTypedConverter<string, float>(float.Parse);
-			AddTypedConverter<string, float?>(s => s.IsEmpty() ? null : float.Parse(s));
-			AddTypedConverter<double, string>(input => input.ToString());
-			AddTypedConverter<string, double>(double.Parse);
-			AddTypedConverter<string, double?>(s => s.IsEmpty() ? null : double.Parse(s));
-			AddTypedConverter<decimal, string>(input => input.ToString());
-			AddTypedConverter<string, decimal>(decimal.Parse);
-			AddTypedConverter<string, decimal?>(s => s.IsEmpty() ? null : decimal.Parse(s));
-			AddTypedConverter<short, string>(input => input.ToString());
-			AddTypedConverter<string, short>(short.Parse);
-			AddTypedConverter<string, short?>(s => s.IsEmpty() ? null : short.Parse(s));
-			AddTypedConverter<int, string>(input => input.ToString());
-			AddTypedConverter<string, int>(int.Parse);
-			AddTypedConverter<string, int?>(s => s.IsEmpty() ? null : int.Parse(s));
-			AddTypedConverter<long, string>(input => input.ToString());
-			AddTypedConverter<string, long>(long.Parse);
-			AddTypedConverter<string, long?>(s => s.IsEmpty() ? null : long.Parse(s));
-			AddTypedConverter<ushort, string>(input => input.ToString());
-			AddTypedConverter<string, ushort>(ushort.Parse);
-			AddTypedConverter<string, ushort?>(s => s.IsEmpty() ? null : ushort.Parse(s));
-			AddTypedConverter<uint, string>(input => input.ToString());
-			AddTypedConverter<string, uint>(uint.Parse);
-			AddTypedConverter<string, uint?>(s => s.IsEmpty() ? null : uint.Parse(s));
-			AddTypedConverter<ulong, string>(input => input.ToString());
-			AddTypedConverter<string, ulong>(ulong.Parse);
-			AddTypedConverter<string, ulong?>(s => s.IsEmpty() ? null : ulong.Parse(s));
-			AddTypedConverter<char, string>(input => input.ToString());
-			AddTypedConverter<string, char>(char.Parse);
-			AddTypedConverter<OSPlatform, string>(input => input.ToString());
-			AddTypedConverter<string, OSPlatform>(OSPlatform.Create);
-			AddTypedConverter<CultureInfo, string>(input => input.Name);
-			AddTypedConverter<string, CultureInfo>(CultureInfo.GetCultureInfo);
-			AddTypedConverter<Uri, string>(input => input.ToString());
-			AddTypedConverter<string, Uri>(input => new(input));
-			AddTypedConverter<Version, string>(input => input.ToString());
-			AddTypedConverter<string, Version>(input => new(input));
-			AddTypedConverter<Encoding, int>(input => input.CodePage);
-			AddTypedConverter<int, Encoding>(input => Encoding.GetEncoding(input));
-			AddTypedConverter<CultureInfo, int>(input => input.LCID);
-			AddTypedConverter<int, CultureInfo>(input => new(input));
-			AddTypedConverter<IntPtr, int>(input => input.ToInt32());
-			AddTypedConverter<int, IntPtr>(input => new(input));
-			AddTypedConverter<IntPtr, long>(input => input.ToInt64());
-			AddTypedConverter<long, IntPtr>(input => new(input));
-			AddTypedConverter<UIntPtr, uint>(input => input.ToUInt32());
-			AddTypedConverter<uint, UIntPtr>(input => new(input));
-			AddTypedConverter<UIntPtr, ulong>(input => input.ToUInt64());
-			AddTypedConverter<ulong, UIntPtr>(input => new(input));
-			AddTypedConverter<TimeSpan, string>(input => input.ToString());
-			AddTypedConverter<string, TimeSpan>(TimeSpan.Parse);
-			AddTypedConverter<string, TimeSpan?>(s => s.IsEmpty() ? null : TimeSpan.Parse(s));
-			AddTypedConverter<Guid, string>(input => input.ToString());
-			AddTypedConverter<string, Guid>(Guid.Parse);
-			AddTypedConverter<string, Guid?>(s => s.IsEmpty() ? null : Guid.Parse(s));
-			AddTypedConverter<TimeZoneInfo, string>(input => input.Id);
-			AddTypedConverter<string, TimeZoneInfo>(s => TZConvert.TryGetTimeZoneInfo(s, out var tz) ? tz : TimeZoneInfo.Utc);
-		}
+		AddTypedConverter<DateTime, double>(input => input.ToOADate());
+		AddTypedConverter<double, DateTime>(DateTime.FromOADate);
 
-		/// <summary>
-		/// Adds a typed converter function for converting from TFrom to TTo type.
-		/// </summary>
-		/// <typeparam name="TFrom">The source type to convert from.</typeparam>
-		/// <typeparam name="TTo">The destination type to convert to.</typeparam>
-		/// <param name="converter">The converter function to add.</param>
-		/// <exception cref="ArgumentNullException">Thrown when converter is null.</exception>
-		public static void AddTypedConverter<TFrom, TTo>(Func<TFrom, TTo> converter)
+		AddTypedConverter<DateTime, DateTimeOffset>(input =>
+		{
+			if (input == DateTime.MinValue)
+				return DateTimeOffset.MinValue;
+			else if (input == DateTime.MaxValue)
+				return DateTimeOffset.MaxValue;
+			else
+				return new DateTimeOffset(input);
+		});
+		AddTypedConverter<DateTimeOffset, DateTime>(input =>
+		{
+			if (input == DateTimeOffset.MinValue)
+				return DateTime.MinValue;
+			else if (input == DateTimeOffset.MaxValue)
+				return DateTime.MaxValue;
+			else
+				return input.UtcDateTime;
+		});
+
+		AddTypedConverter<byte, string>(input => input.ToString());
+		AddTypedConverter<string, byte>(byte.Parse);
+		AddTypedConverter<sbyte, string>(input => input.ToString());
+		AddTypedConverter<string, sbyte>(sbyte.Parse);
+		AddTypedConverter<bool, string>(input => input.ToString());
+		AddTypedConverter<string, bool>(input =>
 		{
-			if (converter is null)
-				throw new ArgumentNullException(nameof(converter));
+			if (input == "1")
+				return true;
+			else if (input == "0")
+				return false;
+			else
+				return bool.Parse(input);
+		});
+		AddTypedConverter<string, bool?>(s => s.IsEmpty() ? null : s.To<bool>());
+		AddTypedConverter<float, string>(input => input.ToString());
+		AddTypedConverter<string, float>(float.Parse);
+		AddTypedConverter<string, float?>(s => s.IsEmpty() ? null : float.Parse(s));
+		AddTypedConverter<double, string>(input => input.ToString());
+		AddTypedConverter<string, double>(double.Parse);
+		AddTypedConverter<string, double?>(s => s.IsEmpty() ? null : double.Parse(s));
+		AddTypedConverter<decimal, string>(input => input.ToString());
+		AddTypedConverter<string, decimal>(decimal.Parse);
+		AddTypedConverter<string, decimal?>(s => s.IsEmpty() ? null : decimal.Parse(s));
+		AddTypedConverter<short, string>(input => input.ToString());
+		AddTypedConverter<string, short>(short.Parse);
+		AddTypedConverter<string, short?>(s => s.IsEmpty() ? null : short.Parse(s));
+		AddTypedConverter<int, string>(input => input.ToString());
+		AddTypedConverter<string, int>(int.Parse);
+		AddTypedConverter<string, int?>(s => s.IsEmpty() ? null : int.Parse(s));
+		AddTypedConverter<long, string>(input => input.ToString());
+		AddTypedConverter<string, long>(long.Parse);
+		AddTypedConverter<string, long?>(s => s.IsEmpty() ? null : long.Parse(s));
+		AddTypedConverter<ushort, string>(input => input.ToString());
+		AddTypedConverter<string, ushort>(ushort.Parse);
+		AddTypedConverter<string, ushort?>(s => s.IsEmpty() ? null : ushort.Parse(s));
+		AddTypedConverter<uint, string>(input => input.ToString());
+		AddTypedConverter<string, uint>(uint.Parse);
+		AddTypedConverter<string, uint?>(s => s.IsEmpty() ? null : uint.Parse(s));
+		AddTypedConverter<ulong, string>(input => input.ToString());
+		AddTypedConverter<string, ulong>(ulong.Parse);
+		AddTypedConverter<string, ulong?>(s => s.IsEmpty() ? null : ulong.Parse(s));
+		AddTypedConverter<char, string>(input => input.ToString());
+		AddTypedConverter<string, char>(char.Parse);
+		AddTypedConverter<OSPlatform, string>(input => input.ToString());
+		AddTypedConverter<string, OSPlatform>(OSPlatform.Create);
+		AddTypedConverter<CultureInfo, string>(input => input.Name);
+		AddTypedConverter<string, CultureInfo>(CultureInfo.GetCultureInfo);
+		AddTypedConverter<Uri, string>(input => input.ToString());
+		AddTypedConverter<string, Uri>(input => new(input));
+		AddTypedConverter<Version, string>(input => input.ToString());
+		AddTypedConverter<string, Version>(input => new(input));
+		AddTypedConverter<Encoding, int>(input => input.CodePage);
+		AddTypedConverter<int, Encoding>(input => Encoding.GetEncoding(input));
+		AddTypedConverter<CultureInfo, int>(input => input.LCID);
+		AddTypedConverter<int, CultureInfo>(input => new(input));
+		AddTypedConverter<IntPtr, int>(input => input.ToInt32());
+		AddTypedConverter<int, IntPtr>(input => new(input));
+		AddTypedConverter<IntPtr, long>(input => input.ToInt64());
+		AddTypedConverter<long, IntPtr>(input => new(input));
+		AddTypedConverter<UIntPtr, uint>(input => input.ToUInt32());
+		AddTypedConverter<uint, UIntPtr>(input => new(input));
+		AddTypedConverter<UIntPtr, ulong>(input => input.ToUInt64());
+		AddTypedConverter<ulong, UIntPtr>(input => new(input));
+		AddTypedConverter<TimeSpan, string>(input => input.ToString());
+		AddTypedConverter<string, TimeSpan>(TimeSpan.Parse);
+		AddTypedConverter<string, TimeSpan?>(s => s.IsEmpty() ? null : TimeSpan.Parse(s));
+		AddTypedConverter<Guid, string>(input => input.ToString());
+		AddTypedConverter<string, Guid>(Guid.Parse);
+		AddTypedConverter<string, Guid?>(s => s.IsEmpty() ? null : Guid.Parse(s));
+		AddTypedConverter<TimeZoneInfo, string>(input => input.Id);
+		AddTypedConverter<string, TimeZoneInfo>(s => TZConvert.TryGetTimeZoneInfo(s, out var tz) ? tz : TimeZoneInfo.Utc);
+	}
 
-			var key = (typeof(TFrom), typeof(TTo));
+	/// <summary>
+	/// Adds a typed converter function for converting from TFrom to TTo type.
+	/// </summary>
+	/// <typeparam name="TFrom">The source type to convert from.</typeparam>
+	/// <typeparam name="TTo">The destination type to convert to.</typeparam>
+	/// <param name="converter">The converter function to add.</param>
+	/// <exception cref="ArgumentNullException">Thrown when converter is null.</exception>
+	public static void AddTypedConverter<TFrom, TTo>(Func<TFrom, TTo> converter)
+	{
+		if (converter is null)
+			throw new ArgumentNullException(nameof(converter));
 
-			_typedConverters.Add(key, converter);
-			_typedConverters2.Add(key, input => converter((TFrom)input));
-		}
+		var key = (typeof(TFrom), typeof(TTo));
 
-		/// <summary>
-		/// Adds a typed converter function for converting between specified types.
-		/// </summary>
-		/// <param name="key">Tuple containing source and destination types.</param>
-		/// <param name="converter">The converter function to add.</param>
-		/// <exception cref="ArgumentNullException">Thrown when converter is null.</exception>
-		public static void AddTypedConverter((Type, Type) key, Func<object, object> converter)
-		{
-			if (converter is null)
-				throw new ArgumentNullException(nameof(converter));
+		_typedConverters.Add(key, converter);
+		_typedConverters2.Add(key, input => converter((TFrom)input));
+	}
 
-			_typedConverters.Add(key, converter);
-			_typedConverters2.Add(key, converter);
-		}
+	/// <summary>
+	/// Adds a typed converter function for converting between specified types.
+	/// </summary>
+	/// <param name="key">Tuple containing source and destination types.</param>
+	/// <param name="converter">The converter function to add.</param>
+	/// <exception cref="ArgumentNullException">Thrown when converter is null.</exception>
+	public static void AddTypedConverter((Type, Type) key, Func<object, object> converter)
+	{
+		if (converter is null)
+			throw new ArgumentNullException(nameof(converter));
 
-		/// <summary>
-		/// Gets the typed converter function for converting between specified types.
-		/// </summary>
-		/// <typeparam name="TFrom">The source type to convert from.</typeparam>
-		/// <typeparam name="TTo">The destination type to convert to.</typeparam>
-		/// <returns>A converter function for the specified types.</returns>
-		public static Func<TFrom, TTo> GetTypedConverter<TFrom, TTo>()
-		{
-			return (Func<TFrom, TTo>)_typedConverters[(typeof(TFrom), typeof(TTo))];
-		}
+		_typedConverters.Add(key, converter);
+		_typedConverters2.Add(key, converter);
+	}
 
-		/// <summary>
-		/// Gets the typed converter function for converting between specified types.
-		/// </summary>
-		/// <param name="from">The source type to convert from.</param>
-		/// <param name="to">The destination type to convert to.</param>
-		/// <returns>A converter function for the specified types.</returns>
-		public static Func<object, object> GetTypedConverter(Type from, Type to)
-		{
-			return (Func<object, object>)_typedConverters[(from, to)];
-		}
+	/// <summary>
+	/// Gets the typed converter function for converting between specified types.
+	/// </summary>
+	/// <typeparam name="TFrom">The source type to convert from.</typeparam>
+	/// <typeparam name="TTo">The destination type to convert to.</typeparam>
+	/// <returns>A converter function for the specified types.</returns>
+	public static Func<TFrom, TTo> GetTypedConverter<TFrom, TTo>()
+	{
+		return (Func<TFrom, TTo>)_typedConverters[(typeof(TFrom), typeof(TTo))];
+	}
 
-		/// <summary>
-		/// Converts the value from source type to destination type using registered type converters.
-		/// </summary>
-		/// <typeparam name="TFrom">The source type to convert from.</typeparam>
-		/// <typeparam name="TTo">The destination type to convert to.</typeparam>
-		/// <param name="from">The value to convert.</param>
-		/// <returns>The converted value.</returns>
-		public static TTo TypedTo<TFrom, TTo>(this TFrom from)
-		{
-			return GetTypedConverter<TFrom, TTo>()(from);
-		}
+	/// <summary>
+	/// Gets the typed converter function for converting between specified types.
+	/// </summary>
+	/// <param name="from">The source type to convert from.</param>
+	/// <param name="to">The destination type to convert to.</param>
+	/// <returns>A converter function for the specified types.</returns>
+	public static Func<object, object> GetTypedConverter(Type from, Type to)
+	{
+		return (Func<object, object>)_typedConverters[(from, to)];
+	}
 
-		private static bool TryGetTypedConverter(Type from, Type to, out Func<object, object> typedConverter)
-		{
-			return _typedConverters2.TryGetValue((from, to), out typedConverter);
-		}
+	/// <summary>
+	/// Converts the value from source type to destination type using registered type converters.
+	/// </summary>
+	/// <typeparam name="TFrom">The source type to convert from.</typeparam>
+	/// <typeparam name="TTo">The destination type to convert to.</typeparam>
+	/// <param name="from">The value to convert.</param>
+	/// <returns>The converted value.</returns>
+	public static TTo TypedTo<TFrom, TTo>(this TFrom from)
+	{
+		return GetTypedConverter<TFrom, TTo>()(from);
+	}
+
+	private static bool TryGetTypedConverter(Type from, Type to, out Func<object, object> typedConverter)
+	{
+		return _typedConverters2.TryGetValue((from, to), out typedConverter);
+	}
+
+	/// <summary>
+	/// Convert value into a instance of <paramref name="destinationType"/>.
+	/// </summary>
+	/// <param name="value">The value.</param>
+	/// <param name="destinationType">Type of the destination.</param>
+	/// <returns>Converted object.</returns>
+	public static object To(this object value, Type destinationType)
+	{
+		if (destinationType is null)
+			throw new ArgumentNullException(nameof(destinationType));
 
-		/// <summary>
-		/// Convert value into a instance of <paramref name="destinationType"/>.
-		/// </summary>
-		/// <param name="value">The value.</param>
-		/// <param name="destinationType">Type of the destination.</param>
-		/// <returns>Converted object.</returns>
-		public static object To(this object value, Type destinationType)
+		try
 		{
-			if (destinationType is null)
-				throw new ArgumentNullException(nameof(destinationType));
+			if (value is null)
+			{
+				if ((destinationType.IsValueType || destinationType.IsEnum()) && !destinationType.IsNullable())
+					throw new ArgumentNullException(nameof(value));
+
+				return null;
+			}
 
-			try
+			Type GetValueType()
 			{
-				if (value is null)
-				{
-					if ((destinationType.IsValueType || destinationType.IsEnum()) && !destinationType.IsNullable())
-						throw new ArgumentNullException(nameof(value));
+				if (value is Type)
+					return typeof(Type);
+				else if (value is IPAddress)
+					return typeof(IPAddress);
+				else if (value is EndPoint)
+					return typeof(EndPoint);
+				else if (value is Encoding)
+					return typeof(Encoding);
+				else if (value is CultureInfo)
+					return typeof(CultureInfo);
+
+				var type = value.GetType();
+				type.EnsureRunClass();
+				return type;
+			}
 
-					return null;
-				}
+			destinationType.EnsureRunClass();
 
-				Type GetValueType()
-				{
-					if (value is Type)
-						return typeof(Type);
-					else if (value is IPAddress)
-						return typeof(IPAddress);
-					else if (value is EndPoint)
-						return typeof(EndPoint);
-					else if (value is Encoding)
-						return typeof(Encoding);
-					else if (value is CultureInfo)
-						return typeof(CultureInfo);
-
-					var type = value.GetType();
-					type.EnsureRunClass();
-					return type;
-				}
+			if (TryGetTypedConverter(GetValueType(), destinationType, out var typedConverter))
+				return typedConverter(value);
 
-				destinationType.EnsureRunClass();
+			var sourceType = value.GetType();
 
-				if (TryGetTypedConverter(GetValueType(), destinationType, out var typedConverter))
-					return typedConverter(value);
+			if (sourceType.Is(destinationType))
+				return value;
+			else if ((value is string || sourceType.IsPrimitive) && destinationType.IsEnum())
+			{
+				if (value is string s)
+					return Enum.Parse(destinationType, s, true);
+				else
+					return Enum.ToObject(destinationType, value);
+			}
+			else if (destinationType == typeof(Type[]))
+			{
+				if (value is not IEnumerable<object>)
+					value = new[] { value };
 
-				var sourceType = value.GetType();
+				return ((IEnumerable<object>)value).Select(arg => arg?.GetType() ?? typeof(void)).ToArray();
+			}
+			else if (value is Stream st1 && destinationType == typeof(string))
+			{
+				return st1.To<byte[]>().To<string>();
+			}
+			else if (value is Stream st2 && destinationType == typeof(byte[]))
+			{
+				MemoryStream output;
 
-				if (sourceType.Is(destinationType))
-					return value;
-				else if ((value is string || sourceType.IsPrimitive) && destinationType.IsEnum())
-				{
-					if (value is string s)
-						return Enum.Parse(destinationType, s, true);
-					else
-						return Enum.ToObject(destinationType, value);
-				}
-				else if (destinationType == typeof(Type[]))
+				if (st2 is MemoryStream memoryStream)
+					output = memoryStream;
+				else
 				{
-					if (value is not IEnumerable<object>)
-						value = new[] { value };
+					const int capacity = FileSizes.KB * 4;
 
-					return ((IEnumerable<object>)value).Select(arg => arg?.GetType() ?? typeof(void)).ToArray();
-				}
-				else if (value is Stream st1 && destinationType == typeof(string))
-				{
-					return st1.To<byte[]>().To<string>();
-				}
-				else if (value is Stream st2 && destinationType == typeof(byte[]))
-				{
-					MemoryStream output;
+					output = new MemoryStream(capacity);
 
-					if (st2 is MemoryStream memoryStream)
-						output = memoryStream;
-					else
-					{
-						const int capacity = FileSizes.KB * 4;
+					var buffer = new byte[FileSizes.KB];
 
-						output = new MemoryStream(capacity);
+					//int offset = 0;
 
-						var buffer = new byte[FileSizes.KB];
+					while (true)
+					{
+						int readBytes = st2.Read(buffer, 0, FileSizes.KB);
+						if (readBytes == 0)
+							break;
 
-						//int offset = 0;
+						output.Write(buffer, 0, readBytes);
+						//offset += readBytes;
+					}
+				}
 
-						while (true)
-						{
-							int readBytes = st2.Read(buffer, 0, FileSizes.KB);
-							if (readBytes == 0)
-								break;
+				return output.ToArray();
+			}
+			else if (value is ArraySegment<byte> seg && (destinationType == typeof(Stream) || destinationType == typeof(MemoryStream)))
+			{
+				return new MemoryStream(seg.Array, seg.Offset, seg.Count);
+			}
+			else if (value is byte[] ba && (destinationType == typeof(Stream) || destinationType == typeof(MemoryStream)))
+			{
+				var stream = new MemoryStream(ba.Length);
+				stream.Write(ba, 0, stream.Capacity);
+				stream.Position = 0;
+				return stream;
+			}
+			else if (value is string && (destinationType == typeof(Stream) || destinationType == typeof(MemoryStream)))
+			{
+				return value.To<byte[]>().To<Stream>();
+			}
+			else if (destinationType == typeof(byte[]))
+			{
+				if (value is Enum)
+					value = value.To(sourceType.GetEnumBaseType());
 
-							output.Write(buffer, 0, readBytes);
-							//offset += readBytes;
-						}
-					}
+				if (TryGetTypedConverter(GetValueType(), destinationType, out typedConverter))
+					return typedConverter(value);
+				else if (value is Array arr && ArrayCovariance(arr, destinationType, out var dest))
+					return dest;
+			}
+			else if (value is byte[] bytes)
+			{
+				Type enumType;
 
-					return output.ToArray();
-				}
-				else if (value is ArraySegment<byte> seg && (destinationType == typeof(Stream) || destinationType == typeof(MemoryStream)))
+				if (destinationType.IsEnum())
 				{
-					return new MemoryStream(seg.Array, seg.Offset, seg.Count);
+					enumType = destinationType;
+					destinationType = destinationType.GetEnumBaseType();
 				}
-				else if (value is byte[] ba && (destinationType == typeof(Stream) || destinationType == typeof(MemoryStream)))
+				else
+					enumType = null;
+
+				object retVal;
+
+				if (TryGetTypedConverter(typeof(byte[]), destinationType, out typedConverter))
+					retVal = typedConverter(value);
+				else if (destinationType.IsArray && ArrayCovariance(bytes, destinationType, out var dest))
+					return dest;
+				else
+					throw new ArgumentException($"Can't convert byte array to '{destinationType}'.", nameof(value));
+
+				if (enumType != null)
+					retVal = Enum.ToObject(enumType, retVal);
+
+				return retVal;
+			}
+			else if (value is DBNull)
+				return null;
+			else if (destinationType.GetUnderlyingType() is Type underlying)
+			{
+				if (value is null || (value is string s3 && s3.Length == 0))
 				{
-					var stream = new MemoryStream(ba.Length);
-					stream.Write(ba, 0, stream.Capacity);
-					stream.Position = 0;
-					return stream;
+					return destinationType.CreateInstance();
 				}
-				else if (value is string && (destinationType == typeof(Stream) || destinationType == typeof(MemoryStream)))
+				else
 				{
-					return value.To<byte[]>().To<Stream>();
+					if (destinationType == typeof(decimal?))
+						return value.To(typeof(decimal));
+					else if (destinationType == typeof(int?))
+						return value.To(typeof(int));
+					else if (destinationType == typeof(long?))
+						return value.To(typeof(long));
+					else
+						return destinationType.CreateInstance(value.To(underlying));
 				}
-				else if (destinationType == typeof(byte[]))
-				{
-					if (value is Enum)
-						value = value.To(sourceType.GetEnumBaseType());
+			}
+			else if (value is DateTime dt && destinationType == typeof(string))
+				return dt.Millisecond > 0 ? dt.ToString("o") : value.ToString();
+			else if (value is DateTimeOffset dto && destinationType == typeof(string))
+				return dto.Millisecond > 0 ? dto.ToString("o") : value.ToString();
+			else if (value is string str4 && destinationType == typeof(DateTimeOffset))
+				return DateTimeOffset.Parse(str4);
+			else if (value is string s6 && destinationType == typeof(XDocument))
+				return XDocument.Parse(s6);
+			else if (value is string s7 && destinationType == typeof(XElement))
+				return XElement.Parse(s7);
+			else if (value is XNode && destinationType == typeof(string))
+				return value.ToString();
+			else if (value is string s8 && destinationType == typeof(XmlDocument))
+			{
+				var doc = new XmlDocument();
+				doc.LoadXml(s8);
+				return doc;
+			}
+			else if (value is XmlNode n1 && destinationType == typeof(string))
+				return n1.OuterXml;
+			else
+			{
+				var attr = destinationType.GetAttribute<TypeConverterAttribute>();
 
-					if (TryGetTypedConverter(GetValueType(), destinationType, out typedConverter))
-						return typedConverter(value);
-					else if (value is Array arr && ArrayCovariance(arr, destinationType, out var dest))
-						return dest;
-				}
-				else if (value is byte[] bytes)
+				if (attr != null)
 				{
-					Type enumType;
+					var ctors = attr.ConverterTypeName.To<Type>().GetConstructors();
 
-					if (destinationType.IsEnum())
+					if (ctors.Length == 1)
 					{
-						enumType = destinationType;
-						destinationType = destinationType.GetEnumBaseType();
+						var ctor = ctors[0];
+						var converter = (TypeConverter)(ctor.GetParameters().Length == 0 ? ctor.Invoke(null) : ctor.Invoke([destinationType]));
+						if (converter.CanConvertFrom(sourceType))
+							return converter.ConvertFrom(value);
 					}
-					else
-						enumType = null;
-
-					object retVal;
-
-					if (TryGetTypedConverter(typeof(byte[]), destinationType, out typedConverter))
-						retVal = typedConverter(value);
-					else if (destinationType.IsArray && ArrayCovariance(bytes, destinationType, out var dest))
-						return dest;
-					else
-						throw new ArgumentException($"Can't convert byte array to '{destinationType}'.", nameof(value));
-
-					if (enumType != null)
-						retVal = Enum.ToObject(enumType, retVal);
-
-					return retVal;
 				}
-				else if (value is DBNull)
-					return null;
-				else if (destinationType.GetUnderlyingType() is Type underlying)
+
+				if (value is IConvertible)
 				{
-					if (value is null || (value is string s3 && s3.Length == 0))
+					try
 					{
-						return destinationType.CreateInstance();
+						return Convert.ChangeType(value, destinationType, null);
 					}
-					else
+					catch (InvalidCastException)
 					{
-						if (destinationType == typeof(decimal?))
-							return value.To(typeof(decimal));
-						else if (destinationType == typeof(int?))
-							return value.To(typeof(int));
-						else if (destinationType == typeof(long?))
-							return value.To(typeof(long));
-						else
-							return destinationType.CreateInstance(value.To(underlying));
+						if (FinalTry(ref value, sourceType, destinationType))
+							return value;
 					}
 				}
-				else if (value is DateTime dt && destinationType == typeof(string))
-					return dt.Millisecond > 0 ? dt.ToString("o") : value.ToString();
-				else if (value is DateTimeOffset dto && destinationType == typeof(string))
-					return dto.Millisecond > 0 ? dto.ToString("o") : value.ToString();
-				else if (value is string str4 && destinationType == typeof(DateTimeOffset))
-					return DateTimeOffset.Parse(str4);
-				else if (value is string s6 && destinationType == typeof(XDocument))
-					return XDocument.Parse(s6);
-				else if (value is string s7 && destinationType == typeof(XElement))
-					return XElement.Parse(s7);
-				else if (value is XNode && destinationType == typeof(string))
-					return value.ToString();
-				else if (value is string s8 && destinationType == typeof(XmlDocument))
-				{
-					var doc = new XmlDocument();
-					doc.LoadXml(s8);
-					return doc;
-				}
-				else if (value is XmlNode n1 && destinationType == typeof(string))
-					return n1.OuterXml;
-				else
-				{
-					var attr = destinationType.GetAttribute<TypeConverterAttribute>();
 
-					if (attr != null)
-					{
-						var ctors = attr.ConverterTypeName.To<Type>().GetConstructors();
+				if (value is Array arr && ArrayCovariance(arr, destinationType, out var dest))
+					return dest;
+				else if (value is ICovarianceEnumerable covarEnu && destinationType.GetGenericTypeDefinition() == typeof(IEnumerable<>))
+					return covarEnu.ChangeType(destinationType.GetGenericArguments().First());
 
-						if (ctors.Length == 1)
-						{
-							var ctor = ctors[0];
-							var converter = (TypeConverter)(ctor.GetParameters().Length == 0 ? ctor.Invoke(null) : ctor.Invoke([destinationType]));
-							if (converter.CanConvertFrom(sourceType))
-								return converter.ConvertFrom(value);
-						}
-					}
+				if (FinalTry(ref value, sourceType, destinationType))
+					return value;
+			}
 
-					if (value is IConvertible)
-					{
-						try
-						{
-							return Convert.ChangeType(value, destinationType, null);
-						}
-						catch (InvalidCastException)
-						{
-							if (FinalTry(ref value, sourceType, destinationType))
-								return value;
-						}
-					}
+			throw new ArgumentException($"Can't convert {value} of type '{value.GetType()}' to type '{destinationType}'.", nameof(value));
+		}
+		catch (Exception ex)
+		{
+			throw new InvalidCastException($"Can't convert {value} of type '{value?.GetType()}' to type '{destinationType}'.", ex);
+		}
+	}
 
-					if (value is Array arr && ArrayCovariance(arr, destinationType, out var dest))
-						return dest;
-					else if (value is ICovarianceEnumerable covarEnu && destinationType.GetGenericTypeDefinition() == typeof(IEnumerable<>))
-						return covarEnu.ChangeType(destinationType.GetGenericArguments().First());
+	private static bool ArrayCovariance(Array source, Type destinationType, out object result)
+	{
+		result = null;
 
-					if (FinalTry(ref value, sourceType, destinationType))
-						return value;
-				}
+		if (destinationType.IsArray)
+		{
+			var elemType = destinationType.GetElementType();
+			var destArr = Array.CreateInstance(elemType, source.Length);
 
-				throw new ArgumentException($"Can't convert {value} of type '{value.GetType()}' to type '{destinationType}'.", nameof(value));
-			}
-			catch (Exception ex)
-			{
-				throw new InvalidCastException($"Can't convert {value} of type '{value?.GetType()}' to type '{destinationType}'.", ex);
-			}
+			for (var i = 0; i < source.Length; i++)
+				destArr.SetValue(source.GetValue(i).To(elemType), i);
+
+			result = destArr;
+			return true;
+		}
+		else if (destinationType.GetGenericTypeDefinition() == typeof(IEnumerable<>))
+		{
+			var elemType = destinationType.GetGenericArguments().First();
+			result = new CovarianceEnumerable<object>(source).ChangeType(elemType);
+			return true;
 		}
+		else
+			return false;
+	}
+
+	private interface ICovarianceEnumerable
+	{
+		ICovarianceEnumerable ChangeType(Type newType);
+	}
 
-		private static bool ArrayCovariance(Array source, Type destinationType, out object result)
+	private class CovarianceEnumerable<T>(Array array) : IEnumerable<T>, ICovarianceEnumerable
+	{
+		private class CovarianceEnumerator : IEnumerator<T>
 		{
-			result = null;
+			private readonly Array _array;
+			private int _idx;
 
-			if (destinationType.IsArray)
+			public CovarianceEnumerator(Array array)
 			{
-				var elemType = destinationType.GetElementType();
-				var destArr = Array.CreateInstance(elemType, source.Length);
+				_array = array ?? throw new ArgumentNullException(nameof(array));
+				Reset();
+			}
 
-				for (var i = 0; i < source.Length; i++)
-					destArr.SetValue(source.GetValue(i).To(elemType), i);
+			public T Current => _array.GetValue(_idx).To<T>();
 
-				result = destArr;
-				return true;
-			}
-			else if (destinationType.GetGenericTypeDefinition() == typeof(IEnumerable<>))
+			object IEnumerator.Current => Current;
+
+			void IDisposable.Dispose()
 			{
-				var elemType = destinationType.GetGenericArguments().First();
-				result = new CovarianceEnumerable<object>(source).ChangeType(elemType);
-				return true;
 			}
-			else
-				return false;
-		}
-
-		private interface ICovarianceEnumerable
-		{
-			ICovarianceEnumerable ChangeType(Type newType);
-		}
 
-		private class CovarianceEnumerable<T>(Array array) : IEnumerable<T>, ICovarianceEnumerable
-		{
-			private class CovarianceEnumerator : IEnumerator<T>
+			bool IEnumerator.MoveNext()
 			{
-				private readonly Array _array;
-				private int _idx;
+				_idx++;
+				return _idx < _array.Length;
+			}
 
-				public CovarianceEnumerator(Array array)
-				{
-					_array = array ?? throw new ArgumentNullException(nameof(array));
-					Reset();
-				}
+			public void Reset()
+			{
+				_idx = -1;
+			}
+		}
 
-				public T Current => _array.GetValue(_idx).To<T>();
+		private readonly Array _array = array ?? throw new ArgumentNullException(nameof(array));
 
-				object IEnumerator.Current => Current;
+		public IEnumerator<T> GetEnumerator()
+			=> new CovarianceEnumerator(_array);
 
-				void IDisposable.Dispose()
-				{
-				}
+		IEnumerator IEnumerable.GetEnumerator()
+			=> GetEnumerator();
 
-				bool IEnumerator.MoveNext()
-				{
-					_idx++;
-					return _idx < _array.Length;
-				}
+		public ICovarianceEnumerable ChangeType(Type newType)
+			=> typeof(CovarianceEnumerable<>).Make(newType).CreateInstance<ICovarianceEnumerable>(_array);
+	}
 
-				public void Reset()
+	private static bool FinalTry(ref object value, Type sourceType, Type destinationType)
+	{
+		static bool IsConversion(MethodInfo mi)
+			=> mi.Name == "op_Implicit" || mi.Name == "op_Explicit";
+		
+		var method =
+			sourceType
+				.GetMethods(BindingFlags.Public | BindingFlags.Static)
+				.FirstOrDefault(mi => IsConversion(mi) && mi.ReturnType == destinationType)
+			??
+			destinationType
+				.GetMethods(BindingFlags.Public | BindingFlags.Static)
+				.FirstOrDefault(mi =>
 				{
-					_idx = -1;
-				}
-			}
+					if (!IsConversion(mi))
+						return false;
 
-			private readonly Array _array = array ?? throw new ArgumentNullException(nameof(array));
+					var parameters = mi.GetParameters();
 
-			public IEnumerator<T> GetEnumerator()
-				=> new CovarianceEnumerator(_array);
+					return parameters.Length == 1 && parameters[0].ParameterType == sourceType;
+				});
 
-			IEnumerator IEnumerable.GetEnumerator()
-				=> GetEnumerator();
+		if (method != null)
+			value = method.Invoke(null, [value]);
+		else if (destinationType == typeof(string))
+			value = value.ToString();
+		else
+			return false;
 
-			public ICovarianceEnumerable ChangeType(Type newType)
-				=> typeof(CovarianceEnumerable<>).Make(newType).CreateInstance<ICovarianceEnumerable>(_array);
-		}
+		return true;
+	}
 
-		private static bool FinalTry(ref object value, Type sourceType, Type destinationType)
-		{
-			static bool IsConversion(MethodInfo mi)
-				=> mi.Name == "op_Implicit" || mi.Name == "op_Explicit";
-			
-			var method =
-				sourceType
-					.GetMethods(BindingFlags.Public | BindingFlags.Static)
-					.FirstOrDefault(mi => IsConversion(mi) && mi.ReturnType == destinationType)
-				??
-				destinationType
-					.GetMethods(BindingFlags.Public | BindingFlags.Static)
-					.FirstOrDefault(mi =>
-					{
-						if (!IsConversion(mi))
-							return false;
+	//private static readonly Dictionary<Tuple<Type, Type>, MethodInfo> _castOperators = new Dictionary<Tuple<Type, Type>, MethodInfo>();
 
-						var parameters = mi.GetParameters();
+	/// <summary>
+	/// Convert value into a instance of destinationType.
+	/// </summary>
+	/// <param name="value">The value.</param>
+	/// <returns>Converted object.</returns>
+	public static T To<T>(this object value)
+	{
+		return (T)To(value, typeof(T));
+	}
 
-						return parameters.Length == 1 && parameters[0].ParameterType == sourceType;
-					});
+	/// <summary>
+	/// Adds a C# language alias for a type.
+	/// </summary>
+	/// <param name="type">The type to add an alias for.</param>
+	/// <param name="alias">The C# alias to associate with the type.</param>
+	/// <exception cref="ArgumentNullException">Thrown when type or alias is null.</exception>
+	/// <exception cref="ArgumentOutOfRangeException">Thrown when alias or type already exists.</exception>
+	public static void AddCSharpAlias(Type type, string alias)
+	{
+		if (type is null)
+			throw new ArgumentNullException(nameof(type));
 
-			if (method != null)
-				value = method.Invoke(null, [value]);
-			else if (destinationType == typeof(string))
-				value = value.ToString();
-			else
-				return false;
+		if (alias.IsEmpty())
+			throw new ArgumentNullException(nameof(alias));
 
-			return true;
-		}
+		if (_sharpAliases.ContainsKey(alias))
+			throw new ArgumentOutOfRangeException(nameof(alias));
 
-		//private static readonly Dictionary<Tuple<Type, Type>, MethodInfo> _castOperators = new Dictionary<Tuple<Type, Type>, MethodInfo>();
+		if (_sharpAliasesByValue.ContainsKey(type))
+			throw new ArgumentOutOfRangeException(nameof(type));
 
-		/// <summary>
-		/// Convert value into a instance of destinationType.
-		/// </summary>
-		/// <param name="value">The value.</param>
-		/// <returns>Converted object.</returns>
-		public static T To<T>(this object value)
-		{
-			return (T)To(value, typeof(T));
-		}
+		_sharpAliases.Add(alias, type);
+		_sharpAliasesByValue.Add(type, alias);
+	}
 
-		/// <summary>
-		/// Adds a C# language alias for a type.
-		/// </summary>
-		/// <param name="type">The type to add an alias for.</param>
-		/// <param name="alias">The C# alias to associate with the type.</param>
-		/// <exception cref="ArgumentNullException">Thrown when type or alias is null.</exception>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown when alias or type already exists.</exception>
-		public static void AddCSharpAlias(Type type, string alias)
-		{
-			if (type is null)
-				throw new ArgumentNullException(nameof(type));
+	/// <summary>
+	/// Attempts to get the C# language alias for a type.
+	/// </summary>
+	/// <param name="type">The type to get the alias for.</param>
+	/// <returns>The C# alias if found; otherwise null.</returns>
+	public static string TryGetCSharpAlias(this Type type)
+		=> _sharpAliasesByValue.TryGetValue(type, out var alias) ? alias : null;
 
-			if (alias.IsEmpty())
-				throw new ArgumentNullException(nameof(alias));
+	/// <summary>
+	/// Attempts to get a type by its C# language alias.
+	/// </summary>
+	/// <param name="alias">The C# alias to look up.</param>
+	/// <returns>The corresponding type if found; otherwise null.</returns>
+	public static Type TryGetTypeByCSharpAlias(this string alias)
+		=> _sharpAliases.TryGetValue(alias, out var type) ? type : null;
 
-			if (_sharpAliases.ContainsKey(alias))
-				throw new ArgumentOutOfRangeException(nameof(alias));
+	/// <summary>
+	/// Executes a function using the specified culture.
+	/// </summary>
+	/// <typeparam name="T">The return type of the function.</typeparam>
+	/// <param name="cultureInfo">The culture to use during execution.</param>
+	/// <param name="func">The function to execute.</param>
+	/// <returns>The result of the function execution.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when cultureInfo or func is null.</exception>
+	public static T DoInCulture<T>(this CultureInfo cultureInfo, Func<T> func)
+	{
+		if (func is null)
+			throw new ArgumentNullException(nameof(func));
 
-			if (_sharpAliasesByValue.ContainsKey(type))
-				throw new ArgumentOutOfRangeException(nameof(type));
+		var prevCi = Thread.CurrentThread.CurrentCulture;
+		Thread.CurrentThread.CurrentCulture = cultureInfo ?? throw new ArgumentNullException(nameof(cultureInfo));
 
-			_sharpAliases.Add(alias, type);
-			_sharpAliasesByValue.Add(type, alias);
+		try
+		{
+			return func();
 		}
-
-		/// <summary>
-		/// Attempts to get the C# language alias for a type.
-		/// </summary>
-		/// <param name="type">The type to get the alias for.</param>
-		/// <returns>The C# alias if found; otherwise null.</returns>
-		public static string TryGetCSharpAlias(this Type type)
-			=> _sharpAliasesByValue.TryGetValue(type, out var alias) ? alias : null;
-
-		/// <summary>
-		/// Attempts to get a type by its C# language alias.
-		/// </summary>
-		/// <param name="alias">The C# alias to look up.</param>
-		/// <returns>The corresponding type if found; otherwise null.</returns>
-		public static Type TryGetTypeByCSharpAlias(this string alias)
-			=> _sharpAliases.TryGetValue(alias, out var type) ? type : null;
-
-		/// <summary>
-		/// Executes a function using the specified culture.
-		/// </summary>
-		/// <typeparam name="T">The return type of the function.</typeparam>
-		/// <param name="cultureInfo">The culture to use during execution.</param>
-		/// <param name="func">The function to execute.</param>
-		/// <returns>The result of the function execution.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when cultureInfo or func is null.</exception>
-		public static T DoInCulture<T>(this CultureInfo cultureInfo, Func<T> func)
+		finally
 		{
-			if (func is null)
-				throw new ArgumentNullException(nameof(func));
-
-			var prevCi = Thread.CurrentThread.CurrentCulture;
-			Thread.CurrentThread.CurrentCulture = cultureInfo ?? throw new ArgumentNullException(nameof(cultureInfo));
-
-			try
-			{
-				return func();
-			}
-			finally
-			{
-				Thread.CurrentThread.CurrentCulture = prevCi;
-			}
+			Thread.CurrentThread.CurrentCulture = prevCi;
 		}
+	}
 
-		/// <summary>
-		/// Executes an action using the specified culture.
-		/// </summary>
-		/// <param name="cultureInfo">The culture to use during execution.</param>
-		/// <param name="action">The action to execute.</param>
-		/// <exception cref="ArgumentNullException">Thrown when cultureInfo or action is null.</exception>
-		public static void DoInCulture(this CultureInfo cultureInfo, Action action)
+	/// <summary>
+	/// Executes an action using the specified culture.
+	/// </summary>
+	/// <param name="cultureInfo">The culture to use during execution.</param>
+	/// <param name="action">The action to execute.</param>
+	/// <exception cref="ArgumentNullException">Thrown when cultureInfo or action is null.</exception>
+	public static void DoInCulture(this CultureInfo cultureInfo, Action action)
+	{
+		if (action is null)
+			throw new ArgumentNullException(nameof(action));
+
+		cultureInfo.DoInCulture<object>(() =>
 		{
-			if (action is null)
-				throw new ArgumentNullException(nameof(action));
+			action();
+			return null;
+		});
+	}
 
-			cultureInfo.DoInCulture<object>(() =>
-			{
-				action();
-				return null;
-			});
-		}
+	/// <summary>
+	/// Wraps a function to execute using the invariant culture.
+	/// </summary>
+	/// <typeparam name="T">The return type of the function.</typeparam>
+	/// <param name="func">The function to wrap.</param>
+	/// <returns>A function that executes using the invariant culture.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when func is null.</exception>
+	public static Func<T> AsInvariant<T>(this Func<T> func)
+	{
+		if (func is null)
+			throw new ArgumentNullException(nameof(func));
 
-		/// <summary>
-		/// Wraps a function to execute using the invariant culture.
-		/// </summary>
-		/// <typeparam name="T">The return type of the function.</typeparam>
-		/// <param name="func">The function to wrap.</param>
-		/// <returns>A function that executes using the invariant culture.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when func is null.</exception>
-		public static Func<T> AsInvariant<T>(this Func<T> func)
-		{
-			if (func is null)
-				throw new ArgumentNullException(nameof(func));
+		return () => Do.Invariant(func);
+	}
 
-			return () => Do.Invariant(func);
-		}
+	/// <summary>
+	/// Wraps an action to execute using the invariant culture.
+	/// </summary>
+	/// <param name="action">The action to wrap.</param>
+	/// <returns>An action that executes using the invariant culture.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when action is null.</exception>
+	public static Action AsInvariant(this Action action)
+	{
+		if (action is null)
+			throw new ArgumentNullException(nameof(action));
 
-		/// <summary>
-		/// Wraps an action to execute using the invariant culture.
-		/// </summary>
-		/// <param name="action">The action to wrap.</param>
-		/// <returns>An action that executes using the invariant culture.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when action is null.</exception>
-		public static Action AsInvariant(this Action action)
-		{
-			if (action is null)
-				throw new ArgumentNullException(nameof(action));
+		return () => Do.Invariant(action);
+	}
 
-			return () => Do.Invariant(action);
-		}
+	/// <summary>
+	/// Converts the given decimal number to the numeral system with the
+	/// specified radix (in the range [2, 36]).
+	/// </summary>
+	/// <param name="decimalNumber">The number to convert.</param>
+	/// <param name="radix">The radix of the destination numeral system
+	/// (in the range [2, 36]).</param>
+	/// <returns></returns>
+	public static string ToRadix(this long decimalNumber, int radix)
+	{
+		//
+		// http://www.pvladov.com/2012/05/decimal-to-arbitrary-numeral-system.html
+		//
 
-		/// <summary>
-		/// Converts the given decimal number to the numeral system with the
-		/// specified radix (in the range [2, 36]).
-		/// </summary>
-		/// <param name="decimalNumber">The number to convert.</param>
-		/// <param name="radix">The radix of the destination numeral system
-		/// (in the range [2, 36]).</param>
-		/// <returns></returns>
-		public static string ToRadix(this long decimalNumber, int radix)
-		{
-			//
-			// http://www.pvladov.com/2012/05/decimal-to-arbitrary-numeral-system.html
-			//
+		const int bitsInLong = 64;
+		const string digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
 
-			const int bitsInLong = 64;
-			const string digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+		if (radix < 2 || radix > digits.Length)
+			throw new ArgumentOutOfRangeException(nameof(radix), radix, $"The radix must be >= 2 and <= {digits.Length}.");
 
-			if (radix < 2 || radix > digits.Length)
-				throw new ArgumentOutOfRangeException(nameof(radix), radix, $"The radix must be >= 2 and <= {digits.Length}.");
+		if (decimalNumber == 0)
+			return "0";
 
-			if (decimalNumber == 0)
-				return "0";
+		var index = bitsInLong - 1;
+		var currentNumber = Math.Abs(decimalNumber);
+		var charArray = new char[bitsInLong];
 
-			var index = bitsInLong - 1;
-			var currentNumber = Math.Abs(decimalNumber);
-			var charArray = new char[bitsInLong];
+		while (currentNumber != 0)
+		{
+			var remainder = (int)(currentNumber % radix);
+			charArray[index--] = digits[remainder];
+			currentNumber /= radix;
+		}
 
-			while (currentNumber != 0)
-			{
-				var remainder = (int)(currentNumber % radix);
-				charArray[index--] = digits[remainder];
-				currentNumber /= radix;
-			}
+		var result = new string(charArray, index + 1, bitsInLong - index - 1);
 
-			var result = new string(charArray, index + 1, bitsInLong - index - 1);
+		if (decimalNumber < 0)
+			result = "-" + result;
 
-			if (decimalNumber < 0)
-				result = "-" + result;
+		return result;
+	}
 
-			return result;
-		}
+	/// <summary>
+	/// Retrieves the host from the specified endpoint.
+	/// </summary>
+	/// <param name="endPoint">The endpoint to extract the host from.</param>
+	/// <returns>The host string.</returns>
+	/// <exception cref="ArgumentNullException">Thrown if endPoint is null.</exception>
+	/// <exception cref="InvalidOperationException">Thrown if the endpoint type is unknown.</exception>
+	public static string GetHost(this EndPoint endPoint)
+	{
+		if (endPoint is null)
+			throw new ArgumentNullException(nameof(endPoint));
 
-		/// <summary>
-		/// Retrieves the host from the specified endpoint.
-		/// </summary>
-		/// <param name="endPoint">The endpoint to extract the host from.</param>
-		/// <returns>The host string.</returns>
-		/// <exception cref="ArgumentNullException">Thrown if endPoint is null.</exception>
-		/// <exception cref="InvalidOperationException">Thrown if the endpoint type is unknown.</exception>
-		public static string GetHost(this EndPoint endPoint)
+		if (endPoint is IPEndPoint ip)
 		{
-			if (endPoint is null)
-				throw new ArgumentNullException(nameof(endPoint));
-
-			if (endPoint is IPEndPoint ip)
-			{
-				return ip.Address.ToString();
-			}
-			else if (endPoint is DnsEndPoint dns)
-			{
-				return dns.Host;
-			}
-			else
-				throw new InvalidOperationException($"Unknown endpoint {endPoint}.");
+			return ip.Address.ToString();
 		}
-
-		/// <summary>
-		/// Sets the host on the specified endpoint.
-		/// </summary>
-		/// <param name="endPoint">The endpoint to modify.</param>
-		/// <param name="host">The new host name or IP address.</param>
-		/// <returns>The modified endpoint.</returns>
-		/// <exception cref="ArgumentNullException">Thrown if endPoint is null.</exception>
-		/// <exception cref="InvalidOperationException">Thrown if the endpoint type is unknown.</exception>
-		public static EndPoint SetHost(this EndPoint endPoint, string host)
+		else if (endPoint is DnsEndPoint dns)
 		{
-			if (endPoint is null)
-				throw new ArgumentNullException(nameof(endPoint));
+			return dns.Host;
+		}
+		else
+			throw new InvalidOperationException($"Unknown endpoint {endPoint}.");
+	}
 
-			if (endPoint is IPEndPoint ip)
-			{
-				ip.Address = host.To<IPAddress>();
-			}
-			else if (endPoint is DnsEndPoint dns)
-			{
-				endPoint = new DnsEndPoint(host, dns.Port, dns.AddressFamily);
-			}
-			else
-				throw new InvalidOperationException($"Unknown endpoint {endPoint}.");
+	/// <summary>
+	/// Sets the host on the specified endpoint.
+	/// </summary>
+	/// <param name="endPoint">The endpoint to modify.</param>
+	/// <param name="host">The new host name or IP address.</param>
+	/// <returns>The modified endpoint.</returns>
+	/// <exception cref="ArgumentNullException">Thrown if endPoint is null.</exception>
+	/// <exception cref="InvalidOperationException">Thrown if the endpoint type is unknown.</exception>
+	public static EndPoint SetHost(this EndPoint endPoint, string host)
+	{
+		if (endPoint is null)
+			throw new ArgumentNullException(nameof(endPoint));
 
-			return endPoint;
+		if (endPoint is IPEndPoint ip)
+		{
+			ip.Address = host.To<IPAddress>();
 		}
-
-		/// <summary>
-		/// Retrieves the port number from the specified endpoint.
-		/// </summary>
-		/// <param name="endPoint">The endpoint to extract the port from.</param>
-		/// <returns>The port number.</returns>
-		/// <exception cref="ArgumentNullException">Thrown if endPoint is null.</exception>
-		/// <exception cref="InvalidOperationException">Thrown if the endpoint type is unknown.</exception>
-		public static int GetPort(this EndPoint endPoint)
+		else if (endPoint is DnsEndPoint dns)
 		{
-			if (endPoint is null)
-				throw new ArgumentNullException(nameof(endPoint));
-
-			if (endPoint is IPEndPoint ip)
-			{
-				return ip.Port;
-			}
-			else if (endPoint is DnsEndPoint dns)
-			{
-				return dns.Port;
-			}
-			else
-				throw new InvalidOperationException($"Unknown endpoint {endPoint}.");
+			endPoint = new DnsEndPoint(host, dns.Port, dns.AddressFamily);
 		}
+		else
+			throw new InvalidOperationException($"Unknown endpoint {endPoint}.");
 
-		/// <summary>
-		/// Sets the port number on the specified endpoint.
-		/// </summary>
-		/// <param name="endPoint">The endpoint to modify.</param>
-		/// <param name="port">The new port number.</param>
-		/// <returns>The modified endpoint.</returns>
-		/// <exception cref="ArgumentNullException">Thrown if endPoint is null.</exception>
-		/// <exception cref="InvalidOperationException">Thrown if the endpoint type is unknown.</exception>
-		public static EndPoint SetPort(this EndPoint endPoint, int port)
-		{
-			if (endPoint is null)
-				throw new ArgumentNullException(nameof(endPoint));
+		return endPoint;
+	}
 
-			if (endPoint is IPEndPoint ip)
-			{
-				ip.Port = port;
-			}
-			else if (endPoint is DnsEndPoint dns)
-			{
-				endPoint = new DnsEndPoint(dns.Host, port, dns.AddressFamily);
-			}
-			else
-				throw new InvalidOperationException($"Unknown endpoint {endPoint}.");
+	/// <summary>
+	/// Retrieves the port number from the specified endpoint.
+	/// </summary>
+	/// <param name="endPoint">The endpoint to extract the port from.</param>
+	/// <returns>The port number.</returns>
+	/// <exception cref="ArgumentNullException">Thrown if endPoint is null.</exception>
+	/// <exception cref="InvalidOperationException">Thrown if the endpoint type is unknown.</exception>
+	public static int GetPort(this EndPoint endPoint)
+	{
+		if (endPoint is null)
+			throw new ArgumentNullException(nameof(endPoint));
 
-			return endPoint;
+		if (endPoint is IPEndPoint ip)
+		{
+			return ip.Port;
 		}
-
-		/// <summary>
-		/// Reverses the byte order if the specified endianness differs from the system endianness.
-		/// </summary>
-		/// <param name="bytes">The byte array to modify.</param>
-		/// <param name="length">The number of bytes to consider.</param>
-		/// <param name="isLittleEndian">Specifies the desired endianness.</param>
-		/// <param name="pos">The starting position within the array.</param>
-		/// <returns>The modified byte array.</returns>
-		public static byte[] ChangeOrder(this byte[] bytes, int length, bool isLittleEndian, int pos = 0)
+		else if (endPoint is DnsEndPoint dns)
 		{
-			if (isLittleEndian == BitConverter.IsLittleEndian)
-				return bytes;
+			return dns.Port;
+		}
+		else
+			throw new InvalidOperationException($"Unknown endpoint {endPoint}.");
+	}
 
-			var end = pos + length / 2;
+	/// <summary>
+	/// Sets the port number on the specified endpoint.
+	/// </summary>
+	/// <param name="endPoint">The endpoint to modify.</param>
+	/// <param name="port">The new port number.</param>
+	/// <returns>The modified endpoint.</returns>
+	/// <exception cref="ArgumentNullException">Thrown if endPoint is null.</exception>
+	/// <exception cref="InvalidOperationException">Thrown if the endpoint type is unknown.</exception>
+	public static EndPoint SetPort(this EndPoint endPoint, int port)
+	{
+		if (endPoint is null)
+			throw new ArgumentNullException(nameof(endPoint));
 
-			for (var i = pos; i < end; i++)
-			{
-				var start = i;
-				var stop = pos + length - i - 1;
+		if (endPoint is IPEndPoint ip)
+		{
+			ip.Port = port;
+		}
+		else if (endPoint is DnsEndPoint dns)
+		{
+			endPoint = new DnsEndPoint(dns.Host, port, dns.AddressFamily);
+		}
+		else
+			throw new InvalidOperationException($"Unknown endpoint {endPoint}.");
 
-				var temp = bytes[start];
-				bytes[start] = bytes[stop];
-				bytes[stop] = temp;
-			}
+		return endPoint;
+	}
 
+	/// <summary>
+	/// Reverses the byte order if the specified endianness differs from the system endianness.
+	/// </summary>
+	/// <param name="bytes">The byte array to modify.</param>
+	/// <param name="length">The number of bytes to consider.</param>
+	/// <param name="isLittleEndian">Specifies the desired endianness.</param>
+	/// <param name="pos">The starting position within the array.</param>
+	/// <returns>The modified byte array.</returns>
+	public static byte[] ChangeOrder(this byte[] bytes, int length, bool isLittleEndian, int pos = 0)
+	{
+		if (isLittleEndian == BitConverter.IsLittleEndian)
 			return bytes;
+
+		var end = pos + length / 2;
+
+		for (var i = pos; i < end; i++)
+		{
+			var start = i;
+			var stop = pos + length - i - 1;
+
+			var temp = bytes[start];
+			bytes[start] = bytes[stop];
+			bytes[stop] = temp;
 		}
+
+		return bytes;
 	}
 }
\ No newline at end of file
diff --git a/Common/CountryCodes.cs b/Common/CountryCodes.cs
index 60ab41f8..0c3aa712 100644
--- a/Common/CountryCodes.cs
+++ b/Common/CountryCodes.cs
@@ -1,1021 +1,1020 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+/// <summary>
+/// Enumerates country codes corresponding to various countries, territories and regions.
+/// </summary>
+public enum CountryCodes
 {
 	/// <summary>
-	/// Enumerates country codes corresponding to various countries, territories and regions.
-	/// </summary>
-	public enum CountryCodes
-	{
-		/// <summary>
-		/// Abkhazia.
-		/// </summary>
-		Abkhazia,
-		/// <summary>
-		/// Afghanistan.
-		/// </summary>
-		AF,
-		/// <summary>
-		/// Aland Islands.
-		/// </summary>
-		AX,
-		/// <summary>
-		/// Albania.
-		/// </summary>
-		AL,
-		/// <summary>
-		/// Algeria.
-		/// </summary>
-		DZ,
-		/// <summary>
-		/// American Samoa.
-		/// </summary>
-		AS,
-		/// <summary>
-		/// Andorra.
-		/// </summary>
-		AD,
-		/// <summary>
-		/// Angola.
-		/// </summary>
-		AO,
-		/// <summary>
-		/// Anguilla.
-		/// </summary>
-		AI,
-		/// <summary>
-		/// Antarctica.
-		/// </summary>
-		AQ,
-		/// <summary>
-		/// Antigua and Barbuda.
-		/// </summary>
-		AG,
-		/// <summary>
-		/// Argentina.
-		/// </summary>
-		AR,
-		/// <summary>
-		/// Armenia.
-		/// </summary>
-		AM,
-		/// <summary>
-		/// Aruba.
-		/// </summary>
-		AW,
-		/// <summary>
-		/// Australia.
-		/// </summary>
-		AU,
-		/// <summary>
-		/// Austria.
-		/// </summary>
-		AT,
-		/// <summary>
-		/// Azerbaijan.
-		/// </summary>
-		AZ,
-		/// <summary>
-		/// Bahamas.
-		/// </summary>
-		BS,
-		/// <summary>
-		/// Bahrain.
-		/// </summary>
-		BH,
-		/// <summary>
-		/// Bangladesh.
-		/// </summary>
-		BD,
-		/// <summary>
-		/// Barbados.
-		/// </summary>
-		BB,
-		/// <summary>
-		/// Basque Country.
-		/// </summary>
-		BasqueCountry,
-		/// <summary>
-		/// Belarus.
-		/// </summary>
-		BY,
-		/// <summary>
-		/// Belgium.
-		/// </summary>
-		BE,
-		/// <summary>
-		/// Belize.
-		/// </summary>
-		BZ,
-		/// <summary>
-		/// Benin.
-		/// </summary>
-		BJ,
-		/// <summary>
-		/// Bermuda.
-		/// </summary>
-		BM,
-		/// <summary>
-		/// Bhutan.
-		/// </summary>
-		BT,
-		/// <summary>
-		/// Bolivia.
-		/// </summary>
-		BO,
-		/// <summary>
-		/// Bosnia and Herzegovina.
-		/// </summary>
-		BA,
-		/// <summary>
-		/// Botswana.
-		/// </summary>
-		BW,
-		/// <summary>
-		/// Brazil.
-		/// </summary>
-		BR,
-		/// <summary>
-		/// British Indian Ocean Territory.
-		/// </summary>
-		BritishAntarcticTerritory,
-		/// <summary>
-		/// British Virgin Islands.
-		/// </summary>
-		VG,
-		/// <summary>
-		/// Brunei Darussalam.
-		/// </summary>
-		BN,
-		/// <summary>
-		/// Bulgaria.
-		/// </summary>
-		BG,
-		/// <summary>
-		/// Burkina Faso.
-		/// </summary>
-		BF,
-		/// <summary>
-		/// Burundi.
-		/// </summary>
-		BI,
-		/// <summary>
-		/// Cambodia.
-		/// </summary>
-		KH,
-		/// <summary>
-		/// Cameroon.
-		/// </summary>
-		CM,
-		/// <summary>
-		/// Canada.
-		/// </summary>
-		CA,
-		/// <summary>
-		/// Cape Verde.
-		/// </summary>
-		CV,
-		/// <summary>
-		/// Cayman Islands.
-		/// </summary>
-		KY,
-		/// <summary>
-		/// Central African Republic.
-		/// </summary>
-		CF,
-		/// <summary>
-		/// Chad.
-		/// </summary>
-		TD,
-		/// <summary>
-		/// Chile.
-		/// </summary>
-		CL,
-		/// <summary>
-		/// China.
-		/// </summary>
-		CN,
-		/// <summary>
-		/// Christmas Island.
-		/// </summary>
-		CX,
-		/// <summary>
-		/// Cocos (Keeling) Islands.
-		/// </summary>
-		CC,
-		/// <summary>
-		/// Colombia.
-		/// </summary>
-		CO,
-		/// <summary>
-		/// Commonwealth.
-		/// </summary>
-		Commonwealth,
-		/// <summary>
-		/// Comoros.
-		/// </summary>
-		KM,
-		/// <summary>
-		/// Congo (Brazzaville).
-		/// </summary>
-		CG,
-		/// <summary>
-		/// Congo, Democratic Republic of the.
-		/// </summary>
-		CD,
-		/// <summary>
-		/// Cook Islands.
-		/// </summary>
-		CK,
-		/// <summary>
-		/// Costa Rica.
-		/// </summary>
-		CR,
-		/// <summary>
-		/// Cote d'Ivoire.
-		/// </summary>
-		CI,
-		/// <summary>
-		/// Croatia.
-		/// </summary>
-		HR,
-		/// <summary>
-		/// Cuba.
-		/// </summary>
-		CU,
-		/// <summary>
-		/// Curacao.
-		/// </summary>
-		CW,
-		/// <summary>
-		/// Cyprus.
-		/// </summary>
-		CY,
-		/// <summary>
-		/// Czech Republic.
-		/// </summary>
-		CZ,
-		/// <summary>
-		/// Denmark.
-		/// </summary>
-		DK,
-		/// <summary>
-		/// Djibouti.
-		/// </summary>
-		DJ,
-		/// <summary>
-		/// Dominica.
-		/// </summary>
-		DM,
-		/// <summary>
-		/// Dominican Republic.
-		/// </summary>
-		DO,
-		/// <summary>
-		/// Ecuador.
-		/// </summary>
-		EC,
-		/// <summary>
-		/// Egypt.
-		/// </summary>
-		EG,
-		/// <summary>
-		/// El Salvador.
-		/// </summary>
-		SV,
-		/// <summary>
-		/// Equatorial Guinea.
-		/// </summary>
-		GQ,
-		/// <summary>
-		/// Eritrea.
-		/// </summary>
-		ER,
-		/// <summary>
-		/// Estonia.
-		/// </summary>
-		EE,
-		/// <summary>
-		/// Ethiopia.
-		/// </summary>
-		ET,
-		/// <summary>
-		/// European Union.
-		/// </summary>
-		EU,
-		/// <summary>
-		/// Falkland Islands (Malvinas).
-		/// </summary>
-		FK,
-		/// <summary>
-		/// Faroe Islands.
-		/// </summary>
-		FO,
-		/// <summary>
-		/// Fiji.
-		/// </summary>
-		FJ,
-		/// <summary>
-		/// Finland.
-		/// </summary>
-		FI,
-		/// <summary>
-		/// France.
-		/// </summary>
-		FR,
-		/// <summary>
-		/// French Polynesia.
-		/// </summary>
-		PF,
-		/// <summary>
-		/// French Southern Territories.
-		/// </summary>
-		TF,
-		/// <summary>
-		/// Gabon.
-		/// </summary>
-		GA,
-		/// <summary>
-		/// Gambia.
-		/// </summary>
-		GM,
-		/// <summary>
-		/// Georgia.
-		/// </summary>
-		GE,
-		/// <summary>
-		/// Germany.
-		/// </summary>
-		DE,
-		/// <summary>
-		/// Ghana.
-		/// </summary>
-		GH,
-		/// <summary>
-		/// Gibraltar.
-		/// </summary>
-		GI,
-		/// <summary>
-		/// Gosquared.
-		/// </summary>
-		Gosquared,
-		/// <summary>
-		/// Greece.
-		/// </summary>
-		GR,
-		/// <summary>
-		/// Greenland.
-		/// </summary>
-		GL,
-		/// <summary>
-		/// Grenada.
-		/// </summary>
-		GD,
-		/// <summary>
-		/// Guam.
-		/// </summary>
-		GU,
-		/// <summary>
-		/// Guatemala.
-		/// </summary>
-		GT,
-		/// <summary>
-		/// Guernsey.
-		/// </summary>
-		GG,
-		/// <summary>
-		/// Guinea.
-		/// </summary>
-		GN,
-		/// <summary>
-		/// Guinea-Bissau.
-		/// </summary>
-		GW,
-		/// <summary>
-		/// Guyana.
-		/// </summary>
-		GY,
-		/// <summary>
-		/// Haiti.
-		/// </summary>
-		HT,
-		/// <summary>
-		/// Holy See (Vatican City State).
-		/// </summary>
-		VA,
-		/// <summary>
-		/// Honduras.
-		/// </summary>
-		HN,
-		/// <summary>
-		/// Hong Kong, Special Administrative Region of China.
-		/// </summary>
-		HK,
-		/// <summary>
-		/// Hungary.
-		/// </summary>
-		HU,
-		/// <summary>
-		/// Iceland.
-		/// </summary>
-		IS,
-		/// <summary>
-		/// India.
-		/// </summary>
-		IN,
-		/// <summary>
-		/// Indonesia.
-		/// </summary>
-		ID,
-		/// <summary>
-		/// Iran, Islamic Republic of.
-		/// </summary>
-		IR,
-		/// <summary>
-		/// Iraq.
-		/// </summary>
-		IQ,
-		/// <summary>
-		/// Ireland.
-		/// </summary>
-		IE,
-		/// <summary>
-		/// Isle of Man.
-		/// </summary>
-		IM,
-		/// <summary>
-		/// Israel.
-		/// </summary>
-		IL,
-		/// <summary>
-		/// Italy.
-		/// </summary>
-		IT,
-		/// <summary>
-		/// Jamaica.
-		/// </summary>
-		JM,
-		/// <summary>
-		/// Japan.
-		/// </summary>
-		JP,
-		/// <summary>
-		/// Jersey.
-		/// </summary>
-		JE,
-		/// <summary>
-		/// Jordan.
-		/// </summary>
-		JO,
-		/// <summary>
-		/// Kazakhstan.
-		/// </summary>
-		KZ,
-		/// <summary>
-		/// Kenya.
-		/// </summary>
-		KE,
-		/// <summary>
-		/// Kiribati.
-		/// </summary>
-		KI,
-		/// <summary>
-		/// Korea, Democratic People's Republic of.
-		/// </summary>
-		KP,
-		/// <summary>
-		/// Korea, Republic of.
-		/// </summary>
-		KR,
-		/// <summary>
-		/// Kosovo.
-		/// </summary>
-		Kosovo,
-		/// <summary>
-		/// Kuwait.
-		/// </summary>
-		KW,
-		/// <summary>
-		/// Kyrgyzstan.
-		/// </summary>
-		KG,
-		/// <summary>
-		/// Lao PDR.
-		/// </summary>
-		LA,
-		/// <summary>
-		/// Latvia.
-		/// </summary>
-		LV,
-		/// <summary>
-		/// Lebanon.
-		/// </summary>
-		LB,
-		/// <summary>
-		/// Lesotho.
-		/// </summary>
-		LS,
-		/// <summary>
-		/// Liberia.
-		/// </summary>
-		LR,
-		/// <summary>
-		/// Libya.
-		/// </summary>
-		LY,
-		/// <summary>
-		/// Liechtenstein.
-		/// </summary>
-		LI,
-		/// <summary>
-		/// Lithuania.
-		/// </summary>
-		LT,
-		/// <summary>
-		/// Luxembourg.
-		/// </summary>
-		LU,
-		/// <summary>
-		/// Macao, Special Administrative Region of China.
-		/// </summary>
-		MO,
-		/// <summary>
-		/// Macedonia, Republic of.
-		/// </summary>
-		MK,
-		/// <summary>
-		/// Madagascar.
-		/// </summary>
-		MG,
-		/// <summary>
-		/// Malawi.
-		/// </summary>
-		MW,
-		/// <summary>
-		/// Malaysia.
-		/// </summary>
-		MY,
-		/// <summary>
-		/// Maldives.
-		/// </summary>
-		MV,
-		/// <summary>
-		/// Mali.
-		/// </summary>
-		ML,
-		/// <summary>
-		/// Malta.
-		/// </summary>
-		MT,
-		/// <summary>
-		/// Mars.
-		/// </summary>
-		Mars,
-		/// <summary>
-		/// Marshall Islands.
-		/// </summary>
-		MH,
-		/// <summary>
-		/// Martinique.
-		/// </summary>
-		MQ,
-		/// <summary>
-		/// Mauritania.
-		/// </summary>
-		MR,
-		/// <summary>
-		/// Mauritius.
-		/// </summary>
-		MU,
-		/// <summary>
-		/// Mayotte.
-		/// </summary>
-		YT,
-		/// <summary>
-		/// Mexico.
-		/// </summary>
-		MX,
-		/// <summary>
-		/// Micronesia, Federated States of.
-		/// </summary>
-		FM,
-		/// <summary>
-		/// Moldova.
-		/// </summary>
-		MD,
-		/// <summary>
-		/// Monaco.
-		/// </summary>
-		MC,
-		/// <summary>
-		/// Mongolia.
-		/// </summary>
-		MN,
-		/// <summary>
-		/// Montenegro.
-		/// </summary>
-		ME,
-		/// <summary>
-		/// Montserrat.
-		/// </summary>
-		MS,
-		/// <summary>
-		/// Morocco.
-		/// </summary>
-		MA,
-		/// <summary>
-		/// Mozambique.
-		/// </summary>
-		MZ,
-		/// <summary>
-		/// Myanmar.
-		/// </summary>
-		MM,
-		/// <summary>
-		/// Nagorno Karabakh.
-		/// </summary>
-		NagornoKarabakh,
-		/// <summary>
-		/// Namibia.
-		/// </summary>
-		NA,
-		/// <summary>
-		/// Nauru.
-		/// </summary>
-		NR,
-		/// <summary>
-		/// Nepal.
-		/// </summary>
-		NP,
-		/// <summary>
-		/// Netherlands.
-		/// </summary>
-		NL,
-		/// <summary>
-		/// Netherlands Antilles.
-		/// </summary>
-		AN,
-		/// <summary>
-		/// New Caledonia.
-		/// </summary>
-		NC,
-		/// <summary>
-		/// New Zealand.
-		/// </summary>
-		NZ,
-		/// <summary>
-		/// Nicaragua.
-		/// </summary>
-		NI,
-		/// <summary>
-		/// Niger.
-		/// </summary>
-		NE,
-		/// <summary>
-		/// Nigeria.
-		/// </summary>
-		NG,
-		/// <summary>
-		/// Niue.
-		/// </summary>
-		NU,
-		/// <summary>
-		/// Norfolk Island.
-		/// </summary>
-		NF,
-		/// <summary>
-		/// Northern Mariana Islands.
-		/// </summary>
-		MP,
-		/// <summary>
-		/// Norway.
-		/// </summary>
-		NO,
-		/// <summary>
-		/// Northern Cyprus.
-		/// </summary>
-		NorthernCyprus,
-		/// <summary>
-		/// Oman.
-		/// </summary>
-		OM,
-		/// <summary>
-		/// Pakistan.
-		/// </summary>
-		PK,
-		/// <summary>
-		/// Palau.
-		/// </summary>
-		PW,
-		/// <summary>
-		/// Palestinian Territory, Occupied.
-		/// </summary>
-		PS,
-		/// <summary>
-		/// Panama.
-		/// </summary>
-		PA,
-		/// <summary>
-		/// Papua New Guinea.
-		/// </summary>
-		PG,
-		/// <summary>
-		/// Paraguay.
-		/// </summary>
-		PY,
-		/// <summary>
-		/// Peru.
-		/// </summary>
-		PE,
-		/// <summary>
-		/// Philippines.
-		/// </summary>
-		PH,
-		/// <summary>
-		/// Pitcairn.
-		/// </summary>
-		PN,
-		/// <summary>
-		/// Poland.
-		/// </summary>
-		PL,
-		/// <summary>
-		/// Portugal.
-		/// </summary>
-		PT,
-		/// <summary>
-		/// Puerto Rico.
-		/// </summary>
-		PR,
-		/// <summary>
-		/// Qatar.
-		/// </summary>
-		QA,
-		/// <summary>
-		/// Romania.
-		/// </summary>
-		RO,
-		/// <summary>
-		/// Russian Federation.
-		/// </summary>
-		RU,
-		/// <summary>
-		/// Rwanda.
-		/// </summary>
-		RW,
-		/// <summary>
-		/// Saint Helena.
-		/// </summary>
-		SH,
-		/// <summary>
-		/// Saint Kitts and Nevis.
-		/// </summary>
-		KN,
-		/// <summary>
-		/// Saint Lucia.
-		/// </summary>
-		LC,
-		/// <summary>
-		/// Saint Vincent and Grenadines.
-		/// </summary>
-		VC,
-		/// <summary>
-		/// Saint-Barthelemy.
-		/// </summary>
-		BL,
-		/// <summary>
-		/// Saint-Martin (French part).
-		/// </summary>
-		MF,
-		/// <summary>
-		/// Samoa.
-		/// </summary>
-		WS,
-		/// <summary>
-		/// San Marino.
-		/// </summary>
-		SM,
-		/// <summary>
-		/// Sao Tome and Principe.
-		/// </summary>
-		ST,
-		/// <summary>
-		/// Saudi Arabia.
-		/// </summary>
-		SA,
-		/// <summary>
-		/// Scotland.
-		/// </summary>
-		Scotland,
-		/// <summary>
-		/// Senegal.
-		/// </summary>
-		SN,
-		/// <summary>
-		/// Serbia.
-		/// </summary>
-		RS,
-		/// <summary>
-		/// Seychelles.
-		/// </summary>
-		SC,
-		/// <summary>
-		/// Sierra Leone.
-		/// </summary>
-		SL,
-		/// <summary>
-		/// Singapore.
-		/// </summary>
-		SG,
-		/// <summary>
-		/// Slovakia.
-		/// </summary>
-		SK,
-		/// <summary>
-		/// Slovenia.
-		/// </summary>
-		SI,
-		/// <summary>
-		/// Solomon Islands.
-		/// </summary>
-		SB,
-		/// <summary>
-		/// Somalia.
-		/// </summary>
-		SO,
-		/// <summary>
-		/// Somaliland.
-		/// </summary>
-		Somaliland,
-		/// <summary>
-		/// South Africa.
-		/// </summary>
-		ZA,
-		/// <summary>
-		/// South Georgia and the South Sandwich Islands.
-		/// </summary>
-		GS,
-		/// <summary>
-		/// South Ossetia.
-		/// </summary>
-		SouthOssetia,
-		/// <summary>
-		/// South Sudan.
-		/// </summary>
-		SS,
-		/// <summary>
-		/// Spain.
-		/// </summary>
-		ES,
-		/// <summary>
-		/// Sri Lanka.
-		/// </summary>
-		LK,
-		/// <summary>
-		/// Sudan.
-		/// </summary>
-		SD,
-		/// <summary>
-		/// Suriname.
-		/// </summary>
-		SR,
-		/// <summary>
-		/// Swaziland.
-		/// </summary>
-		SZ,
-		/// <summary>
-		/// Sweden.
-		/// </summary>
-		SE,
-		/// <summary>
-		/// Switzerland.
-		/// </summary>
-		CH,
-		/// <summary>
-		/// Syrian Arab Republic (Syria).
-		/// </summary>
-		SY,
-		/// <summary>
-		/// Taiwan, Republic of China.
-		/// </summary>
-		TW,
-		/// <summary>
-		/// Tajikistan.
-		/// </summary>
-		TJ,
-		/// <summary>
-		/// Tanzania, United Republic of.
-		/// </summary>
-		TZ,
-		/// <summary>
-		/// Thailand.
-		/// </summary>
-		TH,
-		/// <summary>
-		/// Timor-Leste.
-		/// </summary>
-		TL,
-		/// <summary>
-		/// Togo.
-		/// </summary>
-		TG,
-		/// <summary>
-		/// Tokelau.
-		/// </summary>
-		TK,
-		/// <summary>
-		/// Tonga.
-		/// </summary>
-		TO,
-		/// <summary>
-		/// Trinidad and Tobago.
-		/// </summary>
-		TT,
-		/// <summary>
-		/// Tunisia.
-		/// </summary>
-		TN,
-		/// <summary>
-		/// Turkey.
-		/// </summary>
-		TR,
-		/// <summary>
-		/// Turkmenistan.
-		/// </summary>
-		TM,
-		/// <summary>
-		/// Turks and Caicos Islands.
-		/// </summary>
-		TC,
-		/// <summary>
-		/// Tuvalu.
-		/// </summary>
-		TV,
-		/// <summary>
-		/// Uganda.
-		/// </summary>
-		UG,
-		/// <summary>
-		/// Ukraine.
-		/// </summary>
-		UA,
-		/// <summary>
-		/// United Arab Emirates.
-		/// </summary>
-		AE,
-		/// <summary>
-		/// United Kingdom.
-		/// </summary>
-		GB,
-		/// <summary>
-		/// United States of America.
-		/// </summary>
-		US,
-		/// <summary>
-		/// Uruguay.
-		/// </summary>
-		UY,
-		/// <summary>
-		/// Uzbekistan.
-		/// </summary>
-		UZ,
-		/// <summary>
-		/// Vanuatu.
-		/// </summary>
-		VU,
-		/// <summary>
-		/// Venezuela (Bolivarian Republic of).
-		/// </summary>
-		VE,
-		/// <summary>
-		/// Viet Nam.
-		/// </summary>
-		VN,
-		/// <summary>
-		/// Virgin Islands, US.
-		/// </summary>
-		VI,
-		/// <summary>
-		/// Wales.
-		/// </summary>
-		Wales,
-		/// <summary>
-		/// Wallis and Futuna Islands.
-		/// </summary>
-		WF,
-		/// <summary>
-		/// Western Sahara.
-		/// </summary>
-		EH,
-		/// <summary>
-		/// Yemen.
-		/// </summary>
-		YE,
-		/// <summary>
-		/// Zambia.
-		/// </summary>
-		ZM,
-		/// <summary>
-		/// Zimbabwe.
-		/// </summary>
-		ZW,
-	}
+	/// Abkhazia.
+	/// </summary>
+	Abkhazia,
+	/// <summary>
+	/// Afghanistan.
+	/// </summary>
+	AF,
+	/// <summary>
+	/// Aland Islands.
+	/// </summary>
+	AX,
+	/// <summary>
+	/// Albania.
+	/// </summary>
+	AL,
+	/// <summary>
+	/// Algeria.
+	/// </summary>
+	DZ,
+	/// <summary>
+	/// American Samoa.
+	/// </summary>
+	AS,
+	/// <summary>
+	/// Andorra.
+	/// </summary>
+	AD,
+	/// <summary>
+	/// Angola.
+	/// </summary>
+	AO,
+	/// <summary>
+	/// Anguilla.
+	/// </summary>
+	AI,
+	/// <summary>
+	/// Antarctica.
+	/// </summary>
+	AQ,
+	/// <summary>
+	/// Antigua and Barbuda.
+	/// </summary>
+	AG,
+	/// <summary>
+	/// Argentina.
+	/// </summary>
+	AR,
+	/// <summary>
+	/// Armenia.
+	/// </summary>
+	AM,
+	/// <summary>
+	/// Aruba.
+	/// </summary>
+	AW,
+	/// <summary>
+	/// Australia.
+	/// </summary>
+	AU,
+	/// <summary>
+	/// Austria.
+	/// </summary>
+	AT,
+	/// <summary>
+	/// Azerbaijan.
+	/// </summary>
+	AZ,
+	/// <summary>
+	/// Bahamas.
+	/// </summary>
+	BS,
+	/// <summary>
+	/// Bahrain.
+	/// </summary>
+	BH,
+	/// <summary>
+	/// Bangladesh.
+	/// </summary>
+	BD,
+	/// <summary>
+	/// Barbados.
+	/// </summary>
+	BB,
+	/// <summary>
+	/// Basque Country.
+	/// </summary>
+	BasqueCountry,
+	/// <summary>
+	/// Belarus.
+	/// </summary>
+	BY,
+	/// <summary>
+	/// Belgium.
+	/// </summary>
+	BE,
+	/// <summary>
+	/// Belize.
+	/// </summary>
+	BZ,
+	/// <summary>
+	/// Benin.
+	/// </summary>
+	BJ,
+	/// <summary>
+	/// Bermuda.
+	/// </summary>
+	BM,
+	/// <summary>
+	/// Bhutan.
+	/// </summary>
+	BT,
+	/// <summary>
+	/// Bolivia.
+	/// </summary>
+	BO,
+	/// <summary>
+	/// Bosnia and Herzegovina.
+	/// </summary>
+	BA,
+	/// <summary>
+	/// Botswana.
+	/// </summary>
+	BW,
+	/// <summary>
+	/// Brazil.
+	/// </summary>
+	BR,
+	/// <summary>
+	/// British Indian Ocean Territory.
+	/// </summary>
+	BritishAntarcticTerritory,
+	/// <summary>
+	/// British Virgin Islands.
+	/// </summary>
+	VG,
+	/// <summary>
+	/// Brunei Darussalam.
+	/// </summary>
+	BN,
+	/// <summary>
+	/// Bulgaria.
+	/// </summary>
+	BG,
+	/// <summary>
+	/// Burkina Faso.
+	/// </summary>
+	BF,
+	/// <summary>
+	/// Burundi.
+	/// </summary>
+	BI,
+	/// <summary>
+	/// Cambodia.
+	/// </summary>
+	KH,
+	/// <summary>
+	/// Cameroon.
+	/// </summary>
+	CM,
+	/// <summary>
+	/// Canada.
+	/// </summary>
+	CA,
+	/// <summary>
+	/// Cape Verde.
+	/// </summary>
+	CV,
+	/// <summary>
+	/// Cayman Islands.
+	/// </summary>
+	KY,
+	/// <summary>
+	/// Central African Republic.
+	/// </summary>
+	CF,
+	/// <summary>
+	/// Chad.
+	/// </summary>
+	TD,
+	/// <summary>
+	/// Chile.
+	/// </summary>
+	CL,
+	/// <summary>
+	/// China.
+	/// </summary>
+	CN,
+	/// <summary>
+	/// Christmas Island.
+	/// </summary>
+	CX,
+	/// <summary>
+	/// Cocos (Keeling) Islands.
+	/// </summary>
+	CC,
+	/// <summary>
+	/// Colombia.
+	/// </summary>
+	CO,
+	/// <summary>
+	/// Commonwealth.
+	/// </summary>
+	Commonwealth,
+	/// <summary>
+	/// Comoros.
+	/// </summary>
+	KM,
+	/// <summary>
+	/// Congo (Brazzaville).
+	/// </summary>
+	CG,
+	/// <summary>
+	/// Congo, Democratic Republic of the.
+	/// </summary>
+	CD,
+	/// <summary>
+	/// Cook Islands.
+	/// </summary>
+	CK,
+	/// <summary>
+	/// Costa Rica.
+	/// </summary>
+	CR,
+	/// <summary>
+	/// Cote d'Ivoire.
+	/// </summary>
+	CI,
+	/// <summary>
+	/// Croatia.
+	/// </summary>
+	HR,
+	/// <summary>
+	/// Cuba.
+	/// </summary>
+	CU,
+	/// <summary>
+	/// Curacao.
+	/// </summary>
+	CW,
+	/// <summary>
+	/// Cyprus.
+	/// </summary>
+	CY,
+	/// <summary>
+	/// Czech Republic.
+	/// </summary>
+	CZ,
+	/// <summary>
+	/// Denmark.
+	/// </summary>
+	DK,
+	/// <summary>
+	/// Djibouti.
+	/// </summary>
+	DJ,
+	/// <summary>
+	/// Dominica.
+	/// </summary>
+	DM,
+	/// <summary>
+	/// Dominican Republic.
+	/// </summary>
+	DO,
+	/// <summary>
+	/// Ecuador.
+	/// </summary>
+	EC,
+	/// <summary>
+	/// Egypt.
+	/// </summary>
+	EG,
+	/// <summary>
+	/// El Salvador.
+	/// </summary>
+	SV,
+	/// <summary>
+	/// Equatorial Guinea.
+	/// </summary>
+	GQ,
+	/// <summary>
+	/// Eritrea.
+	/// </summary>
+	ER,
+	/// <summary>
+	/// Estonia.
+	/// </summary>
+	EE,
+	/// <summary>
+	/// Ethiopia.
+	/// </summary>
+	ET,
+	/// <summary>
+	/// European Union.
+	/// </summary>
+	EU,
+	/// <summary>
+	/// Falkland Islands (Malvinas).
+	/// </summary>
+	FK,
+	/// <summary>
+	/// Faroe Islands.
+	/// </summary>
+	FO,
+	/// <summary>
+	/// Fiji.
+	/// </summary>
+	FJ,
+	/// <summary>
+	/// Finland.
+	/// </summary>
+	FI,
+	/// <summary>
+	/// France.
+	/// </summary>
+	FR,
+	/// <summary>
+	/// French Polynesia.
+	/// </summary>
+	PF,
+	/// <summary>
+	/// French Southern Territories.
+	/// </summary>
+	TF,
+	/// <summary>
+	/// Gabon.
+	/// </summary>
+	GA,
+	/// <summary>
+	/// Gambia.
+	/// </summary>
+	GM,
+	/// <summary>
+	/// Georgia.
+	/// </summary>
+	GE,
+	/// <summary>
+	/// Germany.
+	/// </summary>
+	DE,
+	/// <summary>
+	/// Ghana.
+	/// </summary>
+	GH,
+	/// <summary>
+	/// Gibraltar.
+	/// </summary>
+	GI,
+	/// <summary>
+	/// Gosquared.
+	/// </summary>
+	Gosquared,
+	/// <summary>
+	/// Greece.
+	/// </summary>
+	GR,
+	/// <summary>
+	/// Greenland.
+	/// </summary>
+	GL,
+	/// <summary>
+	/// Grenada.
+	/// </summary>
+	GD,
+	/// <summary>
+	/// Guam.
+	/// </summary>
+	GU,
+	/// <summary>
+	/// Guatemala.
+	/// </summary>
+	GT,
+	/// <summary>
+	/// Guernsey.
+	/// </summary>
+	GG,
+	/// <summary>
+	/// Guinea.
+	/// </summary>
+	GN,
+	/// <summary>
+	/// Guinea-Bissau.
+	/// </summary>
+	GW,
+	/// <summary>
+	/// Guyana.
+	/// </summary>
+	GY,
+	/// <summary>
+	/// Haiti.
+	/// </summary>
+	HT,
+	/// <summary>
+	/// Holy See (Vatican City State).
+	/// </summary>
+	VA,
+	/// <summary>
+	/// Honduras.
+	/// </summary>
+	HN,
+	/// <summary>
+	/// Hong Kong, Special Administrative Region of China.
+	/// </summary>
+	HK,
+	/// <summary>
+	/// Hungary.
+	/// </summary>
+	HU,
+	/// <summary>
+	/// Iceland.
+	/// </summary>
+	IS,
+	/// <summary>
+	/// India.
+	/// </summary>
+	IN,
+	/// <summary>
+	/// Indonesia.
+	/// </summary>
+	ID,
+	/// <summary>
+	/// Iran, Islamic Republic of.
+	/// </summary>
+	IR,
+	/// <summary>
+	/// Iraq.
+	/// </summary>
+	IQ,
+	/// <summary>
+	/// Ireland.
+	/// </summary>
+	IE,
+	/// <summary>
+	/// Isle of Man.
+	/// </summary>
+	IM,
+	/// <summary>
+	/// Israel.
+	/// </summary>
+	IL,
+	/// <summary>
+	/// Italy.
+	/// </summary>
+	IT,
+	/// <summary>
+	/// Jamaica.
+	/// </summary>
+	JM,
+	/// <summary>
+	/// Japan.
+	/// </summary>
+	JP,
+	/// <summary>
+	/// Jersey.
+	/// </summary>
+	JE,
+	/// <summary>
+	/// Jordan.
+	/// </summary>
+	JO,
+	/// <summary>
+	/// Kazakhstan.
+	/// </summary>
+	KZ,
+	/// <summary>
+	/// Kenya.
+	/// </summary>
+	KE,
+	/// <summary>
+	/// Kiribati.
+	/// </summary>
+	KI,
+	/// <summary>
+	/// Korea, Democratic People's Republic of.
+	/// </summary>
+	KP,
+	/// <summary>
+	/// Korea, Republic of.
+	/// </summary>
+	KR,
+	/// <summary>
+	/// Kosovo.
+	/// </summary>
+	Kosovo,
+	/// <summary>
+	/// Kuwait.
+	/// </summary>
+	KW,
+	/// <summary>
+	/// Kyrgyzstan.
+	/// </summary>
+	KG,
+	/// <summary>
+	/// Lao PDR.
+	/// </summary>
+	LA,
+	/// <summary>
+	/// Latvia.
+	/// </summary>
+	LV,
+	/// <summary>
+	/// Lebanon.
+	/// </summary>
+	LB,
+	/// <summary>
+	/// Lesotho.
+	/// </summary>
+	LS,
+	/// <summary>
+	/// Liberia.
+	/// </summary>
+	LR,
+	/// <summary>
+	/// Libya.
+	/// </summary>
+	LY,
+	/// <summary>
+	/// Liechtenstein.
+	/// </summary>
+	LI,
+	/// <summary>
+	/// Lithuania.
+	/// </summary>
+	LT,
+	/// <summary>
+	/// Luxembourg.
+	/// </summary>
+	LU,
+	/// <summary>
+	/// Macao, Special Administrative Region of China.
+	/// </summary>
+	MO,
+	/// <summary>
+	/// Macedonia, Republic of.
+	/// </summary>
+	MK,
+	/// <summary>
+	/// Madagascar.
+	/// </summary>
+	MG,
+	/// <summary>
+	/// Malawi.
+	/// </summary>
+	MW,
+	/// <summary>
+	/// Malaysia.
+	/// </summary>
+	MY,
+	/// <summary>
+	/// Maldives.
+	/// </summary>
+	MV,
+	/// <summary>
+	/// Mali.
+	/// </summary>
+	ML,
+	/// <summary>
+	/// Malta.
+	/// </summary>
+	MT,
+	/// <summary>
+	/// Mars.
+	/// </summary>
+	Mars,
+	/// <summary>
+	/// Marshall Islands.
+	/// </summary>
+	MH,
+	/// <summary>
+	/// Martinique.
+	/// </summary>
+	MQ,
+	/// <summary>
+	/// Mauritania.
+	/// </summary>
+	MR,
+	/// <summary>
+	/// Mauritius.
+	/// </summary>
+	MU,
+	/// <summary>
+	/// Mayotte.
+	/// </summary>
+	YT,
+	/// <summary>
+	/// Mexico.
+	/// </summary>
+	MX,
+	/// <summary>
+	/// Micronesia, Federated States of.
+	/// </summary>
+	FM,
+	/// <summary>
+	/// Moldova.
+	/// </summary>
+	MD,
+	/// <summary>
+	/// Monaco.
+	/// </summary>
+	MC,
+	/// <summary>
+	/// Mongolia.
+	/// </summary>
+	MN,
+	/// <summary>
+	/// Montenegro.
+	/// </summary>
+	ME,
+	/// <summary>
+	/// Montserrat.
+	/// </summary>
+	MS,
+	/// <summary>
+	/// Morocco.
+	/// </summary>
+	MA,
+	/// <summary>
+	/// Mozambique.
+	/// </summary>
+	MZ,
+	/// <summary>
+	/// Myanmar.
+	/// </summary>
+	MM,
+	/// <summary>
+	/// Nagorno Karabakh.
+	/// </summary>
+	NagornoKarabakh,
+	/// <summary>
+	/// Namibia.
+	/// </summary>
+	NA,
+	/// <summary>
+	/// Nauru.
+	/// </summary>
+	NR,
+	/// <summary>
+	/// Nepal.
+	/// </summary>
+	NP,
+	/// <summary>
+	/// Netherlands.
+	/// </summary>
+	NL,
+	/// <summary>
+	/// Netherlands Antilles.
+	/// </summary>
+	AN,
+	/// <summary>
+	/// New Caledonia.
+	/// </summary>
+	NC,
+	/// <summary>
+	/// New Zealand.
+	/// </summary>
+	NZ,
+	/// <summary>
+	/// Nicaragua.
+	/// </summary>
+	NI,
+	/// <summary>
+	/// Niger.
+	/// </summary>
+	NE,
+	/// <summary>
+	/// Nigeria.
+	/// </summary>
+	NG,
+	/// <summary>
+	/// Niue.
+	/// </summary>
+	NU,
+	/// <summary>
+	/// Norfolk Island.
+	/// </summary>
+	NF,
+	/// <summary>
+	/// Northern Mariana Islands.
+	/// </summary>
+	MP,
+	/// <summary>
+	/// Norway.
+	/// </summary>
+	NO,
+	/// <summary>
+	/// Northern Cyprus.
+	/// </summary>
+	NorthernCyprus,
+	/// <summary>
+	/// Oman.
+	/// </summary>
+	OM,
+	/// <summary>
+	/// Pakistan.
+	/// </summary>
+	PK,
+	/// <summary>
+	/// Palau.
+	/// </summary>
+	PW,
+	/// <summary>
+	/// Palestinian Territory, Occupied.
+	/// </summary>
+	PS,
+	/// <summary>
+	/// Panama.
+	/// </summary>
+	PA,
+	/// <summary>
+	/// Papua New Guinea.
+	/// </summary>
+	PG,
+	/// <summary>
+	/// Paraguay.
+	/// </summary>
+	PY,
+	/// <summary>
+	/// Peru.
+	/// </summary>
+	PE,
+	/// <summary>
+	/// Philippines.
+	/// </summary>
+	PH,
+	/// <summary>
+	/// Pitcairn.
+	/// </summary>
+	PN,
+	/// <summary>
+	/// Poland.
+	/// </summary>
+	PL,
+	/// <summary>
+	/// Portugal.
+	/// </summary>
+	PT,
+	/// <summary>
+	/// Puerto Rico.
+	/// </summary>
+	PR,
+	/// <summary>
+	/// Qatar.
+	/// </summary>
+	QA,
+	/// <summary>
+	/// Romania.
+	/// </summary>
+	RO,
+	/// <summary>
+	/// Russian Federation.
+	/// </summary>
+	RU,
+	/// <summary>
+	/// Rwanda.
+	/// </summary>
+	RW,
+	/// <summary>
+	/// Saint Helena.
+	/// </summary>
+	SH,
+	/// <summary>
+	/// Saint Kitts and Nevis.
+	/// </summary>
+	KN,
+	/// <summary>
+	/// Saint Lucia.
+	/// </summary>
+	LC,
+	/// <summary>
+	/// Saint Vincent and Grenadines.
+	/// </summary>
+	VC,
+	/// <summary>
+	/// Saint-Barthelemy.
+	/// </summary>
+	BL,
+	/// <summary>
+	/// Saint-Martin (French part).
+	/// </summary>
+	MF,
+	/// <summary>
+	/// Samoa.
+	/// </summary>
+	WS,
+	/// <summary>
+	/// San Marino.
+	/// </summary>
+	SM,
+	/// <summary>
+	/// Sao Tome and Principe.
+	/// </summary>
+	ST,
+	/// <summary>
+	/// Saudi Arabia.
+	/// </summary>
+	SA,
+	/// <summary>
+	/// Scotland.
+	/// </summary>
+	Scotland,
+	/// <summary>
+	/// Senegal.
+	/// </summary>
+	SN,
+	/// <summary>
+	/// Serbia.
+	/// </summary>
+	RS,
+	/// <summary>
+	/// Seychelles.
+	/// </summary>
+	SC,
+	/// <summary>
+	/// Sierra Leone.
+	/// </summary>
+	SL,
+	/// <summary>
+	/// Singapore.
+	/// </summary>
+	SG,
+	/// <summary>
+	/// Slovakia.
+	/// </summary>
+	SK,
+	/// <summary>
+	/// Slovenia.
+	/// </summary>
+	SI,
+	/// <summary>
+	/// Solomon Islands.
+	/// </summary>
+	SB,
+	/// <summary>
+	/// Somalia.
+	/// </summary>
+	SO,
+	/// <summary>
+	/// Somaliland.
+	/// </summary>
+	Somaliland,
+	/// <summary>
+	/// South Africa.
+	/// </summary>
+	ZA,
+	/// <summary>
+	/// South Georgia and the South Sandwich Islands.
+	/// </summary>
+	GS,
+	/// <summary>
+	/// South Ossetia.
+	/// </summary>
+	SouthOssetia,
+	/// <summary>
+	/// South Sudan.
+	/// </summary>
+	SS,
+	/// <summary>
+	/// Spain.
+	/// </summary>
+	ES,
+	/// <summary>
+	/// Sri Lanka.
+	/// </summary>
+	LK,
+	/// <summary>
+	/// Sudan.
+	/// </summary>
+	SD,
+	/// <summary>
+	/// Suriname.
+	/// </summary>
+	SR,
+	/// <summary>
+	/// Swaziland.
+	/// </summary>
+	SZ,
+	/// <summary>
+	/// Sweden.
+	/// </summary>
+	SE,
+	/// <summary>
+	/// Switzerland.
+	/// </summary>
+	CH,
+	/// <summary>
+	/// Syrian Arab Republic (Syria).
+	/// </summary>
+	SY,
+	/// <summary>
+	/// Taiwan, Republic of China.
+	/// </summary>
+	TW,
+	/// <summary>
+	/// Tajikistan.
+	/// </summary>
+	TJ,
+	/// <summary>
+	/// Tanzania, United Republic of.
+	/// </summary>
+	TZ,
+	/// <summary>
+	/// Thailand.
+	/// </summary>
+	TH,
+	/// <summary>
+	/// Timor-Leste.
+	/// </summary>
+	TL,
+	/// <summary>
+	/// Togo.
+	/// </summary>
+	TG,
+	/// <summary>
+	/// Tokelau.
+	/// </summary>
+	TK,
+	/// <summary>
+	/// Tonga.
+	/// </summary>
+	TO,
+	/// <summary>
+	/// Trinidad and Tobago.
+	/// </summary>
+	TT,
+	/// <summary>
+	/// Tunisia.
+	/// </summary>
+	TN,
+	/// <summary>
+	/// Turkey.
+	/// </summary>
+	TR,
+	/// <summary>
+	/// Turkmenistan.
+	/// </summary>
+	TM,
+	/// <summary>
+	/// Turks and Caicos Islands.
+	/// </summary>
+	TC,
+	/// <summary>
+	/// Tuvalu.
+	/// </summary>
+	TV,
+	/// <summary>
+	/// Uganda.
+	/// </summary>
+	UG,
+	/// <summary>
+	/// Ukraine.
+	/// </summary>
+	UA,
+	/// <summary>
+	/// United Arab Emirates.
+	/// </summary>
+	AE,
+	/// <summary>
+	/// United Kingdom.
+	/// </summary>
+	GB,
+	/// <summary>
+	/// United States of America.
+	/// </summary>
+	US,
+	/// <summary>
+	/// Uruguay.
+	/// </summary>
+	UY,
+	/// <summary>
+	/// Uzbekistan.
+	/// </summary>
+	UZ,
+	/// <summary>
+	/// Vanuatu.
+	/// </summary>
+	VU,
+	/// <summary>
+	/// Venezuela (Bolivarian Republic of).
+	/// </summary>
+	VE,
+	/// <summary>
+	/// Viet Nam.
+	/// </summary>
+	VN,
+	/// <summary>
+	/// Virgin Islands, US.
+	/// </summary>
+	VI,
+	/// <summary>
+	/// Wales.
+	/// </summary>
+	Wales,
+	/// <summary>
+	/// Wallis and Futuna Islands.
+	/// </summary>
+	WF,
+	/// <summary>
+	/// Western Sahara.
+	/// </summary>
+	EH,
+	/// <summary>
+	/// Yemen.
+	/// </summary>
+	YE,
+	/// <summary>
+	/// Zambia.
+	/// </summary>
+	ZM,
+	/// <summary>
+	/// Zimbabwe.
+	/// </summary>
+	ZW,
 }
diff --git a/Common/CryptoAttribute.cs b/Common/CryptoAttribute.cs
index 6b7b0a24..68837879 100644
--- a/Common/CryptoAttribute.cs
+++ b/Common/CryptoAttribute.cs
@@ -1,12 +1,11 @@
-namespace Ecng.Common
-{
-	using System;
+namespace Ecng.Common;
+
+using System;
 
-	/// <summary>
-	/// The member marked as associated with crypto currency.
-	/// </summary>
-	[AttributeUsage(AttributeTargets.All)]
-	public class CryptoAttribute : Attribute
-	{
-	}
+/// <summary>
+/// The member marked as associated with crypto currency.
+/// </summary>
+[AttributeUsage(AttributeTargets.All)]
+public class CryptoAttribute : Attribute
+{
 }
\ No newline at end of file
diff --git a/Common/CsvFile.cs b/Common/CsvFile.cs
index 34d226b0..23d55cc7 100644
--- a/Common/CsvFile.cs
+++ b/Common/CsvFile.cs
@@ -14,370 +14,369 @@
 using System.IO;
 using System.Text;
 
-namespace Ecng.Common
+namespace Ecng.Common;
+
+/// <summary>
+/// Determines how empty lines are interpreted when reading CSV files.
+/// These values do not affect empty lines that occur within quoted fields
+/// or empty lines that appear at the end of the input file.
+/// </summary>
+public enum EmptyLineBehavior
 {
 	/// <summary>
-	/// Determines how empty lines are interpreted when reading CSV files.
-	/// These values do not affect empty lines that occur within quoted fields
-	/// or empty lines that appear at the end of the input file.
+	/// Empty lines are interpreted as a line with zero columns.
 	/// </summary>
-	public enum EmptyLineBehavior
+	NoColumns,
+	/// <summary>
+	/// Empty lines are interpreted as a line with a single empty column.
+	/// </summary>
+	EmptyColumn,
+	/// <summary>
+	/// Empty lines are skipped over as though they did not exist.
+	/// </summary>
+	Ignore,
+	/// <summary>
+	/// An empty line is interpreted as the end of the input file.
+	/// </summary>
+	EndOfFile,
+}
+
+/// <summary>
+/// Common base class for CSV reader and writer classes.
+/// </summary>
+public abstract class CsvFileCommon : Disposable
+{
+	/// <summary>
+	/// These are special characters in CSV files. If a column contains any
+	/// of these characters, the entire column is wrapped in double quotes.
+	/// </summary>
+	protected char[] SpecialChars = [';', '"', '\r', '\n'];
+
+	// Indexes into SpecialChars for characters with specific meaning
+	private const int _delimiterIndex = 0;
+	private const int _quoteIndex = 1;
+
+	/// <summary>
+	/// Gets/sets the character used for column delimiters.
+	/// </summary>
+	public char Delimiter
 	{
-		/// <summary>
-		/// Empty lines are interpreted as a line with zero columns.
-		/// </summary>
-		NoColumns,
-		/// <summary>
-		/// Empty lines are interpreted as a line with a single empty column.
-		/// </summary>
-		EmptyColumn,
-		/// <summary>
-		/// Empty lines are skipped over as though they did not exist.
-		/// </summary>
-		Ignore,
-		/// <summary>
-		/// An empty line is interpreted as the end of the input file.
-		/// </summary>
-		EndOfFile,
+		get => SpecialChars[_delimiterIndex];
+		set => SpecialChars[_delimiterIndex] = value;
 	}
 
 	/// <summary>
-	/// Common base class for CSV reader and writer classes.
+	/// Gets/sets the character used for column quotes.
 	/// </summary>
-	public abstract class CsvFileCommon : Disposable
+	public char Quote
 	{
-		/// <summary>
-		/// These are special characters in CSV files. If a column contains any
-		/// of these characters, the entire column is wrapped in double quotes.
-		/// </summary>
-		protected char[] SpecialChars = [';', '"', '\r', '\n'];
-
-		// Indexes into SpecialChars for characters with specific meaning
-		private const int _delimiterIndex = 0;
-		private const int _quoteIndex = 1;
-
-		/// <summary>
-		/// Gets/sets the character used for column delimiters.
-		/// </summary>
-		public char Delimiter
-		{
-			get => SpecialChars[_delimiterIndex];
-			set => SpecialChars[_delimiterIndex] = value;
-		}
-
-		/// <summary>
-		/// Gets/sets the character used for column quotes.
-		/// </summary>
-		public char Quote
-		{
-			get => SpecialChars[_quoteIndex];
-			set => SpecialChars[_quoteIndex] = value;
-		}
+		get => SpecialChars[_quoteIndex];
+		set => SpecialChars[_quoteIndex] = value;
 	}
+}
+
+/// <summary>
+/// Class for reading from comma-separated-value (CSV) files
+/// </summary>
+public class CsvFileReader : CsvFileCommon, IDisposable
+{
+	// Private members
+	private readonly TextReader _reader;
+	private int _currPos;
+	private readonly EmptyLineBehavior _emptyLineBehavior;
+	private readonly string _lineSeparator;
+
+	/// <summary>
+	/// The current line being read.
+	/// </summary>
+	public string CurrLine { get; private set; }
 
 	/// <summary>
-	/// Class for reading from comma-separated-value (CSV) files
+	/// Initializes a new instance of the CsvFileReader class for the
+	/// specified stream.
 	/// </summary>
-	public class CsvFileReader : CsvFileCommon, IDisposable
+	/// <param name="stream">The stream to read from</param>
+	/// <param name="lineSeparator">The line separator to use.</param>
+	/// <param name="emptyLineBehavior">Determines how empty lines are handled</param>
+	public CsvFileReader(Stream stream,
+		string lineSeparator,
+		EmptyLineBehavior emptyLineBehavior = EmptyLineBehavior.NoColumns)
+		: this(new StreamReader(stream), lineSeparator, emptyLineBehavior)
 	{
-		// Private members
-		private readonly TextReader _reader;
-		private int _currPos;
-		private readonly EmptyLineBehavior _emptyLineBehavior;
-		private readonly string _lineSeparator;
-
-		/// <summary>
-		/// The current line being read.
-		/// </summary>
-		public string CurrLine { get; private set; }
-
-		/// <summary>
-		/// Initializes a new instance of the CsvFileReader class for the
-		/// specified stream.
-		/// </summary>
-		/// <param name="stream">The stream to read from</param>
-		/// <param name="lineSeparator">The line separator to use.</param>
-		/// <param name="emptyLineBehavior">Determines how empty lines are handled</param>
-		public CsvFileReader(Stream stream,
-			string lineSeparator,
-			EmptyLineBehavior emptyLineBehavior = EmptyLineBehavior.NoColumns)
-			: this(new StreamReader(stream), lineSeparator, emptyLineBehavior)
-		{
-		}
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the CsvFileReader class for the
-		/// specified file path.
-		/// </summary>
-		/// <param name="path">The name of the CSV file to read from</param>
-		/// <param name="lineSeparator">The line separator to use.</param>
-		/// <param name="emptyLineBehavior">Determines how empty lines are handled</param>
-		public CsvFileReader(string path,
-			string lineSeparator,
-			EmptyLineBehavior emptyLineBehavior = EmptyLineBehavior.NoColumns)
-			: this(new StreamReader(path), lineSeparator, emptyLineBehavior)
-		{
-		}
+	/// <summary>
+	/// Initializes a new instance of the CsvFileReader class for the
+	/// specified file path.
+	/// </summary>
+	/// <param name="path">The name of the CSV file to read from</param>
+	/// <param name="lineSeparator">The line separator to use.</param>
+	/// <param name="emptyLineBehavior">Determines how empty lines are handled</param>
+	public CsvFileReader(string path,
+		string lineSeparator,
+		EmptyLineBehavior emptyLineBehavior = EmptyLineBehavior.NoColumns)
+		: this(new StreamReader(path), lineSeparator, emptyLineBehavior)
+	{
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the CsvFileReader class for the
-		/// specified file path.
-		/// </summary>
-		/// <param name="reader">The file reader.</param>
-		/// <param name="lineSeparator">The line separator to use.</param>
-		/// <param name="emptyLineBehavior">Determines how empty lines are handled</param>
-		public CsvFileReader(TextReader reader,
-			string lineSeparator,
-			EmptyLineBehavior emptyLineBehavior = EmptyLineBehavior.NoColumns)
-		{
-			if (lineSeparator.IsEmpty())
-				throw new ArgumentNullException(nameof(lineSeparator));
+	/// <summary>
+	/// Initializes a new instance of the CsvFileReader class for the
+	/// specified file path.
+	/// </summary>
+	/// <param name="reader">The file reader.</param>
+	/// <param name="lineSeparator">The line separator to use.</param>
+	/// <param name="emptyLineBehavior">Determines how empty lines are handled</param>
+	public CsvFileReader(TextReader reader,
+		string lineSeparator,
+		EmptyLineBehavior emptyLineBehavior = EmptyLineBehavior.NoColumns)
+	{
+		if (lineSeparator.IsEmpty())
+			throw new ArgumentNullException(nameof(lineSeparator));
 
-			_reader = reader;
-			_lineSeparator = lineSeparator;
-			_emptyLineBehavior = emptyLineBehavior;
-		}
+		_reader = reader;
+		_lineSeparator = lineSeparator;
+		_emptyLineBehavior = emptyLineBehavior;
+	}
 
-		/// <summary>
-		/// Reads a row of columns from the current CSV file. Returns false if no
-		/// more data could be read because the end of the file was reached.
-		/// </summary>
-		/// <param name="columns">Collection to hold the columns read</param>
-		public bool ReadRow(List<string> columns)
+	/// <summary>
+	/// Reads a row of columns from the current CSV file. Returns false if no
+	/// more data could be read because the end of the file was reached.
+	/// </summary>
+	/// <param name="columns">Collection to hold the columns read</param>
+	public bool ReadRow(List<string> columns)
+	{
+		// Verify required argument
+		if (columns is null)
+			throw new ArgumentNullException(nameof(columns));
+
+	ReadNextLine:
+		// Read next line from the file
+		CurrLine = _reader.ReadLine();
+		_currPos = 0;
+		// Test for end of file
+		if (CurrLine is null)
+			return false;
+		// Test for empty line
+		if (CurrLine.Length == 0)
 		{
-			// Verify required argument
-			if (columns is null)
-				throw new ArgumentNullException(nameof(columns));
-
-		ReadNextLine:
-			// Read next line from the file
-			CurrLine = _reader.ReadLine();
-			_currPos = 0;
-			// Test for end of file
-			if (CurrLine is null)
-				return false;
-			// Test for empty line
-			if (CurrLine.Length == 0)
+			switch (_emptyLineBehavior)
 			{
-				switch (_emptyLineBehavior)
-				{
-					case EmptyLineBehavior.NoColumns:
-						columns.Clear();
-						return true;
-					case EmptyLineBehavior.Ignore:
-						goto ReadNextLine;
-					case EmptyLineBehavior.EndOfFile:
-						return false;
-				}
+				case EmptyLineBehavior.NoColumns:
+					columns.Clear();
+					return true;
+				case EmptyLineBehavior.Ignore:
+					goto ReadNextLine;
+				case EmptyLineBehavior.EndOfFile:
+					return false;
 			}
-
-			// Parse line
-			string column;
-			int numColumns = 0;
-			while (true)
-			{
-				// Read next column
-				if (_currPos < CurrLine.Length && CurrLine[_currPos] == Quote)
-					column = ReadQuotedColumn();
-				else
-					column = ReadUnquotedColumn();
-				// Add column to list
-				if (numColumns < columns.Count)
-					columns[numColumns] = column;
-				else
-					columns.Add(column);
-				numColumns++;
-				// Break if we reached the end of the line
-				if (CurrLine is null || _currPos == CurrLine.Length)
-					break;
-				// Otherwise skip delimiter
-				Debug.Assert(CurrLine[_currPos] == Delimiter);
-				_currPos++;
-			}
-			// Remove any unused columns from collection
-			if (numColumns < columns.Count)
-				columns.RemoveRange(numColumns, columns.Count - numColumns);
-			// Indicate success
-			return true;
 		}
 
-		/// <summary>
-		/// Reads a quoted column by reading from the current line until a
-		/// closing quote is found or the end of the file is reached. On return,
-		/// the current position points to the delimiter or the end of the last
-		/// line in the file. Note: CurrLine may be set to null on return.
-		/// </summary>
-		private string ReadQuotedColumn()
+		// Parse line
+		string column;
+		int numColumns = 0;
+		while (true)
 		{
-			// Skip opening quote character
-			Debug.Assert(_currPos < CurrLine.Length && CurrLine[_currPos] == Quote);
+			// Read next column
+			if (_currPos < CurrLine.Length && CurrLine[_currPos] == Quote)
+				column = ReadQuotedColumn();
+			else
+				column = ReadUnquotedColumn();
+			// Add column to list
+			if (numColumns < columns.Count)
+				columns[numColumns] = column;
+			else
+				columns.Add(column);
+			numColumns++;
+			// Break if we reached the end of the line
+			if (CurrLine is null || _currPos == CurrLine.Length)
+				break;
+			// Otherwise skip delimiter
+			Debug.Assert(CurrLine[_currPos] == Delimiter);
 			_currPos++;
+		}
+		// Remove any unused columns from collection
+		if (numColumns < columns.Count)
+			columns.RemoveRange(numColumns, columns.Count - numColumns);
+		// Indicate success
+		return true;
+	}
 
-			// Parse column
-			StringBuilder builder = new();
-			while (true)
+	/// <summary>
+	/// Reads a quoted column by reading from the current line until a
+	/// closing quote is found or the end of the file is reached. On return,
+	/// the current position points to the delimiter or the end of the last
+	/// line in the file. Note: CurrLine may be set to null on return.
+	/// </summary>
+	private string ReadQuotedColumn()
+	{
+		// Skip opening quote character
+		Debug.Assert(_currPos < CurrLine.Length && CurrLine[_currPos] == Quote);
+		_currPos++;
+
+		// Parse column
+		StringBuilder builder = new();
+		while (true)
+		{
+			while (_currPos == CurrLine.Length)
 			{
-				while (_currPos == CurrLine.Length)
-				{
-					// End of line so attempt to read the next line
-					CurrLine = _reader.ReadLine();
-					_currPos = 0;
-					// Done if we reached the end of the file
-					if (CurrLine is null)
-						return builder.ToString();
-					// Otherwise, treat as a multi-line field
-					builder.Append(_lineSeparator);
-				}
-
-				// Test for quote character
-				if (CurrLine[_currPos] == Quote)
-				{
-					// If two quotes, skip first and treat second as literal
-					int nextPos = (_currPos + 1);
-					if (nextPos < CurrLine.Length && CurrLine[nextPos] == Quote)
-						_currPos++;
-					else
-						break;  // Single quote ends quoted sequence
-				}
-				// Add current character to the column
-				builder.Append(CurrLine[_currPos++]);
+				// End of line so attempt to read the next line
+				CurrLine = _reader.ReadLine();
+				_currPos = 0;
+				// Done if we reached the end of the file
+				if (CurrLine is null)
+					return builder.ToString();
+				// Otherwise, treat as a multi-line field
+				builder.Append(_lineSeparator);
 			}
 
-			if (_currPos < CurrLine.Length)
+			// Test for quote character
+			if (CurrLine[_currPos] == Quote)
 			{
-				// Consume closing quote
-				Debug.Assert(CurrLine[_currPos] == Quote);
-				_currPos++;
-				// Append any additional characters appearing before next delimiter
-				builder.Append(ReadUnquotedColumn());
+				// If two quotes, skip first and treat second as literal
+				int nextPos = (_currPos + 1);
+				if (nextPos < CurrLine.Length && CurrLine[nextPos] == Quote)
+					_currPos++;
+				else
+					break;  // Single quote ends quoted sequence
 			}
-			// Return column value
-			return builder.ToString();
+			// Add current character to the column
+			builder.Append(CurrLine[_currPos++]);
 		}
 
-		/// <summary>
-		/// Reads an unquoted column by reading from the current line until a
-		/// delimiter is found or the end of the line is reached. On return, the
-		/// current position points to the delimiter or the end of the current
-		/// line.
-		/// </summary>
-		private string ReadUnquotedColumn()
+		if (_currPos < CurrLine.Length)
 		{
-			int startPos = _currPos;
-			_currPos = CurrLine.IndexOf(Delimiter, _currPos);
-			if (_currPos == -1)
-				_currPos = CurrLine.Length;
-			if (_currPos > startPos)
-				return CurrLine.Substring(startPos, _currPos - startPos);
-			return string.Empty;
-		}
-
-		/// <inheritdoc />
-		protected override void DisposeManaged()
-		{
-			_reader.Dispose();
-			base.DisposeManaged();
+			// Consume closing quote
+			Debug.Assert(CurrLine[_currPos] == Quote);
+			_currPos++;
+			// Append any additional characters appearing before next delimiter
+			builder.Append(ReadUnquotedColumn());
 		}
+		// Return column value
+		return builder.ToString();
 	}
 
 	/// <summary>
-	/// Class for writing to comma-separated-value (CSV) files.
+	/// Reads an unquoted column by reading from the current line until a
+	/// delimiter is found or the end of the line is reached. On return, the
+	/// current position points to the delimiter or the end of the current
+	/// line.
 	/// </summary>
-	public class CsvFileWriter : CsvFileCommon, IDisposable
+	private string ReadUnquotedColumn()
 	{
-		private readonly StreamWriter _writer;
-
-		// Private members
-		private string _oneQuote;
-		private string _twoQuotes;
-		private string _quotedFormat;
-
-		/// <summary>
-		/// Initializes a new instance of the CsvFileWriter class for the
-		/// specified stream.
-		/// </summary>
-		/// <param name="stream">The stream to write to</param>
-		/// <param name="encoding">The text encoding.</param>
-		public CsvFileWriter(Stream stream, Encoding encoding = null) {
-			_writer = encoding != null ?
-				new StreamWriter(stream, encoding) :
-				new StreamWriter(stream);
-		}
+		int startPos = _currPos;
+		_currPos = CurrLine.IndexOf(Delimiter, _currPos);
+		if (_currPos == -1)
+			_currPos = CurrLine.Length;
+		if (_currPos > startPos)
+			return CurrLine.Substring(startPos, _currPos - startPos);
+		return string.Empty;
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the CsvFileWriter class for the
-		/// specified file path.
-		/// </summary>
-		/// <param name="path">The name of the CSV file to write to</param>
-		public CsvFileWriter(string path)
-		{
-			_writer = new StreamWriter(path);
-		}
+	/// <inheritdoc />
+	protected override void DisposeManaged()
+	{
+		_reader.Dispose();
+		base.DisposeManaged();
+	}
+}
 
-		/// <summary>
-		/// Writes a row of columns to the current CSV file.
-		/// </summary>
-		/// <param name="columns">The list of columns to write</param>
-		public void WriteRow(IEnumerable<string> columns)
-		{
-			// Verify required argument
-			if (columns is null)
-				throw new ArgumentNullException(nameof(columns));
+/// <summary>
+/// Class for writing to comma-separated-value (CSV) files.
+/// </summary>
+public class CsvFileWriter : CsvFileCommon, IDisposable
+{
+	private readonly StreamWriter _writer;
 
-			var i = 0;
+	// Private members
+	private string _oneQuote;
+	private string _twoQuotes;
+	private string _quotedFormat;
 
-			// Write each column
-			foreach (var c in columns)
-			{
-				// Add delimiter if this isn't the first column
-				if (i > 0)
-					_writer.Write(Delimiter);
+	/// <summary>
+	/// Initializes a new instance of the CsvFileWriter class for the
+	/// specified stream.
+	/// </summary>
+	/// <param name="stream">The stream to write to</param>
+	/// <param name="encoding">The text encoding.</param>
+	public CsvFileWriter(Stream stream, Encoding encoding = null) {
+		_writer = encoding != null ?
+			new StreamWriter(stream, encoding) :
+			new StreamWriter(stream);
+	}
 
-				// Write this column
-				_writer.Write(Encode(c ?? string.Empty));
-				i++;
-			}
+	/// <summary>
+	/// Initializes a new instance of the CsvFileWriter class for the
+	/// specified file path.
+	/// </summary>
+	/// <param name="path">The name of the CSV file to write to</param>
+	public CsvFileWriter(string path)
+	{
+		_writer = new StreamWriter(path);
+	}
 
-			_writer.WriteLine();
-		}
+	/// <summary>
+	/// Writes a row of columns to the current CSV file.
+	/// </summary>
+	/// <param name="columns">The list of columns to write</param>
+	public void WriteRow(IEnumerable<string> columns)
+	{
+		// Verify required argument
+		if (columns is null)
+			throw new ArgumentNullException(nameof(columns));
+
+		var i = 0;
 
-		/// <summary>
-		/// Encodes a column's value for output.
-		/// </summary>
-		/// <param name="column"></param>
-		/// <returns></returns>
-		public string Encode(string column)
+		// Write each column
+		foreach (var c in columns)
 		{
-			// Ensure we're using current quote character
-			if (_oneQuote is null || _oneQuote[0] != Quote)
-			{
-				_oneQuote = $"{Quote}";
-				_twoQuotes = string.Format("{0}{0}", Quote);
-				_quotedFormat = string.Format("{0}{{0}}{0}", Quote);
-			}
+			// Add delimiter if this isn't the first column
+			if (i > 0)
+				_writer.Write(Delimiter);
 
 			// Write this column
-			if (column.IndexOfAny(SpecialChars) != -1)
-				column = _quotedFormat.Put(column.Replace(_oneQuote, _twoQuotes));
-
-			return column;
+			_writer.Write(Encode(c ?? string.Empty));
+			i++;
 		}
 
-		/// <summary>
-		/// Clears all buffers for the current writer and causes any buffered data to be written to the underlying stream.
-		/// </summary>
-		public void Flush() => _writer.Flush();
-
-		/// <summary>
-		/// Truncates the underlying stream used by the <see cref="CsvFileWriter"/> by clearing its content.
-		/// </summary>
-		public void Truncate() => _writer.Truncate();
+		_writer.WriteLine();
+	}
 
-		/// <inheritdoc />
-		protected override void DisposeManaged()
+	/// <summary>
+	/// Encodes a column's value for output.
+	/// </summary>
+	/// <param name="column"></param>
+	/// <returns></returns>
+	public string Encode(string column)
+	{
+		// Ensure we're using current quote character
+		if (_oneQuote is null || _oneQuote[0] != Quote)
 		{
-			_writer.Dispose();
-			base.DisposeManaged();
+			_oneQuote = $"{Quote}";
+			_twoQuotes = string.Format("{0}{0}", Quote);
+			_quotedFormat = string.Format("{0}{{0}}{0}", Quote);
 		}
+
+		// Write this column
+		if (column.IndexOfAny(SpecialChars) != -1)
+			column = _quotedFormat.Put(column.Replace(_oneQuote, _twoQuotes));
+
+		return column;
+	}
+
+	/// <summary>
+	/// Clears all buffers for the current writer and causes any buffered data to be written to the underlying stream.
+	/// </summary>
+	public void Flush() => _writer.Flush();
+
+	/// <summary>
+	/// Truncates the underlying stream used by the <see cref="CsvFileWriter"/> by clearing its content.
+	/// </summary>
+	public void Truncate() => _writer.Truncate();
+
+	/// <inheritdoc />
+	protected override void DisposeManaged()
+	{
+		_writer.Dispose();
+		base.DisposeManaged();
 	}
 }
diff --git a/Common/Currency.cs b/Common/Currency.cs
index fc0b5254..4e357fb4 100644
--- a/Common/Currency.cs
+++ b/Common/Currency.cs
@@ -1,137 +1,136 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+using System;
+using System.Runtime.Serialization;
+
+/// <summary>
+/// Currency.
+/// </summary>
+[DataContract]
+[Serializable]
+public class Currency : Equatable<Currency>
 {
-	using System;
-	using System.Runtime.Serialization;
+	/// <summary>
+	/// Currency type. The default is <see cref="CurrencyTypes.USD"/>.
+	/// </summary>
+	[DataMember]
+	public CurrencyTypes Type { get; set; } = CurrencyTypes.USD;
+
+	/// <summary>
+	/// Absolute value in <see cref="CurrencyTypes"/>.
+	/// </summary>
+	[DataMember]
+	public decimal Value { get; set; }
+
+	/// <summary>
+	/// Create a copy of <see cref="Currency"/>.
+	/// </summary>
+	/// <returns>Copy.</returns>
+	public override Currency Clone() => new() { Type = Type, Value = Value };
+
+	/// <summary>
+	/// Compare <see cref="Currency"/> on the equivalence.
+	/// </summary>
+	/// <param name="other">Another value with which to compare.</param>
+	/// <returns><see langword="true" />, if the specified object is equal to the current object, otherwise, <see langword="false" />.</returns>
+	protected override bool OnEquals(Currency other)
+		=> Type == other.Type && Value == other.Value;
+
+	/// <summary>
+	/// Get the hash code of the object <see cref="Currency"/>.
+	/// </summary>
+	/// <returns>A hash code.</returns>
+	public override int GetHashCode() => Type.GetHashCode() ^ Value.GetHashCode();
+
+	/// <inheritdoc />
+	public override string ToString() => $"{Value} {Type}";
+
+	/// <summary>
+	/// Cast <see cref="decimal"/> object to the type <see cref="Currency"/>.
+	/// </summary>
+	/// <param name="value"><see cref="decimal"/> value.</param>
+	/// <returns>Object <see cref="Currency"/>.</returns>
+	[Obsolete]
+	public static implicit operator Currency(decimal value) => new() { Value = value };
+
+	/// <summary>
+	/// Cast object from <see cref="Currency"/> to <see cref="decimal"/>.
+	/// </summary>
+	/// <param name="value">Object <see cref="Currency"/>.</param>
+	/// <returns><see cref="decimal"/> value.</returns>
+	[Obsolete]
+	public static explicit operator decimal(Currency value)
+	{
+		if (value is null)
+			throw new ArgumentNullException(nameof(value));
+
+		return value.Value;
+	}
+
+	private static void CheckArgs(Currency c1, Currency c2)
+	{
+		if (c1 is null)
+			throw new ArgumentNullException(nameof(c1));
+
+		if (c2 is null)
+			throw new ArgumentNullException(nameof(c2));
+
+		if (c1.Type != c2.Type)
+			throw new InvalidOperationException($"c1.{c1.Type} != c2.{c2.Type}");
+	}
 
 	/// <summary>
-	/// Currency.
+	/// Add the two objects <see cref="Currency"/>.
 	/// </summary>
-	[DataContract]
-	[Serializable]
-	public class Currency : Equatable<Currency>
+	/// <param name="c1">First object <see cref="Currency"/>.</param>
+	/// <param name="c2">Second object <see cref="Currency"/>.</param>
+	/// <returns>The result of addition.</returns>
+	/// <remarks>
+	/// The values must be the same <see cref="Type"/>.
+	/// </remarks>
+	public static Currency operator +(Currency c1, Currency c2)
 	{
-		/// <summary>
-		/// Currency type. The default is <see cref="CurrencyTypes.USD"/>.
-		/// </summary>
-		[DataMember]
-		public CurrencyTypes Type { get; set; } = CurrencyTypes.USD;
-
-		/// <summary>
-		/// Absolute value in <see cref="CurrencyTypes"/>.
-		/// </summary>
-		[DataMember]
-		public decimal Value { get; set; }
-
-		/// <summary>
-		/// Create a copy of <see cref="Currency"/>.
-		/// </summary>
-		/// <returns>Copy.</returns>
-		public override Currency Clone() => new() { Type = Type, Value = Value };
-
-		/// <summary>
-		/// Compare <see cref="Currency"/> on the equivalence.
-		/// </summary>
-		/// <param name="other">Another value with which to compare.</param>
-		/// <returns><see langword="true" />, if the specified object is equal to the current object, otherwise, <see langword="false" />.</returns>
-		protected override bool OnEquals(Currency other)
-			=> Type == other.Type && Value == other.Value;
-
-		/// <summary>
-		/// Get the hash code of the object <see cref="Currency"/>.
-		/// </summary>
-		/// <returns>A hash code.</returns>
-		public override int GetHashCode() => Type.GetHashCode() ^ Value.GetHashCode();
-
-		/// <inheritdoc />
-		public override string ToString() => $"{Value} {Type}";
-
-		/// <summary>
-		/// Cast <see cref="decimal"/> object to the type <see cref="Currency"/>.
-		/// </summary>
-		/// <param name="value"><see cref="decimal"/> value.</param>
-		/// <returns>Object <see cref="Currency"/>.</returns>
-		[Obsolete]
-		public static implicit operator Currency(decimal value) => new() { Value = value };
-
-		/// <summary>
-		/// Cast object from <see cref="Currency"/> to <see cref="decimal"/>.
-		/// </summary>
-		/// <param name="value">Object <see cref="Currency"/>.</param>
-		/// <returns><see cref="decimal"/> value.</returns>
-		[Obsolete]
-		public static explicit operator decimal(Currency value)
-		{
-			if (value is null)
-				throw new ArgumentNullException(nameof(value));
-
-			return value.Value;
-		}
-
-		private static void CheckArgs(Currency c1, Currency c2)
-		{
-			if (c1 is null)
-				throw new ArgumentNullException(nameof(c1));
-
-			if (c2 is null)
-				throw new ArgumentNullException(nameof(c2));
-
-			if (c1.Type != c2.Type)
-				throw new InvalidOperationException($"c1.{c1.Type} != c2.{c2.Type}");
-		}
-
-		/// <summary>
-		/// Add the two objects <see cref="Currency"/>.
-		/// </summary>
-		/// <param name="c1">First object <see cref="Currency"/>.</param>
-		/// <param name="c2">Second object <see cref="Currency"/>.</param>
-		/// <returns>The result of addition.</returns>
-		/// <remarks>
-		/// The values must be the same <see cref="Type"/>.
-		/// </remarks>
-		public static Currency operator +(Currency c1, Currency c2)
-		{
-			CheckArgs(c1, c2);
-
-			return (c1.Value + c2.Value).ToCurrency(c1.Type);
-		}
-
-		/// <summary>
-		/// Subtract one value from another value.
-		/// </summary>
-		/// <param name="c1">First object <see cref="Currency"/>.</param>
-		/// <param name="c2">Second object <see cref="Currency"/>.</param>
-		/// <returns>The result of the subtraction.</returns>
-		public static Currency operator -(Currency c1, Currency c2)
-		{
-			CheckArgs(c1, c2);
-
-			return (c1.Value - c2.Value).ToCurrency(c1.Type);
-		}
-
-		/// <summary>
-		/// Multiply one value to another.
-		/// </summary>
-		/// <param name="c1">First object <see cref="Currency"/>.</param>
-		/// <param name="c2">Second object <see cref="Currency"/>.</param>
-		/// <returns>The result of the multiplication.</returns>
-		public static Currency operator *(Currency c1, Currency c2)
-		{
-			CheckArgs(c1, c2);
-
-			return (c1.Value * c2.Value).ToCurrency(c1.Type);
-		}
-
-		/// <summary>
-		/// Divide one value to another.
-		/// </summary>
-		/// <param name="c1">First object <see cref="Currency"/>.</param>
-		/// <param name="c2">Second object <see cref="Currency"/>.</param>
-		/// <returns>The result of the division.</returns>
-		public static Currency operator /(Currency c1, Currency c2)
-		{
-			CheckArgs(c1, c2);
-
-			return (c1.Value / c2.Value).ToCurrency(c1.Type);
-		}
+		CheckArgs(c1, c2);
+
+		return (c1.Value + c2.Value).ToCurrency(c1.Type);
+	}
+
+	/// <summary>
+	/// Subtract one value from another value.
+	/// </summary>
+	/// <param name="c1">First object <see cref="Currency"/>.</param>
+	/// <param name="c2">Second object <see cref="Currency"/>.</param>
+	/// <returns>The result of the subtraction.</returns>
+	public static Currency operator -(Currency c1, Currency c2)
+	{
+		CheckArgs(c1, c2);
+
+		return (c1.Value - c2.Value).ToCurrency(c1.Type);
+	}
+
+	/// <summary>
+	/// Multiply one value to another.
+	/// </summary>
+	/// <param name="c1">First object <see cref="Currency"/>.</param>
+	/// <param name="c2">Second object <see cref="Currency"/>.</param>
+	/// <returns>The result of the multiplication.</returns>
+	public static Currency operator *(Currency c1, Currency c2)
+	{
+		CheckArgs(c1, c2);
+
+		return (c1.Value * c2.Value).ToCurrency(c1.Type);
+	}
+
+	/// <summary>
+	/// Divide one value to another.
+	/// </summary>
+	/// <param name="c1">First object <see cref="Currency"/>.</param>
+	/// <param name="c2">Second object <see cref="Currency"/>.</param>
+	/// <returns>The result of the division.</returns>
+	public static Currency operator /(Currency c1, Currency c2)
+	{
+		CheckArgs(c1, c2);
+
+		return (c1.Value / c2.Value).ToCurrency(c1.Type);
 	}
 }
\ No newline at end of file
diff --git a/Common/CurrencyHelper.cs b/Common/CurrencyHelper.cs
index 51175209..f37f7b92 100644
--- a/Common/CurrencyHelper.cs
+++ b/Common/CurrencyHelper.cs
@@ -1,47 +1,46 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+/// <summary>
+/// Extension class for <see cref="Currency"/>.
+/// </summary>
+public static class CurrencyHelper
 {
 	/// <summary>
-	/// Extension class for <see cref="Currency"/>.
+	/// Determines the specified type is crypto currency.
 	/// </summary>
-	public static class CurrencyHelper
-	{
-		/// <summary>
-		/// Determines the specified type is crypto currency.
-		/// </summary>
-		/// <param name="type">Currency type.</param>
-		/// <returns>Check result.</returns>
-		public static bool IsCrypto(this CurrencyTypes type)
-			=> type.GetAttributeOfType<CryptoAttribute>() != null;
+	/// <param name="type">Currency type.</param>
+	/// <returns>Check result.</returns>
+	public static bool IsCrypto(this CurrencyTypes type)
+		=> type.GetAttributeOfType<CryptoAttribute>() != null;
 
-		/// <summary>
-		/// Cast <see cref="decimal"/> to <see cref="Currency"/>.
-		/// </summary>
-		/// <param name="value">Currency value.</param>
-		/// <param name="type">Currency type.</param>
-		/// <returns>Currency.</returns>
-		public static Currency ToCurrency(this decimal value, CurrencyTypes type)
-			=> new() { Type = type, Value = value };
+	/// <summary>
+	/// Cast <see cref="decimal"/> to <see cref="Currency"/>.
+	/// </summary>
+	/// <param name="value">Currency value.</param>
+	/// <param name="type">Currency type.</param>
+	/// <returns>Currency.</returns>
+	public static Currency ToCurrency(this decimal value, CurrencyTypes type)
+		=> new() { Type = type, Value = value };
 
-		/// <summary>
-		/// Get the currency symbol.
-		/// </summary>
-		/// <param name="currency"><see cref="CurrencyTypes"/></param>
-		/// <returns>The currency symbol.</returns>
-		public static string GetPrefix(this CurrencyTypes currency)
-			=> currency switch
-			{
-				CurrencyTypes.USD => "$",
-				CurrencyTypes.EUR => "€",
-				CurrencyTypes.RUB => "₽",
-				CurrencyTypes.GBP => "£",
-				CurrencyTypes.JPY or CurrencyTypes.CNY => "¥",
-				CurrencyTypes.THB => "฿",
-				CurrencyTypes.BTC => "₿",
-				CurrencyTypes.CHF => "₣",
-				CurrencyTypes.INR => "₹",
-				CurrencyTypes.AED => "د.إ",
-				CurrencyTypes.KRW => "₩",
-				_ => currency.ToString(),
-			};	
-	}
+	/// <summary>
+	/// Get the currency symbol.
+	/// </summary>
+	/// <param name="currency"><see cref="CurrencyTypes"/></param>
+	/// <returns>The currency symbol.</returns>
+	public static string GetPrefix(this CurrencyTypes currency)
+		=> currency switch
+		{
+			CurrencyTypes.USD => "$",
+			CurrencyTypes.EUR => "€",
+			CurrencyTypes.RUB => "₽",
+			CurrencyTypes.GBP => "£",
+			CurrencyTypes.JPY or CurrencyTypes.CNY => "¥",
+			CurrencyTypes.THB => "฿",
+			CurrencyTypes.BTC => "₿",
+			CurrencyTypes.CHF => "₣",
+			CurrencyTypes.INR => "₹",
+			CurrencyTypes.AED => "د.إ",
+			CurrencyTypes.KRW => "₩",
+			_ => currency.ToString(),
+		};	
 }
\ No newline at end of file
diff --git a/Common/CurrencyTypes.cs b/Common/CurrencyTypes.cs
index b4396568..5ce41c20 100644
--- a/Common/CurrencyTypes.cs
+++ b/Common/CurrencyTypes.cs
@@ -1,1540 +1,1539 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+using System;
+using System.Runtime.Serialization;
+using System.Xml.Serialization;
+
+/// <summary>
+/// Currency type.
+/// </summary>
+/// <remarks>
+/// The codes are set in accordance with the ISO 4217 Currency Codes.
+/// </remarks>
+[Serializable]
+[XmlType(Namespace = "http://www.webserviceX.NET/")]
+[DataContract]
+public enum CurrencyTypes
 {
-	using System;
-	using System.Runtime.Serialization;
-	using System.Xml.Serialization;
+// ReSharper disable InconsistentNaming
+	/// <summary>
+	/// Afghanistan, Afghanis.
+	/// </summary>
+	[EnumMember]
+	AFA,
+
+	/// <summary>
+	/// Turkmenistan, Turkmenistani manat.
+	/// </summary>
+	[EnumMember]
+	TMT,
+
+	/// <summary>
+	/// Uzbekistan, Uzbekistan som.
+	/// </summary>
+	[EnumMember]
+	UZS,
+
+	/// <summary>
+	/// Tajikistan, Somoni.
+	/// </summary>
+	[EnumMember]
+	TJS,
+
+	/// <summary>
+	/// Armenia, Armenian dram.
+	/// </summary>
+	[EnumMember]
+	AMD,
+
+	/// <summary>
+	/// International Monetary Fund, Special Drawing Rights.
+	/// </summary>
+	[EnumMember]
+	XDR,
+
+	/// <summary>
+	/// Azerbaijan, Azerbaijani manat.
+	/// </summary>
+	[EnumMember]
+	AZN,
+
+	/// <summary>
+	/// Belarus, Belarusian ruble.
+	/// </summary>
+	[EnumMember]
+	BYR,
+
+	/// <summary>
+	/// Belarus, Belarusian ruble.
+	/// </summary>
+	[EnumMember]
+	BYN,
+
+	/// <summary>
+	/// Romania, Romanian new leu.
+	/// </summary>
+	[EnumMember]
+	RON,
+
+	/// <summary>
+	/// Bulgaria, Bulgarian lev.
+	/// </summary>
+	[EnumMember]
+	BGN,
+
+	/// <summary>
+	/// Kyrgyzstan, Kyrgyzstani som.
+	/// </summary>
+	[EnumMember]
+	KGS,
+
+	/// <summary>
+	/// Albania, Leke.
+	/// </summary>
+	[EnumMember]
+	ALL,
+
+	/// <summary>
+	/// Algeria, Algeria Dinars.
+	/// </summary>
+	[EnumMember]
+	DZD,
+
+	/// <summary>
+	/// Argentina, Pesos.
+	/// </summary>
+	[EnumMember]
+	ARS,
+
+	/// <summary>
+	/// Aruba, Guilders (also called Florins).
+	/// </summary>
+	[EnumMember]
+	AWG,
+
+	/// <summary>
+	/// Australia, Dollars.
+	/// </summary>
+	[EnumMember]
+	AUD,
+
+	/// <summary>
+	/// Bahamas, Dollars.
+	/// </summary>
+	[EnumMember]
+	BSD,
+
+	/// <summary>
+	/// Bahrain, Dinars.
+	/// </summary>
+	[EnumMember]
+	BHD,
+
+	/// <summary>
+	/// Bangladesh, Taka.
+	/// </summary>
+	[EnumMember]
+	BDT,
+
+	/// <summary>
+	/// Barbados, Dollars.
+	/// </summary>
+	[EnumMember]
+	BBD,
+
+	/// <summary>
+	/// Belize, Dollars.
+	/// </summary>
+	[EnumMember]
+	BZD,
+
+	/// <summary>
+	/// Bermuda, Dollars.
+	/// </summary>
+	[EnumMember]
+	BMD,
+
+	/// <summary>
+	/// Bhutan, Ngultrum.
+	/// </summary>
+	[EnumMember]
+	BTN,
+
+	/// <summary>
+	/// Bolivia, Bolivianos.
+	/// </summary>
+	[EnumMember]
+	BOB,
+
+	/// <summary>
+	/// Botswana, Pulas.
+	/// </summary>
+	[EnumMember]
+	BWP,
+
+	/// <summary>
+	/// Brazil, Brazil Real.
+	/// </summary>
+	[EnumMember]
+	BRL,
+
+	/// <summary>
+	/// United Kingdom, Pounds sterling.
+	/// </summary>
+	[EnumMember]
+	GBP,
+
+	/// <summary>
+	/// Brunei Darussalam, Dollars.
+	/// </summary>
+	[EnumMember]
+	BND,
+
+	/// <summary>
+	/// Burundi, Francs.
+	/// </summary>
+	[EnumMember]
+	BIF,
+
+	/// <summary>
+	/// Communaute Financiere Africaine BCEAO, Francs.
+	/// </summary>
+	[EnumMember]
+	XOF,
+
+	/// <summary>
+	/// Communaute Financiere Africaine BEAC, Francs.
+	/// </summary>
+	[EnumMember]
+	XAF,
+
+	/// <summary>
+	/// Cambodia, Riels.
+	/// </summary>
+	[EnumMember]
+	KHR,
+
+	/// <summary>
+	/// Canada, Dollars.
+	/// </summary>
+	[EnumMember]
+	CAD,
+
+	/// <summary>
+	/// Cape Verde, Escudos.
+	/// </summary>
+	[EnumMember]
+	CVE,
+
+	/// <summary>
+	/// Cayman Islands, Dollars.
+	/// </summary>
+	[EnumMember]
+	KYD,
+
+	/// <summary>
+	/// Chile, Pesos.
+	/// </summary>
+	[EnumMember]
+	CLP,
+
+	/// <summary>
+	/// China, Yuan Renminbi.
+	/// </summary>
+	[EnumMember]
+	CNY,
+
+	/// <summary>
+	/// China, offshore RMB.
+	/// </summary>
+	[EnumMember]
+	CNH,
+
+	/// <summary>
+	/// Colombia, Pesos.
+	/// </summary>
+	[EnumMember]
+	COP,
+
+	/// <summary>
+	/// Comoros, Francs.
+	/// </summary>
+	[EnumMember]
+	KMF,
+
+	/// <summary>
+	/// Costa Rica, Colones.
+	/// </summary>
+	[EnumMember]
+	CRC,
+
+	/// <summary>
+	/// Croatia, Kuna.
+	/// </summary>
+	[EnumMember]
+	HRK,
+
+	/// <summary>
+	/// Cuba, Pesos.
+	/// </summary>
+	[EnumMember]
+	CUP,
+
+	/// <summary>
+	/// Cyprus, Pounds.
+	/// </summary>
+	[EnumMember]
+	CYP,
+
+	/// <summary>
+	/// Czech Republic, Koruny.
+	/// </summary>
+	[EnumMember]
+	CZK,
+
+	/// <summary>
+	/// Denmark, Kroner.
+	/// </summary>
+	[EnumMember]
+	DKK,
+
+	/// <summary>
+	/// Djibouti, Francs.
+	/// </summary>
+	[EnumMember]
+	DJF,
+
+	/// <summary>
+	/// Dominican Republic, Pesos.
+	/// </summary>
+	[EnumMember]
+	DOP,
+
+	/// <summary>
+	/// East Caribbean Dollars.
+	/// </summary>
+	[EnumMember]
+	XCD,
+
+	/// <summary>
+	/// Egypt, Pounds.
+	/// </summary>
+	[EnumMember]
+	EGP,
+
+	/// <summary>
+	/// El Salvador, Colones.
+	/// </summary>
+	[EnumMember]
+	SVC,
+
+	/// <summary>
+	/// Estonia, Krooni.
+	/// </summary>
+	[EnumMember]
+	EEK,
+
+	/// <summary>
+	/// Ethiopia, Birr.
+	/// </summary>
+	[EnumMember]
+	ETB,
+
+	/// <summary>
+	/// Euro Member Countries, Euro.
+	/// </summary>
+	[EnumMember]
+	EUR,
+
+	/// <summary>
+	/// Falkland Islands (Malvinas), Pounds.
+	/// </summary>
+	[EnumMember]
+	FKP,
+
+	/// <summary>
+	/// Gambia, Dalasi.
+	/// </summary>
+	[EnumMember]
+	GMD,
+
+	/// <summary>
+	/// Ghana, Cedis.
+	/// </summary>
+	[EnumMember]
+	GHC,
+
+	/// <summary>
+	/// Gibraltar, Pounds.
+	/// </summary>
+	[EnumMember]
+	GIP,
+
+	/// <summary>
+	/// Gold, Ounces.
+	/// </summary>
+	[EnumMember]
+	XAU,
+
+	/// <summary>
+	/// Guatemala, Quetzales.
+	/// </summary>
+	[EnumMember]
+	GTQ,
+
+	/// <summary>
+	/// Guinea, Francs.
+	/// </summary>
+	[EnumMember]
+	GNF,
+
+	/// <summary>
+	/// Guyana, Dollars.
+	/// </summary>
+	[EnumMember]
+	GYD,
+
+	/// <summary>
+	/// Haiti, Gourdes.
+	/// </summary>
+	[EnumMember]
+	HTG,
+
+	/// <summary>
+	/// Honduras, Lempiras.
+	/// </summary>
+	[EnumMember]
+	HNL,
+
+	/// <summary>
+	/// Hong Kong, Dollars.
+	/// </summary>
+	[EnumMember]
+	HKD,
+
+	/// <summary>
+	/// Hungary, Forint.
+	/// </summary>
+	[EnumMember]
+	HUF,
+
+	/// <summary>
+	/// Iceland, Kronur.
+	/// </summary>
+	[EnumMember]
+	ISK,
+
+	/// <summary>
+	/// India, Rupees.
+	/// </summary>
+	[EnumMember]
+	INR,
+
+	/// <summary>
+	/// Indonesia, Rupiahs.
+	/// </summary>
+	[EnumMember]
+	IDR,
+
+	/// <summary>
+	/// Iraq, Dinars.
+	/// </summary>
+	[EnumMember]
+	IQD,
+
+	/// <summary>
+	/// Israel, New Shekels.
+	/// </summary>
+	[EnumMember]
+	ILS,
+
+	/// <summary>
+	/// Jamaica, Dollars.
+	/// </summary>
+	[EnumMember]
+	JMD,
+
+	/// <summary>
+	/// Japan, Yen.
+	/// </summary>
+	[EnumMember]
+	JPY,
+
+	/// <summary>
+	/// Jordan, Dinars.
+	/// </summary>
+	[EnumMember]
+	JOD,
+
+	/// <summary>
+	/// Kazakstan, Tenge.
+	/// </summary>
+	[EnumMember]
+	KZT,
+
+	/// <summary>
+	/// Kenya, Shillings.
+	/// </summary>
+	[EnumMember]
+	KES,
+
+	/// <summary>
+	/// Korea (South), Won.
+	/// </summary>
+	[EnumMember]
+	KRW,
+
+	/// <summary>
+	/// Kuwait, Dinars.
+	/// </summary>
+	[EnumMember]
+	KWD,
+
+	/// <summary>
+	/// Laos, Kips.
+	/// </summary>
+	[EnumMember]
+	LAK,
+
+	/// <summary>
+	/// Latvia, Lati.
+	/// </summary>
+	[EnumMember]
+	LVL,
+
+	/// <summary>
+	/// Lebanon, Pounds.
+	/// </summary>
+	[EnumMember]
+	LBP,
+
+	/// <summary>
+	/// Lesotho, Maloti.
+	/// </summary>
+	[EnumMember]
+	LSL,
+
+	/// <summary>
+	/// Liberia, Dollars.
+	/// </summary>
+	[EnumMember]
+	LRD,
+
+	/// <summary>
+	/// Libya, Dinars.
+	/// </summary>
+	[EnumMember]
+	LYD,
+
+	/// <summary>
+	/// Lithuania, Litai.
+	/// </summary>
+	[EnumMember]
+	LTL,
+
+	/// <summary>
+	/// Macau, Patacas.
+	/// </summary>
+	[EnumMember]
+	MOP,
+
+	/// <summary>
+	/// Macedonia, Denars.
+	/// </summary>
+	[EnumMember]
+	MKD,
+
+	/// <summary>
+	/// Malagasy, Franc.
+	/// </summary>
+	[EnumMember]
+	MGF,
+
+	/// <summary>
+	/// Malawi, Kwachas.
+	/// </summary>
+	[EnumMember]
+	MWK,
+
+	/// <summary>
+	/// Malaysia, Ringgits.
+	/// </summary>
+	[EnumMember]
+	MYR,
+
+	/// <summary>
+	/// Maldives (Maldive Islands), Rufiyaa.
+	/// </summary>
+	[EnumMember]
+	MVR,
+
+	/// <summary>
+	/// Malta, Liri.
+	/// </summary>
+	[EnumMember]
+	MTL,
+
+	/// <summary>
+	/// Mauritania, Ouguiyas.
+	/// </summary>
+	[EnumMember]
+	MRO,
+
+	/// <summary>
+	/// Mauritius, Rupees.
+	/// </summary>
+	[EnumMember]
+	MUR,
+
+	/// <summary>
+	/// Mexico, Pesos.
+	/// </summary>
+	[EnumMember]
+	MXN,
+
+	/// <summary>
+	/// Moldova, Lei.
+	/// </summary>
+	[EnumMember]
+	MDL,
+
+	/// <summary>
+	/// Mongolia, Tugriks.
+	/// </summary>
+	[EnumMember]
+	MNT,
+
+	/// <summary>
+	/// Morocco, Dirhams.
+	/// </summary>
+	[EnumMember]
+	MAD,
+
+	/// <summary>
+	/// Mozambique, Meticais.
+	/// </summary>
+	[EnumMember]
+	MZM,
+
+	/// <summary>
+	/// Myanmar (Burma), Kyats.
+	/// </summary>
+	[EnumMember]
+	MMK,
+
+	/// <summary>
+	/// Namibia, Dollars.
+	/// </summary>
+	[EnumMember]
+	NAD,
+
+	/// <summary>
+	/// Nepal, Nepal Rupees.
+	/// </summary>
+	[EnumMember]
+	NPR,
+
+	/// <summary>
+	/// Netherlands Antilles, Guilders (also called Florins).
+	/// </summary>
+	[EnumMember]
+	ANG,
+
+	/// <summary>
+	/// New Zealand, Dollars.
+	/// </summary>
+	[EnumMember]
+	NZD,
+
+	/// <summary>
+	/// Nicaragua, Gold Cordobas.
+	/// </summary>
+	[EnumMember]
+	NIO,
+
+	/// <summary>
+	/// Nigeria, Nairas.
+	/// </summary>
+	[EnumMember]
+	NGN,
+
+	/// <summary>
+	/// Korea (North), Won.
+	/// </summary>
+	[EnumMember]
+	KPW,
+
+	/// <summary>
+	/// Norway, Krone.
+	/// </summary>
+	[EnumMember]
+	NOK,
+
+	/// <summary>
+	/// Oman, Rials.
+	/// </summary>
+	[EnumMember]
+	OMR,
+
+	/// <summary>
+	/// Comptoirs Francais du Pacifique Francs.
+	/// </summary>
+	[EnumMember]
+	XPF,
+
+	/// <summary>
+	/// Pakistan, Rupees.
+	/// </summary>
+	[EnumMember]
+	PKR,
+
+	/// <summary>
+	/// Palladium Ounces.
+	/// </summary>
+	[EnumMember]
+	XPD,
+
+	/// <summary>
+	/// Panama, Balboa.
+	/// </summary>
+	[EnumMember]
+	PAB,
+
+	/// <summary>
+	/// Papua New Guinea, Kina.
+	/// </summary>
+	[EnumMember]
+	PGK,
+
+	/// <summary>
+	/// Paraguay, Guarani.
+	/// </summary>
+	[EnumMember]
+	PYG,
+
+	/// <summary>
+	/// Peru, Nuevos Soles.
+	/// </summary>
+	[EnumMember]
+	PEN,
+
+	/// <summary>
+	/// Philippines, Pesos.
+	/// </summary>
+	[EnumMember]
+	PHP,
+
+	/// <summary>
+	/// Platinum, Ounces.
+	/// </summary>
+	[EnumMember]
+	XPT,
+
+	/// <summary>
+	/// Poland, Zlotych.
+	/// </summary>
+	[EnumMember]
+	PLN,
+
+	/// <summary>
+	/// Qatar, Rials.
+	/// </summary>
+	[EnumMember]
+	QAR,
+
+	/// <summary>
+	/// Russia, Abkhazia, South Ossetia, Russian rouble.
+	/// </summary>
+	[EnumMember]
+	RUB,
+
+	/// <summary>
+	/// Samoa, Tala.
+	/// </summary>
+	[EnumMember]
+	WST,
+
+	/// <summary>
+	/// Sao Tome and Principe, Dobras.
+	/// </summary>
+	[EnumMember]
+	STD,
+
+	/// <summary>
+	/// Saudi Arabia, Riyals.
+	/// </summary>
+	[EnumMember]
+	SAR,
+
+	/// <summary>
+	/// Seychelles, Rupees.
+	/// </summary>
+	[EnumMember]
+	SCR,
+
+	/// <summary>
+	/// Sierra Leone, Leones.
+	/// </summary>
+	[EnumMember]
+	SLL,
+
+	/// <summary>
+	/// Silver, Ounces.
+	/// </summary>
+	[EnumMember]
+	XAG,
+
+	/// <summary>
+	/// Singapore, Dollars.
+	/// </summary>
+	[EnumMember]
+	SGD,
+
+	/// <summary>
+	/// Slovakia, Koruny.
+	/// </summary>
+	[EnumMember]
+	SKK,
+
+	/// <summary>
+	/// Slovenia, Tolars.
+	/// </summary>
+	[EnumMember]
+	SIT,
+
+	/// <summary>
+	/// Solomon Islands, Dollars.
+	/// </summary>
+	[EnumMember]
+	SBD,
+
+	/// <summary>
+	/// Somalia, Shillings.
+	/// </summary>
+	[EnumMember]
+	SOS,
+
+	/// <summary>
+	/// South Africa, Rand.
+	/// </summary>
+	[EnumMember]
+	ZAR,
+
+	/// <summary>
+	/// Sri Lanka, Rupees.
+	/// </summary>
+	[EnumMember]
+	LKR,
+
+	/// <summary>
+	/// Saint Helena, Pounds.
+	/// </summary>
+	[EnumMember]
+	SHP,
+
+	/// <summary>
+	/// Sudan, Dinars.
+	/// </summary>
+	[EnumMember]
+	SDD,
+
+	/// <summary>
+	/// Surinamese dollar.
+	/// </summary>
+	[EnumMember]
+	SRD,
+
+	/// <summary>
+	/// Swaziland, Emalangeni.
+	/// </summary>
+	[EnumMember]
+	SZL,
+
+	/// <summary>
+	/// Sweden, Kronor.
+	/// </summary>
+	[EnumMember]
+	SEK,
+
+	/// <summary>
+	/// Switzerland, Francs.
+	/// </summary>
+	[EnumMember]
+	CHF,
+
+	/// <summary>
+	/// Syria, Pounds.
+	/// </summary>
+	[EnumMember]
+	SYP,
+
+	/// <summary>
+	/// Taiwan, New Dollars.
+	/// </summary>
+	[EnumMember]
+	TWD,
+
+	/// <summary>
+	/// Tanzania, Shillings.
+	/// </summary>
+	[EnumMember]
+	TZS,
+
+	/// <summary>
+	/// Thailand, Baht.
+	/// </summary>
+	[EnumMember]
+	THB,
+
+	/// <summary>
+	/// Tonga, Pa'anga.
+	/// </summary>
+	[EnumMember]
+	TOP,
+
+	/// <summary>
+	/// Trinidad and Tobago, Dollars.
+	/// </summary>
+	[EnumMember]
+	TTD,
 
 	/// <summary>
-	/// Currency type.
+	/// Tunisia, Dinars.
 	/// </summary>
-	/// <remarks>
-	/// The codes are set in accordance with the ISO 4217 Currency Codes.
-	/// </remarks>
-	[Serializable]
-	[XmlType(Namespace = "http://www.webserviceX.NET/")]
-	[DataContract]
-	public enum CurrencyTypes
-	{
-// ReSharper disable InconsistentNaming
-		/// <summary>
-		/// Afghanistan, Afghanis.
-		/// </summary>
-		[EnumMember]
-		AFA,
-
-		/// <summary>
-		/// Turkmenistan, Turkmenistani manat.
-		/// </summary>
-		[EnumMember]
-		TMT,
-
-		/// <summary>
-		/// Uzbekistan, Uzbekistan som.
-		/// </summary>
-		[EnumMember]
-		UZS,
-
-		/// <summary>
-		/// Tajikistan, Somoni.
-		/// </summary>
-		[EnumMember]
-		TJS,
-
-		/// <summary>
-		/// Armenia, Armenian dram.
-		/// </summary>
-		[EnumMember]
-		AMD,
-
-		/// <summary>
-		/// International Monetary Fund, Special Drawing Rights.
-		/// </summary>
-		[EnumMember]
-		XDR,
-
-		/// <summary>
-		/// Azerbaijan, Azerbaijani manat.
-		/// </summary>
-		[EnumMember]
-		AZN,
-
-		/// <summary>
-		/// Belarus, Belarusian ruble.
-		/// </summary>
-		[EnumMember]
-		BYR,
-
-		/// <summary>
-		/// Belarus, Belarusian ruble.
-		/// </summary>
-		[EnumMember]
-		BYN,
-
-		/// <summary>
-		/// Romania, Romanian new leu.
-		/// </summary>
-		[EnumMember]
-		RON,
-
-		/// <summary>
-		/// Bulgaria, Bulgarian lev.
-		/// </summary>
-		[EnumMember]
-		BGN,
-
-		/// <summary>
-		/// Kyrgyzstan, Kyrgyzstani som.
-		/// </summary>
-		[EnumMember]
-		KGS,
-
-		/// <summary>
-		/// Albania, Leke.
-		/// </summary>
-		[EnumMember]
-		ALL,
-
-		/// <summary>
-		/// Algeria, Algeria Dinars.
-		/// </summary>
-		[EnumMember]
-		DZD,
-
-		/// <summary>
-		/// Argentina, Pesos.
-		/// </summary>
-		[EnumMember]
-		ARS,
-
-		/// <summary>
-		/// Aruba, Guilders (also called Florins).
-		/// </summary>
-		[EnumMember]
-		AWG,
-
-		/// <summary>
-		/// Australia, Dollars.
-		/// </summary>
-		[EnumMember]
-		AUD,
-
-		/// <summary>
-		/// Bahamas, Dollars.
-		/// </summary>
-		[EnumMember]
-		BSD,
-
-		/// <summary>
-		/// Bahrain, Dinars.
-		/// </summary>
-		[EnumMember]
-		BHD,
-
-		/// <summary>
-		/// Bangladesh, Taka.
-		/// </summary>
-		[EnumMember]
-		BDT,
-
-		/// <summary>
-		/// Barbados, Dollars.
-		/// </summary>
-		[EnumMember]
-		BBD,
-
-		/// <summary>
-		/// Belize, Dollars.
-		/// </summary>
-		[EnumMember]
-		BZD,
-
-		/// <summary>
-		/// Bermuda, Dollars.
-		/// </summary>
-		[EnumMember]
-		BMD,
-
-		/// <summary>
-		/// Bhutan, Ngultrum.
-		/// </summary>
-		[EnumMember]
-		BTN,
-
-		/// <summary>
-		/// Bolivia, Bolivianos.
-		/// </summary>
-		[EnumMember]
-		BOB,
-
-		/// <summary>
-		/// Botswana, Pulas.
-		/// </summary>
-		[EnumMember]
-		BWP,
-
-		/// <summary>
-		/// Brazil, Brazil Real.
-		/// </summary>
-		[EnumMember]
-		BRL,
-
-		/// <summary>
-		/// United Kingdom, Pounds sterling.
-		/// </summary>
-		[EnumMember]
-		GBP,
-
-		/// <summary>
-		/// Brunei Darussalam, Dollars.
-		/// </summary>
-		[EnumMember]
-		BND,
-
-		/// <summary>
-		/// Burundi, Francs.
-		/// </summary>
-		[EnumMember]
-		BIF,
-
-		/// <summary>
-		/// Communaute Financiere Africaine BCEAO, Francs.
-		/// </summary>
-		[EnumMember]
-		XOF,
-
-		/// <summary>
-		/// Communaute Financiere Africaine BEAC, Francs.
-		/// </summary>
-		[EnumMember]
-		XAF,
-
-		/// <summary>
-		/// Cambodia, Riels.
-		/// </summary>
-		[EnumMember]
-		KHR,
-
-		/// <summary>
-		/// Canada, Dollars.
-		/// </summary>
-		[EnumMember]
-		CAD,
-
-		/// <summary>
-		/// Cape Verde, Escudos.
-		/// </summary>
-		[EnumMember]
-		CVE,
-
-		/// <summary>
-		/// Cayman Islands, Dollars.
-		/// </summary>
-		[EnumMember]
-		KYD,
-
-		/// <summary>
-		/// Chile, Pesos.
-		/// </summary>
-		[EnumMember]
-		CLP,
-
-		/// <summary>
-		/// China, Yuan Renminbi.
-		/// </summary>
-		[EnumMember]
-		CNY,
-
-		/// <summary>
-		/// China, offshore RMB.
-		/// </summary>
-		[EnumMember]
-		CNH,
-
-		/// <summary>
-		/// Colombia, Pesos.
-		/// </summary>
-		[EnumMember]
-		COP,
-
-		/// <summary>
-		/// Comoros, Francs.
-		/// </summary>
-		[EnumMember]
-		KMF,
-
-		/// <summary>
-		/// Costa Rica, Colones.
-		/// </summary>
-		[EnumMember]
-		CRC,
-
-		/// <summary>
-		/// Croatia, Kuna.
-		/// </summary>
-		[EnumMember]
-		HRK,
-
-		/// <summary>
-		/// Cuba, Pesos.
-		/// </summary>
-		[EnumMember]
-		CUP,
-
-		/// <summary>
-		/// Cyprus, Pounds.
-		/// </summary>
-		[EnumMember]
-		CYP,
-
-		/// <summary>
-		/// Czech Republic, Koruny.
-		/// </summary>
-		[EnumMember]
-		CZK,
-
-		/// <summary>
-		/// Denmark, Kroner.
-		/// </summary>
-		[EnumMember]
-		DKK,
-
-		/// <summary>
-		/// Djibouti, Francs.
-		/// </summary>
-		[EnumMember]
-		DJF,
-
-		/// <summary>
-		/// Dominican Republic, Pesos.
-		/// </summary>
-		[EnumMember]
-		DOP,
-
-		/// <summary>
-		/// East Caribbean Dollars.
-		/// </summary>
-		[EnumMember]
-		XCD,
-
-		/// <summary>
-		/// Egypt, Pounds.
-		/// </summary>
-		[EnumMember]
-		EGP,
-
-		/// <summary>
-		/// El Salvador, Colones.
-		/// </summary>
-		[EnumMember]
-		SVC,
-
-		/// <summary>
-		/// Estonia, Krooni.
-		/// </summary>
-		[EnumMember]
-		EEK,
-
-		/// <summary>
-		/// Ethiopia, Birr.
-		/// </summary>
-		[EnumMember]
-		ETB,
-
-		/// <summary>
-		/// Euro Member Countries, Euro.
-		/// </summary>
-		[EnumMember]
-		EUR,
-
-		/// <summary>
-		/// Falkland Islands (Malvinas), Pounds.
-		/// </summary>
-		[EnumMember]
-		FKP,
-
-		/// <summary>
-		/// Gambia, Dalasi.
-		/// </summary>
-		[EnumMember]
-		GMD,
-
-		/// <summary>
-		/// Ghana, Cedis.
-		/// </summary>
-		[EnumMember]
-		GHC,
-
-		/// <summary>
-		/// Gibraltar, Pounds.
-		/// </summary>
-		[EnumMember]
-		GIP,
-
-		/// <summary>
-		/// Gold, Ounces.
-		/// </summary>
-		[EnumMember]
-		XAU,
-
-		/// <summary>
-		/// Guatemala, Quetzales.
-		/// </summary>
-		[EnumMember]
-		GTQ,
-
-		/// <summary>
-		/// Guinea, Francs.
-		/// </summary>
-		[EnumMember]
-		GNF,
-
-		/// <summary>
-		/// Guyana, Dollars.
-		/// </summary>
-		[EnumMember]
-		GYD,
-
-		/// <summary>
-		/// Haiti, Gourdes.
-		/// </summary>
-		[EnumMember]
-		HTG,
-
-		/// <summary>
-		/// Honduras, Lempiras.
-		/// </summary>
-		[EnumMember]
-		HNL,
-
-		/// <summary>
-		/// Hong Kong, Dollars.
-		/// </summary>
-		[EnumMember]
-		HKD,
-
-		/// <summary>
-		/// Hungary, Forint.
-		/// </summary>
-		[EnumMember]
-		HUF,
-
-		/// <summary>
-		/// Iceland, Kronur.
-		/// </summary>
-		[EnumMember]
-		ISK,
-
-		/// <summary>
-		/// India, Rupees.
-		/// </summary>
-		[EnumMember]
-		INR,
-
-		/// <summary>
-		/// Indonesia, Rupiahs.
-		/// </summary>
-		[EnumMember]
-		IDR,
-
-		/// <summary>
-		/// Iraq, Dinars.
-		/// </summary>
-		[EnumMember]
-		IQD,
-
-		/// <summary>
-		/// Israel, New Shekels.
-		/// </summary>
-		[EnumMember]
-		ILS,
-
-		/// <summary>
-		/// Jamaica, Dollars.
-		/// </summary>
-		[EnumMember]
-		JMD,
-
-		/// <summary>
-		/// Japan, Yen.
-		/// </summary>
-		[EnumMember]
-		JPY,
-
-		/// <summary>
-		/// Jordan, Dinars.
-		/// </summary>
-		[EnumMember]
-		JOD,
-
-		/// <summary>
-		/// Kazakstan, Tenge.
-		/// </summary>
-		[EnumMember]
-		KZT,
-
-		/// <summary>
-		/// Kenya, Shillings.
-		/// </summary>
-		[EnumMember]
-		KES,
-
-		/// <summary>
-		/// Korea (South), Won.
-		/// </summary>
-		[EnumMember]
-		KRW,
-
-		/// <summary>
-		/// Kuwait, Dinars.
-		/// </summary>
-		[EnumMember]
-		KWD,
-
-		/// <summary>
-		/// Laos, Kips.
-		/// </summary>
-		[EnumMember]
-		LAK,
-
-		/// <summary>
-		/// Latvia, Lati.
-		/// </summary>
-		[EnumMember]
-		LVL,
-
-		/// <summary>
-		/// Lebanon, Pounds.
-		/// </summary>
-		[EnumMember]
-		LBP,
-
-		/// <summary>
-		/// Lesotho, Maloti.
-		/// </summary>
-		[EnumMember]
-		LSL,
-
-		/// <summary>
-		/// Liberia, Dollars.
-		/// </summary>
-		[EnumMember]
-		LRD,
-
-		/// <summary>
-		/// Libya, Dinars.
-		/// </summary>
-		[EnumMember]
-		LYD,
-
-		/// <summary>
-		/// Lithuania, Litai.
-		/// </summary>
-		[EnumMember]
-		LTL,
-
-		/// <summary>
-		/// Macau, Patacas.
-		/// </summary>
-		[EnumMember]
-		MOP,
-
-		/// <summary>
-		/// Macedonia, Denars.
-		/// </summary>
-		[EnumMember]
-		MKD,
-
-		/// <summary>
-		/// Malagasy, Franc.
-		/// </summary>
-		[EnumMember]
-		MGF,
-
-		/// <summary>
-		/// Malawi, Kwachas.
-		/// </summary>
-		[EnumMember]
-		MWK,
-
-		/// <summary>
-		/// Malaysia, Ringgits.
-		/// </summary>
-		[EnumMember]
-		MYR,
-
-		/// <summary>
-		/// Maldives (Maldive Islands), Rufiyaa.
-		/// </summary>
-		[EnumMember]
-		MVR,
-
-		/// <summary>
-		/// Malta, Liri.
-		/// </summary>
-		[EnumMember]
-		MTL,
-
-		/// <summary>
-		/// Mauritania, Ouguiyas.
-		/// </summary>
-		[EnumMember]
-		MRO,
-
-		/// <summary>
-		/// Mauritius, Rupees.
-		/// </summary>
-		[EnumMember]
-		MUR,
-
-		/// <summary>
-		/// Mexico, Pesos.
-		/// </summary>
-		[EnumMember]
-		MXN,
-
-		/// <summary>
-		/// Moldova, Lei.
-		/// </summary>
-		[EnumMember]
-		MDL,
-
-		/// <summary>
-		/// Mongolia, Tugriks.
-		/// </summary>
-		[EnumMember]
-		MNT,
-
-		/// <summary>
-		/// Morocco, Dirhams.
-		/// </summary>
-		[EnumMember]
-		MAD,
-
-		/// <summary>
-		/// Mozambique, Meticais.
-		/// </summary>
-		[EnumMember]
-		MZM,
-
-		/// <summary>
-		/// Myanmar (Burma), Kyats.
-		/// </summary>
-		[EnumMember]
-		MMK,
-
-		/// <summary>
-		/// Namibia, Dollars.
-		/// </summary>
-		[EnumMember]
-		NAD,
-
-		/// <summary>
-		/// Nepal, Nepal Rupees.
-		/// </summary>
-		[EnumMember]
-		NPR,
-
-		/// <summary>
-		/// Netherlands Antilles, Guilders (also called Florins).
-		/// </summary>
-		[EnumMember]
-		ANG,
-
-		/// <summary>
-		/// New Zealand, Dollars.
-		/// </summary>
-		[EnumMember]
-		NZD,
-
-		/// <summary>
-		/// Nicaragua, Gold Cordobas.
-		/// </summary>
-		[EnumMember]
-		NIO,
-
-		/// <summary>
-		/// Nigeria, Nairas.
-		/// </summary>
-		[EnumMember]
-		NGN,
-
-		/// <summary>
-		/// Korea (North), Won.
-		/// </summary>
-		[EnumMember]
-		KPW,
-
-		/// <summary>
-		/// Norway, Krone.
-		/// </summary>
-		[EnumMember]
-		NOK,
-
-		/// <summary>
-		/// Oman, Rials.
-		/// </summary>
-		[EnumMember]
-		OMR,
-
-		/// <summary>
-		/// Comptoirs Francais du Pacifique Francs.
-		/// </summary>
-		[EnumMember]
-		XPF,
-
-		/// <summary>
-		/// Pakistan, Rupees.
-		/// </summary>
-		[EnumMember]
-		PKR,
-
-		/// <summary>
-		/// Palladium Ounces.
-		/// </summary>
-		[EnumMember]
-		XPD,
-
-		/// <summary>
-		/// Panama, Balboa.
-		/// </summary>
-		[EnumMember]
-		PAB,
-
-		/// <summary>
-		/// Papua New Guinea, Kina.
-		/// </summary>
-		[EnumMember]
-		PGK,
-
-		/// <summary>
-		/// Paraguay, Guarani.
-		/// </summary>
-		[EnumMember]
-		PYG,
-
-		/// <summary>
-		/// Peru, Nuevos Soles.
-		/// </summary>
-		[EnumMember]
-		PEN,
-
-		/// <summary>
-		/// Philippines, Pesos.
-		/// </summary>
-		[EnumMember]
-		PHP,
-
-		/// <summary>
-		/// Platinum, Ounces.
-		/// </summary>
-		[EnumMember]
-		XPT,
-
-		/// <summary>
-		/// Poland, Zlotych.
-		/// </summary>
-		[EnumMember]
-		PLN,
-
-		/// <summary>
-		/// Qatar, Rials.
-		/// </summary>
-		[EnumMember]
-		QAR,
-
-		/// <summary>
-		/// Russia, Abkhazia, South Ossetia, Russian rouble.
-		/// </summary>
-		[EnumMember]
-		RUB,
-
-		/// <summary>
-		/// Samoa, Tala.
-		/// </summary>
-		[EnumMember]
-		WST,
-
-		/// <summary>
-		/// Sao Tome and Principe, Dobras.
-		/// </summary>
-		[EnumMember]
-		STD,
-
-		/// <summary>
-		/// Saudi Arabia, Riyals.
-		/// </summary>
-		[EnumMember]
-		SAR,
-
-		/// <summary>
-		/// Seychelles, Rupees.
-		/// </summary>
-		[EnumMember]
-		SCR,
-
-		/// <summary>
-		/// Sierra Leone, Leones.
-		/// </summary>
-		[EnumMember]
-		SLL,
-
-		/// <summary>
-		/// Silver, Ounces.
-		/// </summary>
-		[EnumMember]
-		XAG,
-
-		/// <summary>
-		/// Singapore, Dollars.
-		/// </summary>
-		[EnumMember]
-		SGD,
-
-		/// <summary>
-		/// Slovakia, Koruny.
-		/// </summary>
-		[EnumMember]
-		SKK,
-
-		/// <summary>
-		/// Slovenia, Tolars.
-		/// </summary>
-		[EnumMember]
-		SIT,
-
-		/// <summary>
-		/// Solomon Islands, Dollars.
-		/// </summary>
-		[EnumMember]
-		SBD,
-
-		/// <summary>
-		/// Somalia, Shillings.
-		/// </summary>
-		[EnumMember]
-		SOS,
-
-		/// <summary>
-		/// South Africa, Rand.
-		/// </summary>
-		[EnumMember]
-		ZAR,
-
-		/// <summary>
-		/// Sri Lanka, Rupees.
-		/// </summary>
-		[EnumMember]
-		LKR,
-
-		/// <summary>
-		/// Saint Helena, Pounds.
-		/// </summary>
-		[EnumMember]
-		SHP,
-
-		/// <summary>
-		/// Sudan, Dinars.
-		/// </summary>
-		[EnumMember]
-		SDD,
-
-		/// <summary>
-		/// Surinamese dollar.
-		/// </summary>
-		[EnumMember]
-		SRD,
-
-		/// <summary>
-		/// Swaziland, Emalangeni.
-		/// </summary>
-		[EnumMember]
-		SZL,
-
-		/// <summary>
-		/// Sweden, Kronor.
-		/// </summary>
-		[EnumMember]
-		SEK,
-
-		/// <summary>
-		/// Switzerland, Francs.
-		/// </summary>
-		[EnumMember]
-		CHF,
-
-		/// <summary>
-		/// Syria, Pounds.
-		/// </summary>
-		[EnumMember]
-		SYP,
-
-		/// <summary>
-		/// Taiwan, New Dollars.
-		/// </summary>
-		[EnumMember]
-		TWD,
-
-		/// <summary>
-		/// Tanzania, Shillings.
-		/// </summary>
-		[EnumMember]
-		TZS,
-
-		/// <summary>
-		/// Thailand, Baht.
-		/// </summary>
-		[EnumMember]
-		THB,
-
-		/// <summary>
-		/// Tonga, Pa'anga.
-		/// </summary>
-		[EnumMember]
-		TOP,
-
-		/// <summary>
-		/// Trinidad and Tobago, Dollars.
-		/// </summary>
-		[EnumMember]
-		TTD,
-
-		/// <summary>
-		/// Tunisia, Dinars.
-		/// </summary>
-		[EnumMember]
-		TND,
-
-		/// <summary>
-		/// Turkey, Liras.
-		/// </summary>
-		[EnumMember]
-		TRL,
-
-		/// <summary>
-		/// United States of America, Dollars.
-		/// </summary>
-		[EnumMember]
-		USD,
-
-		/// <summary>
-		/// United Arab Emirates, Dirhams.
-		/// </summary>
-		[EnumMember]
-		AED,
-
-		/// <summary>
-		/// Uganda, Shillings.
-		/// </summary>
-		[EnumMember]
-		UGX,
-
-		/// <summary>
-		/// Ukraine, Hryvnia.
-		/// </summary>
-		[EnumMember]
-		UAH,
-
-		/// <summary>
-		/// Uruguay, Pesos.
-		/// </summary>
-		[EnumMember]
-		UYU,
-
-		/// <summary>
-		/// Vanuatu, Vatu.
-		/// </summary>
-		[EnumMember]
-		VUV,
-
-		/// <summary>
-		/// Venezuela, Bolivares.
-		/// </summary>
-		[EnumMember]
-		VEB,
-
-		/// <summary>
-		/// Viet Nam, Dong.
-		/// </summary>
-		[EnumMember]
-		VND,
-
-		/// <summary>
-		/// Yemen, Rials.
-		/// </summary>
-		[EnumMember]
-		YER,
-
-		/// <summary>
-		/// Serbian dinar.
-		/// </summary>
-		[EnumMember]
-		CSD,
-
-		/// <summary>
-		/// Zambia, Kwacha.
-		/// </summary>
-		[EnumMember]
-		ZMK,
-
-		/// <summary>
-		/// Zimbabwe, Zimbabwe Dollars.
-		/// </summary>
-		[EnumMember]
-		ZWD,
-
-		/// <summary>
-		/// Turkey, Northern Cyprus, Turkish lira.
-		/// </summary>
-		[EnumMember]
-		TRY,
-
-		/// <summary>
-		/// Ven.
-		/// </summary>
-		[EnumMember]
-		XVN,
-
-		/// <summary>
-		/// Bitcoin.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		BTC,
-
-		/// <summary>
-		/// United Kingdom, Pence sterling.
-		/// </summary>
-		[EnumMember]
-		GBX,
-
-		/// <summary>
-		/// Ghana, Ghanaian Cedi.
-		/// </summary>
-		[EnumMember]
-		GHS,
-
-		/// <summary>
-		/// China, offshore RMB.
-		/// </summary>
-		[EnumMember]
-		CNT,
-
-		/// <summary>
-		/// Ethereum.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		ETH,
-
-		/// <summary>
-		/// Litecoin.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		LTC,
-		
-		/// <summary>
-		/// Ethereum Classic.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		ETC,
-		
-		/// <summary>
-		/// Tether USD.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		USDT,
-		
-		/// <summary>
-		/// Zcash.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		ZEC,
-		
-		/// <summary>
-		/// Monero.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		XMR,
-
-		/// <summary>
-		/// Cardano.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		ADA,
-		
-		/// <summary>
-		/// IOTA.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		MIOTA,
-		
-		/// <summary>
-		/// Ripple.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		XRP,
-		
-		/// <summary>
-		/// Dash.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		DASH,
-		
-		/// <summary>
-		/// EOS.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		EOS,
-		
-		/// <summary>
-		/// Santiment.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		SAN,
-		
-		/// <summary>
-		/// Omisego.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		OMG,
-		
-		/// <summary>
-		/// Bitcoin Cash.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		BCH,
-		
-		/// <summary>
-		/// Neo.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		NEO,
-		
-		/// <summary>
-		/// Metaverse.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		ETP,
-		
-		/// <summary>
-		/// Qtum.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		QTUM,
-		
-		/// <summary>
-		/// Aventus.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		AVT,
-		
-		/// <summary>
-		/// Eidoo.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		EDO,
-		
-		/// <summary>
-		/// Datacoin.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		DTC,
-		
-		/// <summary>
-		/// Bitcoin Gold.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		BTG,
-		
-		/// <summary>
-		/// QASH.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		QASH,
-		
-		/// <summary>
-		/// Yoyow.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		YOYOW,
-		
-		/// <summary>
-		/// Golem.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		GNT,
-		
-		/// <summary>
-		/// Status.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		SNT,
-		
-		/// <summary>
-		/// Tether EUR.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		EURT,
-		
-		/// <summary>
-		/// Basic Attention Token.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		BAT,
-		
-		/// <summary>
-		/// MNA.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		MNA,
-		
-		/// <summary>
-		/// FunFair.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		FUN,
-		
-		/// <summary>
-		/// ZRX.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		ZRX,
-		
-		/// <summary>
-		/// Time New Bank.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		TNB,
-		
-		/// <summary>
-		/// Sparks.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		SPK,
-		
-		/// <summary>
-		/// TRON.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		TRX,
-		
-		/// <summary>
-		/// Ripio Credit Network.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		RCN,
-		
-		/// <summary>
-		/// iExec.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		RLC,
-		
-		/// <summary>
-		/// AidCoin.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		AID,
-		
-		/// <summary>
-		/// SnowGem.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		SNG,
-
-		/// <summary>
-		/// Augur.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		REP,
-
-		/// <summary>
-		/// Aelf.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		ELF,
-
-		/// <summary>
-		/// South Africa, Rand. The Rand is subdivided into 100 cents.
-		/// </summary>
-		[EnumMember]
-		ZAC,
-
-		/// <summary>
-		/// Deutsche Mark.
-		/// </summary>
-		[EnumMember]
-		DEM,
-
-		/// <summary>
-		/// Luxembourgish franc.
-		/// </summary>
-		[EnumMember]
-		LUF,
-
-		/// <summary>
-		/// Old Mexican Peso.
-		/// </summary>
-		[EnumMember]
-		MXP,
-
-		/// <summary>
-		/// Malagasy ariary.
-		/// </summary>
-		[EnumMember]
-		MGA,
-
-		/// <summary>
-		/// Angolan kwanza.
-		/// </summary>
-		[EnumMember]
-		AOA,
-
-		/// <summary>
-		/// Fijian dollar.
-		/// </summary>
-		[EnumMember]
-		FJD,
-
-		/// <summary>
-		/// Congolese franc.
-		/// </summary>
-		[EnumMember]
-		CDF,
-
-		/// <summary>
-		/// Sudanese pound.
-		/// </summary>
-		[EnumMember]
-		SDG,
-
-		/// <summary>
-		/// Mauritanian ouguiya.
-		/// </summary>
-		[EnumMember]
-		MRU,
-
-		/// <summary>
-		/// Iranian rial.
-		/// </summary>
-		[EnumMember]
-		IRR,
-
-		/// <summary>
-		/// Zambian kwacha.
-		/// </summary>
-		[EnumMember]
-		ZMW,
-
-		/// <summary>
-		/// Georgian lari.
-		/// </summary>
-		[EnumMember]
-		GEL,
-
-		/// <summary>
-		/// Sao Tome and Principe dobra.
-		/// </summary>
-		[EnumMember]
-		STN,
-
-		/// <summary>
-		/// Venezuelan bolivar.
-		/// </summary>
-		[EnumMember]
-		VES,
-
-		/// <summary>
-		/// South Sudanese pound.
-		/// </summary>
-		[EnumMember]
-		SSP,
-
-		/// <summary>
-		/// Eritrean nakfa.
-		/// </summary>
-		[EnumMember]
-		ERN,
-
-		/// <summary>
-		/// Bosnia-Herzegovina Convertible Marka.
-		/// </summary>
-		[EnumMember]
-		BAM,
-
-		/// <summary>
-		/// Serbian dinar.
-		/// </summary>
-		[EnumMember]
-		RSD,
-
-		/// <summary>
-		/// Rwandan franc.
-		/// </summary>
-		[EnumMember]
-		RWF,
-
-		/// <summary>
-		/// Mozambican metical.
-		/// </summary>
-		[EnumMember]
-		MZN,
-
-		/// <summary>
-		/// Mozambican metical.
-		/// </summary>
-		[EnumMember]
-		AFN,
-
-		/// <summary>
-		/// USD Coin.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		USDC,
-
-		/// <summary>
-		/// Binance USD.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		BUSD,
-
-		/// <summary>
-		/// Dai.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		DAI,
-
-		/// <summary>
-		/// True USD.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		TUSD,
-
-		/// <summary>
-		/// Pax Dollar.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		USDP,
-
-		/// <summary>
-		/// Frax.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		FRAX,
-
-		/// <summary>
-		/// USDD.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		USDD,
-
-		/// <summary>
-		/// Gemini Dollar.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		GUSD,
-
-		/// <summary>
-		/// XSGD.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		XSGD,
-
-		/// <summary>
-		/// Pax Gold.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		PAXG,
-
-		/// <summary>
-		/// Tether Gold.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		XAUT,
-
-		/// <summary>
-		/// Liquity USD.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		LUSD,
-
-		/// <summary>
-		/// Micro Bitcoin.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		MBC,
-
-		/// <summary>
-		/// TerraUSD.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		UST,
-
-		/// <summary>
-		/// Brazilian Digital Token.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		BRZ,
-
-		/// <summary>
-		/// USDe.
-		/// </summary>
-		[EnumMember]
-		[Crypto]
-		USDE
-		// ReSharper restore InconsistentNaming
-	}
+	[EnumMember]
+	TND,
+
+	/// <summary>
+	/// Turkey, Liras.
+	/// </summary>
+	[EnumMember]
+	TRL,
+
+	/// <summary>
+	/// United States of America, Dollars.
+	/// </summary>
+	[EnumMember]
+	USD,
+
+	/// <summary>
+	/// United Arab Emirates, Dirhams.
+	/// </summary>
+	[EnumMember]
+	AED,
+
+	/// <summary>
+	/// Uganda, Shillings.
+	/// </summary>
+	[EnumMember]
+	UGX,
+
+	/// <summary>
+	/// Ukraine, Hryvnia.
+	/// </summary>
+	[EnumMember]
+	UAH,
+
+	/// <summary>
+	/// Uruguay, Pesos.
+	/// </summary>
+	[EnumMember]
+	UYU,
+
+	/// <summary>
+	/// Vanuatu, Vatu.
+	/// </summary>
+	[EnumMember]
+	VUV,
+
+	/// <summary>
+	/// Venezuela, Bolivares.
+	/// </summary>
+	[EnumMember]
+	VEB,
+
+	/// <summary>
+	/// Viet Nam, Dong.
+	/// </summary>
+	[EnumMember]
+	VND,
+
+	/// <summary>
+	/// Yemen, Rials.
+	/// </summary>
+	[EnumMember]
+	YER,
+
+	/// <summary>
+	/// Serbian dinar.
+	/// </summary>
+	[EnumMember]
+	CSD,
+
+	/// <summary>
+	/// Zambia, Kwacha.
+	/// </summary>
+	[EnumMember]
+	ZMK,
+
+	/// <summary>
+	/// Zimbabwe, Zimbabwe Dollars.
+	/// </summary>
+	[EnumMember]
+	ZWD,
+
+	/// <summary>
+	/// Turkey, Northern Cyprus, Turkish lira.
+	/// </summary>
+	[EnumMember]
+	TRY,
+
+	/// <summary>
+	/// Ven.
+	/// </summary>
+	[EnumMember]
+	XVN,
+
+	/// <summary>
+	/// Bitcoin.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	BTC,
+
+	/// <summary>
+	/// United Kingdom, Pence sterling.
+	/// </summary>
+	[EnumMember]
+	GBX,
+
+	/// <summary>
+	/// Ghana, Ghanaian Cedi.
+	/// </summary>
+	[EnumMember]
+	GHS,
+
+	/// <summary>
+	/// China, offshore RMB.
+	/// </summary>
+	[EnumMember]
+	CNT,
+
+	/// <summary>
+	/// Ethereum.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	ETH,
+
+	/// <summary>
+	/// Litecoin.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	LTC,
+	
+	/// <summary>
+	/// Ethereum Classic.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	ETC,
+	
+	/// <summary>
+	/// Tether USD.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	USDT,
+	
+	/// <summary>
+	/// Zcash.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	ZEC,
+	
+	/// <summary>
+	/// Monero.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	XMR,
+
+	/// <summary>
+	/// Cardano.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	ADA,
+	
+	/// <summary>
+	/// IOTA.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	MIOTA,
+	
+	/// <summary>
+	/// Ripple.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	XRP,
+	
+	/// <summary>
+	/// Dash.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	DASH,
+	
+	/// <summary>
+	/// EOS.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	EOS,
+	
+	/// <summary>
+	/// Santiment.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	SAN,
+	
+	/// <summary>
+	/// Omisego.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	OMG,
+	
+	/// <summary>
+	/// Bitcoin Cash.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	BCH,
+	
+	/// <summary>
+	/// Neo.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	NEO,
+	
+	/// <summary>
+	/// Metaverse.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	ETP,
+	
+	/// <summary>
+	/// Qtum.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	QTUM,
+	
+	/// <summary>
+	/// Aventus.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	AVT,
+	
+	/// <summary>
+	/// Eidoo.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	EDO,
+	
+	/// <summary>
+	/// Datacoin.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	DTC,
+	
+	/// <summary>
+	/// Bitcoin Gold.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	BTG,
+	
+	/// <summary>
+	/// QASH.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	QASH,
+	
+	/// <summary>
+	/// Yoyow.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	YOYOW,
+	
+	/// <summary>
+	/// Golem.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	GNT,
+	
+	/// <summary>
+	/// Status.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	SNT,
+	
+	/// <summary>
+	/// Tether EUR.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	EURT,
+	
+	/// <summary>
+	/// Basic Attention Token.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	BAT,
+	
+	/// <summary>
+	/// MNA.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	MNA,
+	
+	/// <summary>
+	/// FunFair.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	FUN,
+	
+	/// <summary>
+	/// ZRX.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	ZRX,
+	
+	/// <summary>
+	/// Time New Bank.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	TNB,
+	
+	/// <summary>
+	/// Sparks.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	SPK,
+	
+	/// <summary>
+	/// TRON.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	TRX,
+	
+	/// <summary>
+	/// Ripio Credit Network.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	RCN,
+	
+	/// <summary>
+	/// iExec.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	RLC,
+	
+	/// <summary>
+	/// AidCoin.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	AID,
+	
+	/// <summary>
+	/// SnowGem.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	SNG,
+
+	/// <summary>
+	/// Augur.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	REP,
+
+	/// <summary>
+	/// Aelf.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	ELF,
+
+	/// <summary>
+	/// South Africa, Rand. The Rand is subdivided into 100 cents.
+	/// </summary>
+	[EnumMember]
+	ZAC,
+
+	/// <summary>
+	/// Deutsche Mark.
+	/// </summary>
+	[EnumMember]
+	DEM,
+
+	/// <summary>
+	/// Luxembourgish franc.
+	/// </summary>
+	[EnumMember]
+	LUF,
+
+	/// <summary>
+	/// Old Mexican Peso.
+	/// </summary>
+	[EnumMember]
+	MXP,
+
+	/// <summary>
+	/// Malagasy ariary.
+	/// </summary>
+	[EnumMember]
+	MGA,
+
+	/// <summary>
+	/// Angolan kwanza.
+	/// </summary>
+	[EnumMember]
+	AOA,
+
+	/// <summary>
+	/// Fijian dollar.
+	/// </summary>
+	[EnumMember]
+	FJD,
+
+	/// <summary>
+	/// Congolese franc.
+	/// </summary>
+	[EnumMember]
+	CDF,
+
+	/// <summary>
+	/// Sudanese pound.
+	/// </summary>
+	[EnumMember]
+	SDG,
+
+	/// <summary>
+	/// Mauritanian ouguiya.
+	/// </summary>
+	[EnumMember]
+	MRU,
+
+	/// <summary>
+	/// Iranian rial.
+	/// </summary>
+	[EnumMember]
+	IRR,
+
+	/// <summary>
+	/// Zambian kwacha.
+	/// </summary>
+	[EnumMember]
+	ZMW,
+
+	/// <summary>
+	/// Georgian lari.
+	/// </summary>
+	[EnumMember]
+	GEL,
+
+	/// <summary>
+	/// Sao Tome and Principe dobra.
+	/// </summary>
+	[EnumMember]
+	STN,
+
+	/// <summary>
+	/// Venezuelan bolivar.
+	/// </summary>
+	[EnumMember]
+	VES,
+
+	/// <summary>
+	/// South Sudanese pound.
+	/// </summary>
+	[EnumMember]
+	SSP,
+
+	/// <summary>
+	/// Eritrean nakfa.
+	/// </summary>
+	[EnumMember]
+	ERN,
+
+	/// <summary>
+	/// Bosnia-Herzegovina Convertible Marka.
+	/// </summary>
+	[EnumMember]
+	BAM,
+
+	/// <summary>
+	/// Serbian dinar.
+	/// </summary>
+	[EnumMember]
+	RSD,
+
+	/// <summary>
+	/// Rwandan franc.
+	/// </summary>
+	[EnumMember]
+	RWF,
+
+	/// <summary>
+	/// Mozambican metical.
+	/// </summary>
+	[EnumMember]
+	MZN,
+
+	/// <summary>
+	/// Mozambican metical.
+	/// </summary>
+	[EnumMember]
+	AFN,
+
+	/// <summary>
+	/// USD Coin.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	USDC,
+
+	/// <summary>
+	/// Binance USD.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	BUSD,
+
+	/// <summary>
+	/// Dai.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	DAI,
+
+	/// <summary>
+	/// True USD.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	TUSD,
+
+	/// <summary>
+	/// Pax Dollar.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	USDP,
+
+	/// <summary>
+	/// Frax.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	FRAX,
+
+	/// <summary>
+	/// USDD.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	USDD,
+
+	/// <summary>
+	/// Gemini Dollar.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	GUSD,
+
+	/// <summary>
+	/// XSGD.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	XSGD,
+
+	/// <summary>
+	/// Pax Gold.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	PAXG,
+
+	/// <summary>
+	/// Tether Gold.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	XAUT,
+
+	/// <summary>
+	/// Liquity USD.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	LUSD,
+
+	/// <summary>
+	/// Micro Bitcoin.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	MBC,
+
+	/// <summary>
+	/// TerraUSD.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	UST,
+
+	/// <summary>
+	/// Brazilian Digital Token.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	BRZ,
+
+	/// <summary>
+	/// USDe.
+	/// </summary>
+	[EnumMember]
+	[Crypto]
+	USDE
+	// ReSharper restore InconsistentNaming
 }
\ No newline at end of file
diff --git a/Common/DelegateHelper.cs b/Common/DelegateHelper.cs
index 2878c212..fedc6caa 100644
--- a/Common/DelegateHelper.cs
+++ b/Common/DelegateHelper.cs
@@ -1,187 +1,186 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Reflection;
+using System.Linq;
+
+/// <summary>
+/// Provides helper methods for working with delegates.
+/// </summary>
+public static class DelegateHelper
 {
-	using System;
-	using System.Collections.Generic;
-	using System.ComponentModel;
-	using System.Reflection;
-	using System.Linq;
-
 	/// <summary>
-	/// Provides helper methods for working with delegates.
+	/// Executes the specified action and handles any exception using the provided error action.
 	/// </summary>
-	public static class DelegateHelper
+	/// <param name="action">The action to execute.</param>
+	/// <param name="error">The action to handle exceptions.</param>
+	/// <exception cref="ArgumentNullException">Thrown when action or error is null.</exception>
+	public static void Do(this Action action, Action<Exception> error)
 	{
-		/// <summary>
-		/// Executes the specified action and handles any exception using the provided error action.
-		/// </summary>
-		/// <param name="action">The action to execute.</param>
-		/// <param name="error">The action to handle exceptions.</param>
-		/// <exception cref="ArgumentNullException">Thrown when action or error is null.</exception>
-		public static void Do(this Action action, Action<Exception> error)
+		if (action is null)
+			throw new ArgumentNullException(nameof(action));
+
+		if (error is null)
+			throw new ArgumentNullException(nameof(error));
+
+		try
+		{
+			action();
+		}
+		catch (Exception ex)
 		{
-			if (action is null)
-				throw new ArgumentNullException(nameof(action));
+			error(ex);
+		}
+	}
 
-			if (error is null)
-				throw new ArgumentNullException(nameof(error));
+	/// <summary>
+	/// Executes the specified action asynchronously and handles any exception using the provided error action.
+	/// </summary>
+	/// <param name="action">The action to execute asynchronously.</param>
+	/// <param name="error">The action to handle exceptions.</param>
+	/// <exception cref="ArgumentNullException">Thrown when action or error is null.</exception>
+	public static void DoAsync(this Action action, Action<Exception> error)
+	{
+		if (action is null)
+			throw new ArgumentNullException(nameof(action));
+
+		if (error is null)
+			throw new ArgumentNullException(nameof(error));
 
+		Do(() => action.BeginInvoke(result =>
+		{
 			try
 			{
-				action();
+				action.EndInvoke(result);
 			}
 			catch (Exception ex)
 			{
 				error(ex);
 			}
-		}
-
-		/// <summary>
-		/// Executes the specified action asynchronously and handles any exception using the provided error action.
-		/// </summary>
-		/// <param name="action">The action to execute asynchronously.</param>
-		/// <param name="error">The action to handle exceptions.</param>
-		/// <exception cref="ArgumentNullException">Thrown when action or error is null.</exception>
-		public static void DoAsync(this Action action, Action<Exception> error)
-		{
-			if (action is null)
-				throw new ArgumentNullException(nameof(action));
+		}, null), error);
+	}
 
-			if (error is null)
-				throw new ArgumentNullException(nameof(error));
+	//// The following methods are commented out.
+	///// <summary>
+	///// Casts a delegate to an EventHandler of the specified event argument type.
+	///// </summary>
+	///// <typeparam name="TArgs">The type of the event arguments.</typeparam>
+	///// <param name="handler">The delegate to cast.</param>
+	///// <returns>An EventHandler of type TArgs if the cast is successful; otherwise, null.</returns>
+	//public static EventHandler<TArgs> Cast<TArgs>(this Delegate handler)
+	//	where TArgs : EventArgs 
+	//{
+	//	if (handler is null)
+	//		return null;
+
+	//	dynamic h = handler;
+
+	//	// Resharper shows wrong hint
+	//	// DO NOT convert to method GROUP
+	//	return (sender, e) => h(sender, e);
+	//}
+
+	///// <summary>
+	///// Casts an EventHandler to EventHandler of EventArgs.
+	///// </summary>
+	///// <param name="handler">The EventHandler to cast.</param>
+	///// <returns>An EventHandler of EventArgs if the cast is successful; otherwise, null.</returns>
+	//public static EventHandler<EventArgs> Cast(this EventHandler handler)
+	//{
+	//	return handler.Cast<EventArgs>();
+	//}
 
-			Do(() => action.BeginInvoke(result =>
-			{
-				try
-				{
-					action.EndInvoke(result);
-				}
-				catch (Exception ex)
-				{
-					error(ex);
-				}
-			}, null), error);
-		}
-
-		//// The following methods are commented out.
-		///// <summary>
-		///// Casts a delegate to an EventHandler of the specified event argument type.
-		///// </summary>
-		///// <typeparam name="TArgs">The type of the event arguments.</typeparam>
-		///// <param name="handler">The delegate to cast.</param>
-		///// <returns>An EventHandler of type TArgs if the cast is successful; otherwise, null.</returns>
-		//public static EventHandler<TArgs> Cast<TArgs>(this Delegate handler)
-		//	where TArgs : EventArgs 
-		//{
-		//	if (handler is null)
-		//		return null;
-
-		//	dynamic h = handler;
-
-		//	// Resharper shows wrong hint
-		//	// DO NOT convert to method GROUP
-		//	return (sender, e) => h(sender, e);
-		//}
-
-		///// <summary>
-		///// Casts an EventHandler to EventHandler of EventArgs.
-		///// </summary>
-		///// <param name="handler">The EventHandler to cast.</param>
-		///// <returns>An EventHandler of EventArgs if the cast is successful; otherwise, null.</returns>
-		//public static EventHandler<EventArgs> Cast(this EventHandler handler)
-		//{
-		//	return handler.Cast<EventArgs>();
-		//}
-
-		/// <summary>
-		/// Invokes the PropertyChangedEventHandler with the specified sender and property name.
-		/// </summary>
-		/// <param name="handler">The PropertyChangedEventHandler to invoke.</param>
-		/// <param name="sender">The sender object.</param>
-		/// <param name="name">The name of the property that changed.</param>
-		public static void Invoke(this PropertyChangedEventHandler handler, object sender, string name)
-		{
-			handler(sender, new PropertyChangedEventArgs(name));
-		}
+	/// <summary>
+	/// Invokes the PropertyChangedEventHandler with the specified sender and property name.
+	/// </summary>
+	/// <param name="handler">The PropertyChangedEventHandler to invoke.</param>
+	/// <param name="sender">The sender object.</param>
+	/// <param name="name">The name of the property that changed.</param>
+	public static void Invoke(this PropertyChangedEventHandler handler, object sender, string name)
+	{
+		handler(sender, new PropertyChangedEventArgs(name));
+	}
 
-		/// <summary>
-		/// Invokes the PropertyChangingEventHandler with the specified sender and property name.
-		/// </summary>
-		/// <param name="handler">The PropertyChangingEventHandler to invoke.</param>
-		/// <param name="sender">The sender object.</param>
-		/// <param name="name">The name of the property that is changing.</param>
-		public static void Invoke(this PropertyChangingEventHandler handler, object sender, string name)
-		{
-			handler(sender, new PropertyChangingEventArgs(name));
-		}
+	/// <summary>
+	/// Invokes the PropertyChangingEventHandler with the specified sender and property name.
+	/// </summary>
+	/// <param name="handler">The PropertyChangingEventHandler to invoke.</param>
+	/// <param name="sender">The sender object.</param>
+	/// <param name="name">The name of the property that is changing.</param>
+	public static void Invoke(this PropertyChangingEventHandler handler, object sender, string name)
+	{
+		handler(sender, new PropertyChangingEventArgs(name));
+	}
 
-		/// <summary>
-		/// Creates a delegate of type TDelegate for the specified method.
-		/// </summary>
-		/// <typeparam name="TDelegate">The type of delegate to create.</typeparam>
-		/// <param name="method">The method information.</param>
-		/// <returns>A delegate of type TDelegate.</returns>
-		public static TDelegate CreateDelegate<TDelegate>(this MethodInfo method)
-		{
-			return Delegate.CreateDelegate(typeof(TDelegate), method, true).To<TDelegate>();
-		}
+	/// <summary>
+	/// Creates a delegate of type TDelegate for the specified method.
+	/// </summary>
+	/// <typeparam name="TDelegate">The type of delegate to create.</typeparam>
+	/// <param name="method">The method information.</param>
+	/// <returns>A delegate of type TDelegate.</returns>
+	public static TDelegate CreateDelegate<TDelegate>(this MethodInfo method)
+	{
+		return Delegate.CreateDelegate(typeof(TDelegate), method, true).To<TDelegate>();
+	}
 
-		/// <summary>
-		/// Creates a delegate of type TDelegate for the specified method and instance.
-		/// </summary>
-		/// <typeparam name="TInstance">The type of the instance.</typeparam>
-		/// <typeparam name="TDelegate">The type of delegate to create.</typeparam>
-		/// <param name="method">The method information.</param>
-		/// <param name="instance">The instance on which the method is invoked.</param>
-		/// <returns>A delegate of type TDelegate bound to the specified instance.</returns>
-		public static TDelegate CreateDelegate<TInstance, TDelegate>(this MethodInfo method, TInstance instance)
-		{
-			return Delegate.CreateDelegate(typeof(TDelegate), instance, method, true).To<TDelegate>();
-		}
+	/// <summary>
+	/// Creates a delegate of type TDelegate for the specified method and instance.
+	/// </summary>
+	/// <typeparam name="TInstance">The type of the instance.</typeparam>
+	/// <typeparam name="TDelegate">The type of delegate to create.</typeparam>
+	/// <param name="method">The method information.</param>
+	/// <param name="instance">The instance on which the method is invoked.</param>
+	/// <returns>A delegate of type TDelegate bound to the specified instance.</returns>
+	public static TDelegate CreateDelegate<TInstance, TDelegate>(this MethodInfo method, TInstance instance)
+	{
+		return Delegate.CreateDelegate(typeof(TDelegate), instance, method, true).To<TDelegate>();
+	}
 
-		/// <summary>
-		/// Combines two delegates of the same type.
-		/// </summary>
-		/// <typeparam name="TDelegate">The type of the delegate.</typeparam>
-		/// <param name="source">The source delegate.</param>
-		/// <param name="value">The delegate to combine with the source delegate.</param>
-		/// <returns>A combined delegate of type TDelegate.</returns>
-		public static TDelegate AddDelegate<TDelegate>(this TDelegate source, TDelegate value)
-		{
-			return Delegate.Combine(source.To<Delegate>(), value.To<Delegate>()).To<TDelegate>();
-		}
+	/// <summary>
+	/// Combines two delegates of the same type.
+	/// </summary>
+	/// <typeparam name="TDelegate">The type of the delegate.</typeparam>
+	/// <param name="source">The source delegate.</param>
+	/// <param name="value">The delegate to combine with the source delegate.</param>
+	/// <returns>A combined delegate of type TDelegate.</returns>
+	public static TDelegate AddDelegate<TDelegate>(this TDelegate source, TDelegate value)
+	{
+		return Delegate.Combine(source.To<Delegate>(), value.To<Delegate>()).To<TDelegate>();
+	}
 
-		/// <summary>
-		/// Removes the specified delegate from the source delegate.
-		/// </summary>
-		/// <typeparam name="TDelegate">The type of the delegate.</typeparam>
-		/// <param name="source">The source delegate.</param>
-		/// <param name="value">The delegate to remove from the source.</param>
-		/// <returns>The resulting delegate of type TDelegate after removal.</returns>
-		public static TDelegate RemoveDelegate<TDelegate>(this TDelegate source, TDelegate value)
-		{
-			return Delegate.Remove(source.To<Delegate>(), value.To<Delegate>()).To<TDelegate>();
-		}
+	/// <summary>
+	/// Removes the specified delegate from the source delegate.
+	/// </summary>
+	/// <typeparam name="TDelegate">The type of the delegate.</typeparam>
+	/// <param name="source">The source delegate.</param>
+	/// <param name="value">The delegate to remove from the source.</param>
+	/// <returns>The resulting delegate of type TDelegate after removal.</returns>
+	public static TDelegate RemoveDelegate<TDelegate>(this TDelegate source, TDelegate value)
+	{
+		return Delegate.Remove(source.To<Delegate>(), value.To<Delegate>()).To<TDelegate>();
+	}
 
-		/// <summary>
-		/// Removes all invocation entries from the delegate.
-		/// </summary>
-		/// <typeparam name="TDelegate">The type of the delegate.</typeparam>
-		/// <param name="source">The delegate from which all delegates are removed.</param>
-		public static void RemoveAllDelegates<TDelegate>(this TDelegate source)
-		{
-			foreach (var item in source.GetInvocationList())
-				source.RemoveDelegate(item);
-		}
+	/// <summary>
+	/// Removes all invocation entries from the delegate.
+	/// </summary>
+	/// <typeparam name="TDelegate">The type of the delegate.</typeparam>
+	/// <param name="source">The delegate from which all delegates are removed.</param>
+	public static void RemoveAllDelegates<TDelegate>(this TDelegate source)
+	{
+		foreach (var item in source.GetInvocationList())
+			source.RemoveDelegate(item);
+	}
 
-		/// <summary>
-		/// Returns an enumerable collection of delegates from the delegate's invocation list.
-		/// </summary>
-		/// <typeparam name="TDelegate">The type of the delegate.</typeparam>
-		/// <param name="delegate">The delegate whose invocation list is retrieved.</param>
-		/// <returns>An IEnumerable of TDelegate representing the invocation list.</returns>
-		public static IEnumerable<TDelegate> GetInvocationList<TDelegate>(this TDelegate @delegate)
-		{
-			return @delegate.To<Delegate>()?.GetInvocationList().Cast<TDelegate>() ?? [];
-		}
+	/// <summary>
+	/// Returns an enumerable collection of delegates from the delegate's invocation list.
+	/// </summary>
+	/// <typeparam name="TDelegate">The type of the delegate.</typeparam>
+	/// <param name="delegate">The delegate whose invocation list is retrieved.</param>
+	/// <returns>An IEnumerable of TDelegate representing the invocation list.</returns>
+	public static IEnumerable<TDelegate> GetInvocationList<TDelegate>(this TDelegate @delegate)
+	{
+		return @delegate.To<Delegate>()?.GetInvocationList().Cast<TDelegate>() ?? [];
 	}
 }
\ No newline at end of file
diff --git a/Common/Disposable.cs b/Common/Disposable.cs
index afbe8917..f4813c8e 100644
--- a/Common/Disposable.cs
+++ b/Common/Disposable.cs
@@ -1,148 +1,147 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+#region Using Directives
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Xml.Serialization;
+
+#endregion
+
+/// <summary>
+/// Provides a base class for implementing the dispose pattern. 
+/// This class helps manage the disposal of managed and native resources.
+/// </summary>
+[Serializable]
+public abstract class Disposable : IDisposable
 {
-	#region Using Directives
+	private readonly SyncObject _lock = new();
+
+	enum DisposeState : byte
+	{
+		None,
+		Disposing,
+		Disposed
+	}
+
+	#region IsDisposed
 
-	using System;
-	using System.ComponentModel;
-	using System.Diagnostics;
-	using System.Xml.Serialization;
+	private DisposeState _state = DisposeState.None;
+
+	/// <summary>
+	/// Gets a value indicating whether this instance is disposed.
+	/// </summary>
+	/// <value>
+	///   <c>true</c> if this instance is disposed; otherwise, <c>false</c>.
+	/// </value>
+	[XmlIgnore]
+	[Browsable(false)]
+	public bool IsDisposed => _state == DisposeState.Disposed;
+
+	/// <summary>
+	/// Gets a value indicating whether the dispose process has been started.
+	/// </summary>
+	/// <value>
+	///   <c>true</c> if the dispose process has been initiated; otherwise, <c>false</c>.
+	/// </value>
+	[XmlIgnore]
+	[Browsable(false)]
+	public bool IsDisposeStarted => _state > DisposeState.None;
 
 	#endregion
 
 	/// <summary>
-	/// Provides a base class for implementing the dispose pattern. 
-	/// This class helps manage the disposal of managed and native resources.
+	/// Occurs when the object has been disposed.
 	/// </summary>
-	[Serializable]
-	public abstract class Disposable : IDisposable
-	{
-		private readonly SyncObject _lock = new();
+	public event Action Disposed;
 
-		enum DisposeState : byte
-		{
-			None,
-			Disposing,
-			Disposed
-		}
+	#region IDisposable Members
 
-		#region IsDisposed
-
-		private DisposeState _state = DisposeState.None;
-
-		/// <summary>
-		/// Gets a value indicating whether this instance is disposed.
-		/// </summary>
-		/// <value>
-		///   <c>true</c> if this instance is disposed; otherwise, <c>false</c>.
-		/// </value>
-		[XmlIgnore]
-		[Browsable(false)]
-		public bool IsDisposed => _state == DisposeState.Disposed;
-
-		/// <summary>
-		/// Gets a value indicating whether the dispose process has been started.
-		/// </summary>
-		/// <value>
-		///   <c>true</c> if the dispose process has been initiated; otherwise, <c>false</c>.
-		/// </value>
-		[XmlIgnore]
-		[Browsable(false)]
-		public bool IsDisposeStarted => _state > DisposeState.None;
-
-		#endregion
-
-		/// <summary>
-		/// Occurs when the object has been disposed.
-		/// </summary>
-		public event Action Disposed;
-
-		#region IDisposable Members
-
-		/// <summary>
-		/// Performs tasks associated with freeing, releasing, or resetting unmanaged resources.
-		/// </summary>
-		public virtual void Dispose()
+	/// <summary>
+	/// Performs tasks associated with freeing, releasing, or resetting unmanaged resources.
+	/// </summary>
+	public virtual void Dispose()
+	{
+		lock (_lock)
 		{
-			lock (_lock)
-			{
-				if (IsDisposeStarted)
-					return;
-
-				_state = DisposeState.Disposing;
-			}
-
-			try
-			{
-				DisposeManaged();
-				DisposeNative();
-			}
-			finally
-			{
-				_state = DisposeState.Disposed;
-				Disposed?.Invoke();
-				GC.SuppressFinalize(this);
-			}
-		}
+			if (IsDisposeStarted)
+				return;
 
-		#endregion
+			_state = DisposeState.Disposing;
+		}
 
-		/// <summary>
-		/// Disposes the managed resources.
-		/// Override this method to add custom clean up of managed resources.
-		/// </summary>
-		protected virtual void DisposeManaged()
+		try
 		{
+			DisposeManaged();
+			DisposeNative();
 		}
-
-		/// <summary>
-		/// Disposes the native resources.
-		/// Override this method to add custom clean up of native resources.
-		/// </summary>
-		protected virtual void DisposeNative()
+		finally
 		{
+			_state = DisposeState.Disposed;
+			Disposed?.Invoke();
+			GC.SuppressFinalize(this);
 		}
+	}
 
-		/// <summary>
-		/// Throws an exception if the dispose process has already been started.
-		/// </summary>
-		/// <exception cref="ObjectDisposedException">Thrown if the dispose process has already been initiated.</exception>
-		protected void ThrowIfDisposeStarted()
-		{
-			ThrowIfDisposed();
+	#endregion
 
-			if (IsDisposeStarted)
-				throw new ObjectDisposedException(GetType().Name + " has started dispose process");
-		}
+	/// <summary>
+	/// Disposes the managed resources.
+	/// Override this method to add custom clean up of managed resources.
+	/// </summary>
+	protected virtual void DisposeManaged()
+	{
+	}
 
-		/// <summary>
-		/// Throws an exception if the object is already disposed.
-		/// </summary>
-		/// <exception cref="ObjectDisposedException">Thrown if the object is already disposed.</exception>
-		protected void ThrowIfDisposed()
-		{
-			if (IsDisposed)
-				throw new ObjectDisposedException(GetType().Name);
-		}
+	/// <summary>
+	/// Disposes the native resources.
+	/// Override this method to add custom clean up of native resources.
+	/// </summary>
+	protected virtual void DisposeNative()
+	{
+	}
 
-		#region Finalize
+	/// <summary>
+	/// Throws an exception if the dispose process has already been started.
+	/// </summary>
+	/// <exception cref="ObjectDisposedException">Thrown if the dispose process has already been initiated.</exception>
+	protected void ThrowIfDisposeStarted()
+	{
+		ThrowIfDisposed();
+
+		if (IsDisposeStarted)
+			throw new ObjectDisposedException(GetType().Name + " has started dispose process");
+	}
 
-		/// <summary>
-		/// Releases unmanaged resources and performs other cleanup operations before the
-		/// object is reclaimed by garbage collection.
-		/// </summary>
-		~Disposable()
+	/// <summary>
+	/// Throws an exception if the object is already disposed.
+	/// </summary>
+	/// <exception cref="ObjectDisposedException">Thrown if the object is already disposed.</exception>
+	protected void ThrowIfDisposed()
+	{
+		if (IsDisposed)
+			throw new ObjectDisposedException(GetType().Name);
+	}
+
+	#region Finalize
+
+	/// <summary>
+	/// Releases unmanaged resources and performs other cleanup operations before the
+	/// object is reclaimed by garbage collection.
+	/// </summary>
+	~Disposable()
+	{
+		// http://stackoverflow.com/a/9903121
+		try
 		{
-			// http://stackoverflow.com/a/9903121
-			try
-			{
-				DisposeNative();
-			}
-			catch (Exception ex)
-			{
-				Trace.WriteLine(ex);
-			}
+			DisposeNative();
+		}
+		catch (Exception ex)
+		{
+			Trace.WriteLine(ex);
 		}
-
-		#endregion
 	}
+
+	#endregion
 }
diff --git a/Common/DisposableHelper.cs b/Common/DisposableHelper.cs
index 6393987c..9385a956 100644
--- a/Common/DisposableHelper.cs
+++ b/Common/DisposableHelper.cs
@@ -1,67 +1,66 @@
-namespace Ecng.Common
-{
-	using System;
-	using System.Collections.Generic;
-
-	/// <summary>
-	/// Provides helper methods for creating and managing disposable objects.
-	/// </summary>
-	public static class DisposableHelper
-	{
-		private sealed class DisposableByAction<T> : Disposable
-		{
-			private readonly T _unmanagedData;
-			private readonly Action<T> _disposeAction;
+namespace Ecng.Common;
 
-			/// <summary>
-			/// Initializes a new instance of the <see cref="DisposableByAction{T}"/> class with the specified unmanaged data and disposal action.
-			/// </summary>
-			/// <param name="unmanagedData">The unmanaged data to dispose.</param>
-			/// <param name="disposeAction">The action that disposes the unmanaged data.</param>
-			/// <exception cref="ArgumentNullException">Thrown when unmanagedData or disposeAction is null.</exception>
-			public DisposableByAction(T unmanagedData, Action<T> disposeAction)
-			{
-				if (unmanagedData.IsNull())
-					throw new ArgumentNullException(nameof(unmanagedData));
+using System;
+using System.Collections.Generic;
 
-				_unmanagedData = unmanagedData;
-				_disposeAction = disposeAction ?? throw new ArgumentNullException(nameof(disposeAction));
-			}
-
-			/// <summary>
-			/// Disposes the managed resources.
-			/// </summary>
-			protected override void DisposeManaged()
-			{
-				_disposeAction(_unmanagedData);
-				base.DisposeManaged();
-			}
-		}
+/// <summary>
+/// Provides helper methods for creating and managing disposable objects.
+/// </summary>
+public static class DisposableHelper
+{
+	private sealed class DisposableByAction<T> : Disposable
+	{
+		private readonly T _unmanagedData;
+		private readonly Action<T> _disposeAction;
 
 		/// <summary>
-		/// Disposes all IDisposable objects in the enumerable.
+		/// Initializes a new instance of the <see cref="DisposableByAction{T}"/> class with the specified unmanaged data and disposal action.
 		/// </summary>
-		/// <param name="disposables">The enumerable of disposable objects.</param>
-		/// <exception cref="ArgumentNullException">Thrown when disposables is null.</exception>
-		public static void DisposeAll(this IEnumerable<IDisposable> disposables)
+		/// <param name="unmanagedData">The unmanaged data to dispose.</param>
+		/// <param name="disposeAction">The action that disposes the unmanaged data.</param>
+		/// <exception cref="ArgumentNullException">Thrown when unmanagedData or disposeAction is null.</exception>
+		public DisposableByAction(T unmanagedData, Action<T> disposeAction)
 		{
-			if (disposables is null)
-				throw new ArgumentNullException(nameof(disposables));
+			if (unmanagedData.IsNull())
+				throw new ArgumentNullException(nameof(unmanagedData));
 
-			foreach (var disp in disposables)
-				disp.Dispose();
+			_unmanagedData = unmanagedData;
+			_disposeAction = disposeAction ?? throw new ArgumentNullException(nameof(disposeAction));
 		}
 
 		/// <summary>
-		/// Creates a disposable object that performs the specified disposal action on the provided unmanaged data.
+		/// Disposes the managed resources.
 		/// </summary>
-		/// <typeparam name="T">The type of the unmanaged data.</typeparam>
-		/// <param name="unmanagedData">The unmanaged data to be disposed.</param>
-		/// <param name="disposeAction">The action to execute during disposal.</param>
-		/// <returns>A disposable object that calls the disposal action.</returns>
-		public static Disposable MakeDisposable<T>(this T unmanagedData, Action<T> disposeAction)
+		protected override void DisposeManaged()
 		{
-			return new DisposableByAction<T>(unmanagedData, disposeAction);
+			_disposeAction(_unmanagedData);
+			base.DisposeManaged();
 		}
 	}
+
+	/// <summary>
+	/// Disposes all IDisposable objects in the enumerable.
+	/// </summary>
+	/// <param name="disposables">The enumerable of disposable objects.</param>
+	/// <exception cref="ArgumentNullException">Thrown when disposables is null.</exception>
+	public static void DisposeAll(this IEnumerable<IDisposable> disposables)
+	{
+		if (disposables is null)
+			throw new ArgumentNullException(nameof(disposables));
+
+		foreach (var disp in disposables)
+			disp.Dispose();
+	}
+
+	/// <summary>
+	/// Creates a disposable object that performs the specified disposal action on the provided unmanaged data.
+	/// </summary>
+	/// <typeparam name="T">The type of the unmanaged data.</typeparam>
+	/// <param name="unmanagedData">The unmanaged data to be disposed.</param>
+	/// <param name="disposeAction">The action to execute during disposal.</param>
+	/// <returns>A disposable object that calls the disposal action.</returns>
+	public static Disposable MakeDisposable<T>(this T unmanagedData, Action<T> disposeAction)
+	{
+		return new DisposableByAction<T>(unmanagedData, disposeAction);
+	}
 }
\ No newline at end of file
diff --git a/Common/Do.cs b/Common/Do.cs
index 05b349b6..aa951162 100644
--- a/Common/Do.cs
+++ b/Common/Do.cs
@@ -1,27 +1,26 @@
-namespace Ecng.Common
-{
-	using System;
-	using System.Globalization;
+namespace Ecng.Common;
+
+using System;
+using System.Globalization;
 
+/// <summary>
+/// Provides utility methods to execute functions and actions under the invariant culture.
+/// </summary>
+public static class Do
+{
 	/// <summary>
-	/// Provides utility methods to execute functions and actions under the invariant culture.
+	/// Executes the specified function under the invariant culture and returns its result.
 	/// </summary>
-	public static class Do
-	{
-		/// <summary>
-		/// Executes the specified function under the invariant culture and returns its result.
-		/// </summary>
-		/// <typeparam name="T">The type of the result produced by the function.</typeparam>
-		/// <param name="func">The function to execute.</param>
-		/// <returns>The result of executing the function.</returns>
-		public static T Invariant<T>(Func<T> func)
-			=> CultureInfo.InvariantCulture.DoInCulture(func);
+	/// <typeparam name="T">The type of the result produced by the function.</typeparam>
+	/// <param name="func">The function to execute.</param>
+	/// <returns>The result of executing the function.</returns>
+	public static T Invariant<T>(Func<T> func)
+		=> CultureInfo.InvariantCulture.DoInCulture(func);
 
-		/// <summary>
-		/// Executes the specified action under the invariant culture.
-		/// </summary>
-		/// <param name="action">The action to execute.</param>
-		public static void Invariant(Action action)
-			=> CultureInfo.InvariantCulture.DoInCulture(action);
-	}
+	/// <summary>
+	/// Executes the specified action under the invariant culture.
+	/// </summary>
+	/// <param name="action">The action to execute.</param>
+	public static void Invariant(Action action)
+		=> CultureInfo.InvariantCulture.DoInCulture(action);
 }
\ No newline at end of file
diff --git a/Common/DumpableStream.cs b/Common/DumpableStream.cs
index 7dc668bd..2274f5b5 100644
--- a/Common/DumpableStream.cs
+++ b/Common/DumpableStream.cs
@@ -1,154 +1,153 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+using System;
+using System.IO;
+
+/// <summary>
+/// Represents a stream wrapper that records all data read from and written to the underlying stream.
+/// </summary>
+/// <param name="underlying">The underlying stream to wrap.</param>
+public class DumpableStream(Stream underlying) : Stream
 {
-	using System;
-	using System.IO;
+	private readonly Stream _underlying = underlying ?? throw new ArgumentNullException(nameof(underlying));
+
+	/// <summary>
+	/// Retrieves and clears the dump of data read from the underlying stream.
+	/// </summary>
+	/// <returns>A byte array containing the dumped read data.</returns>
+	public byte[] GetReadDump()
+	{
+		return GetDump(ReadDump);
+	}
+
+	/// <summary>
+	/// Retrieves and clears the dump of data written to the underlying stream.
+	/// </summary>
+	/// <returns>A byte array containing the dumped write data.</returns>
+	public byte[] GetWriteDump()
+	{
+		return GetDump(WriteDump);
+	}
+
+	private static byte[] GetDump(AllocationArray<byte> dump)
+	{
+		var buffer = new byte[dump.Count];
+		Array.Copy(dump.Buffer, 0, buffer, 0, buffer.Length);
+		dump.Count = 0;
+		return buffer;
+	}
+
+	/// <summary>
+	/// Gets the allocation array that collects data read from the underlying stream.
+	/// </summary>
+	public AllocationArray<byte> ReadDump { get; } = [];
+
+	/// <summary>
+	/// Gets the allocation array that collects data written to the underlying stream.
+	/// </summary>
+	public AllocationArray<byte> WriteDump { get; } = [];
+
+	/// <summary>
+	/// When overridden in a derived class, clears all buffers for this stream and causes any buffered data to be written to the underlying device.
+	/// </summary>
+	/// <exception cref="IOException">An I/O error occurs.</exception>
+	public override void Flush()
+	{
+		_underlying.Flush();
+	}
+
+	/// <summary>
+	/// When overridden in a derived class, sets the position within the current stream.
+	/// </summary>
+	/// <param name="offset">A byte offset relative to the <paramref name="origin"/> parameter.</param>
+	/// <param name="origin">A value of type <see cref="SeekOrigin"/> indicating the reference point used to obtain the new position.</param>
+	/// <returns>The new position within the current stream.</returns>
+	/// <exception cref="IOException">An I/O error occurs.</exception>
+	/// <exception cref="NotSupportedException">The stream does not support seeking.</exception>
+	/// <exception cref="ObjectDisposedException">Methods were called after the stream was closed.</exception>
+	public override long Seek(long offset, SeekOrigin origin)
+	{
+		return _underlying.Seek(offset, origin);
+	}
+
+	/// <summary>
+	/// When overridden in a derived class, sets the length of the current stream.
+	/// </summary>
+	/// <param name="value">The desired length of the current stream in bytes.</param>
+	/// <exception cref="IOException">An I/O error occurs.</exception>
+	/// <exception cref="NotSupportedException">The stream does not support both writing and seeking.</exception>
+	/// <exception cref="ObjectDisposedException">Methods were called after the stream was closed.</exception>
+	public override void SetLength(long value)
+	{
+		_underlying.SetLength(value);
+	}
+
+	/// <summary>
+	/// Reads a sequence of bytes from the current stream and advances the position within the stream by the number of bytes read.
+	/// </summary>
+	/// <param name="buffer">An array of bytes. When this method returns, the buffer contains the specified byte array with the values between <paramref name="offset"/> and (<paramref name="offset"/> + <paramref name="count"/> - 1) replaced by the bytes read from the current source.</param>
+	/// <param name="offset">The zero-based byte offset in <paramref name="buffer"/> at which to begin storing the data read from the current stream.</param>
+	/// <param name="count">The maximum number of bytes to be read from the current stream.</param>
+	/// <returns>The total number of bytes read into the buffer.</returns>
+	/// <exception cref="ArgumentException">The sum of <paramref name="offset"/> and <paramref name="count"/> is larger than the buffer length.</exception>
+	/// <exception cref="ArgumentNullException"><paramref name="buffer"/> is null.</exception>
+	/// <exception cref="ArgumentOutOfRangeException"><paramref name="offset"/> or <paramref name="count"/> is negative.</exception>
+	/// <exception cref="IOException">An I/O error occurs.</exception>
+	/// <exception cref="NotSupportedException">The stream does not support reading.</exception>
+	/// <exception cref="ObjectDisposedException">Methods were called after the stream was closed.</exception>
+	public override int Read(byte[] buffer, int offset, int count)
+	{
+		var read = _underlying.Read(buffer, offset, count);
+
+		if (read > 0)
+			ReadDump.Add(buffer, offset, read);
+
+		return read;
+	}
+
+	/// <summary>
+	/// Writes a sequence of bytes to the current stream and advances the current position within this stream by the number of bytes written.
+	/// </summary>
+	/// <param name="buffer">An array of bytes. This method copies <paramref name="count"/> bytes from <paramref name="buffer"/> to the current stream.</param>
+	/// <param name="offset">The zero-based byte offset in <paramref name="buffer"/> at which to begin copying bytes to the current stream.</param>
+	/// <param name="count">The number of bytes to be written to the current stream.</param>
+	public override void Write(byte[] buffer, int offset, int count)
+	{
+		_underlying.Write(buffer, offset, count);
+		WriteDump.Add(buffer, offset, count);
+	}
+
+	/// <summary>
+	/// Gets a value indicating whether the current stream supports reading.
+	/// </summary>
+	public override bool CanRead => _underlying.CanRead;
+
+	/// <summary>
+	/// Gets a value indicating whether the current stream supports seeking.
+	/// </summary>
+	public override bool CanSeek => _underlying.CanSeek;
+
+	/// <summary>
+	/// Gets a value indicating whether the current stream supports writing.
+	/// </summary>
+	public override bool CanWrite => _underlying.CanWrite;
+
+	/// <summary>
+	/// Gets the length in bytes of the stream.
+	/// </summary>
+	/// <exception cref="NotSupportedException">A class derived from Stream does not support seeking.</exception>
+	/// <exception cref="ObjectDisposedException">Methods were called after the stream was closed.</exception>
+	public override long Length => _underlying.Length;
 
 	/// <summary>
-	/// Represents a stream wrapper that records all data read from and written to the underlying stream.
+	/// Gets or sets the position within the current stream.
 	/// </summary>
-	/// <param name="underlying">The underlying stream to wrap.</param>
-	public class DumpableStream(Stream underlying) : Stream
+	/// <exception cref="IOException">An I/O error occurs.</exception>
+	/// <exception cref="NotSupportedException">The stream does not support seeking.</exception>
+	/// <exception cref="ObjectDisposedException">Methods were called after the stream was closed.</exception>
+	public override long Position
 	{
-		private readonly Stream _underlying = underlying ?? throw new ArgumentNullException(nameof(underlying));
-
-		/// <summary>
-		/// Retrieves and clears the dump of data read from the underlying stream.
-		/// </summary>
-		/// <returns>A byte array containing the dumped read data.</returns>
-		public byte[] GetReadDump()
-		{
-			return GetDump(ReadDump);
-		}
-
-		/// <summary>
-		/// Retrieves and clears the dump of data written to the underlying stream.
-		/// </summary>
-		/// <returns>A byte array containing the dumped write data.</returns>
-		public byte[] GetWriteDump()
-		{
-			return GetDump(WriteDump);
-		}
-
-		private static byte[] GetDump(AllocationArray<byte> dump)
-		{
-			var buffer = new byte[dump.Count];
-			Array.Copy(dump.Buffer, 0, buffer, 0, buffer.Length);
-			dump.Count = 0;
-			return buffer;
-		}
-
-		/// <summary>
-		/// Gets the allocation array that collects data read from the underlying stream.
-		/// </summary>
-		public AllocationArray<byte> ReadDump { get; } = [];
-
-		/// <summary>
-		/// Gets the allocation array that collects data written to the underlying stream.
-		/// </summary>
-		public AllocationArray<byte> WriteDump { get; } = [];
-
-		/// <summary>
-		/// When overridden in a derived class, clears all buffers for this stream and causes any buffered data to be written to the underlying device.
-		/// </summary>
-		/// <exception cref="IOException">An I/O error occurs.</exception>
-		public override void Flush()
-		{
-			_underlying.Flush();
-		}
-
-		/// <summary>
-		/// When overridden in a derived class, sets the position within the current stream.
-		/// </summary>
-		/// <param name="offset">A byte offset relative to the <paramref name="origin"/> parameter.</param>
-		/// <param name="origin">A value of type <see cref="SeekOrigin"/> indicating the reference point used to obtain the new position.</param>
-		/// <returns>The new position within the current stream.</returns>
-		/// <exception cref="IOException">An I/O error occurs.</exception>
-		/// <exception cref="NotSupportedException">The stream does not support seeking.</exception>
-		/// <exception cref="ObjectDisposedException">Methods were called after the stream was closed.</exception>
-		public override long Seek(long offset, SeekOrigin origin)
-		{
-			return _underlying.Seek(offset, origin);
-		}
-
-		/// <summary>
-		/// When overridden in a derived class, sets the length of the current stream.
-		/// </summary>
-		/// <param name="value">The desired length of the current stream in bytes.</param>
-		/// <exception cref="IOException">An I/O error occurs.</exception>
-		/// <exception cref="NotSupportedException">The stream does not support both writing and seeking.</exception>
-		/// <exception cref="ObjectDisposedException">Methods were called after the stream was closed.</exception>
-		public override void SetLength(long value)
-		{
-			_underlying.SetLength(value);
-		}
-
-		/// <summary>
-		/// Reads a sequence of bytes from the current stream and advances the position within the stream by the number of bytes read.
-		/// </summary>
-		/// <param name="buffer">An array of bytes. When this method returns, the buffer contains the specified byte array with the values between <paramref name="offset"/> and (<paramref name="offset"/> + <paramref name="count"/> - 1) replaced by the bytes read from the current source.</param>
-		/// <param name="offset">The zero-based byte offset in <paramref name="buffer"/> at which to begin storing the data read from the current stream.</param>
-		/// <param name="count">The maximum number of bytes to be read from the current stream.</param>
-		/// <returns>The total number of bytes read into the buffer.</returns>
-		/// <exception cref="ArgumentException">The sum of <paramref name="offset"/> and <paramref name="count"/> is larger than the buffer length.</exception>
-		/// <exception cref="ArgumentNullException"><paramref name="buffer"/> is null.</exception>
-		/// <exception cref="ArgumentOutOfRangeException"><paramref name="offset"/> or <paramref name="count"/> is negative.</exception>
-		/// <exception cref="IOException">An I/O error occurs.</exception>
-		/// <exception cref="NotSupportedException">The stream does not support reading.</exception>
-		/// <exception cref="ObjectDisposedException">Methods were called after the stream was closed.</exception>
-		public override int Read(byte[] buffer, int offset, int count)
-		{
-			var read = _underlying.Read(buffer, offset, count);
-
-			if (read > 0)
-				ReadDump.Add(buffer, offset, read);
-
-			return read;
-		}
-
-		/// <summary>
-		/// Writes a sequence of bytes to the current stream and advances the current position within this stream by the number of bytes written.
-		/// </summary>
-		/// <param name="buffer">An array of bytes. This method copies <paramref name="count"/> bytes from <paramref name="buffer"/> to the current stream.</param>
-		/// <param name="offset">The zero-based byte offset in <paramref name="buffer"/> at which to begin copying bytes to the current stream.</param>
-		/// <param name="count">The number of bytes to be written to the current stream.</param>
-		public override void Write(byte[] buffer, int offset, int count)
-		{
-			_underlying.Write(buffer, offset, count);
-			WriteDump.Add(buffer, offset, count);
-		}
-
-		/// <summary>
-		/// Gets a value indicating whether the current stream supports reading.
-		/// </summary>
-		public override bool CanRead => _underlying.CanRead;
-
-		/// <summary>
-		/// Gets a value indicating whether the current stream supports seeking.
-		/// </summary>
-		public override bool CanSeek => _underlying.CanSeek;
-
-		/// <summary>
-		/// Gets a value indicating whether the current stream supports writing.
-		/// </summary>
-		public override bool CanWrite => _underlying.CanWrite;
-
-		/// <summary>
-		/// Gets the length in bytes of the stream.
-		/// </summary>
-		/// <exception cref="NotSupportedException">A class derived from Stream does not support seeking.</exception>
-		/// <exception cref="ObjectDisposedException">Methods were called after the stream was closed.</exception>
-		public override long Length => _underlying.Length;
-
-		/// <summary>
-		/// Gets or sets the position within the current stream.
-		/// </summary>
-		/// <exception cref="IOException">An I/O error occurs.</exception>
-		/// <exception cref="NotSupportedException">The stream does not support seeking.</exception>
-		/// <exception cref="ObjectDisposedException">Methods were called after the stream was closed.</exception>
-		public override long Position
-		{
-			get => _underlying.Position;
-			set => _underlying.Position = value;
-		}
+		get => _underlying.Position;
+		set => _underlying.Position = value;
 	}
 }
\ No newline at end of file
diff --git a/Common/DuplicateException.cs b/Common/DuplicateException.cs
index e4e08b33..379970ed 100644
--- a/Common/DuplicateException.cs
+++ b/Common/DuplicateException.cs
@@ -1,12 +1,11 @@
-namespace Ecng.Common
-{
-	using System;
+namespace Ecng.Common;
+
+using System;
 
-	/// <summary>
-	/// Represents an exception that is thrown when a duplicate operation is performed.
-	/// </summary>
-	/// <param name="message">A message that describes the error.</param>
-	public class DuplicateException(string message) : InvalidOperationException(message)
-	{
-	}
+/// <summary>
+/// Represents an exception that is thrown when a duplicate operation is performed.
+/// </summary>
+/// <param name="message">A message that describes the error.</param>
+public class DuplicateException(string message) : InvalidOperationException(message)
+{
 }
\ No newline at end of file
diff --git a/Common/Enumerable.cs b/Common/Enumerable.cs
index 0cce74a6..85a8459b 100644
--- a/Common/Enumerable.cs
+++ b/Common/Enumerable.cs
@@ -1,50 +1,49 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+#region Using Directives
+
+using System.Collections;
+using System.Collections.Generic;
+
+#endregion
+
+/// <summary>
+/// Represents an abstract enumerable collection of elements.
+/// </summary>
+/// <typeparam name="T">The type of elements in the collection.</typeparam>
+public abstract class Enumerable<T> : IEnumerable<T>
 {
-	#region Using Directives
+	#region IEnumerable<T> Members
 
-	using System.Collections;
-	using System.Collections.Generic;
+	/// <summary>
+	/// Returns an enumerator that iterates through the collection.
+	/// </summary>
+	/// <returns>An enumerator that can be used to iterate through the collection.</returns>
+	IEnumerator<T> IEnumerable<T>.GetEnumerator()
+	{
+		return GetEnumerator();
+	}
 
 	#endregion
 
+	#region IEnumerable Members
+
 	/// <summary>
-	/// Represents an abstract enumerable collection of elements.
+	/// Returns an enumerator that iterates through a collection.
 	/// </summary>
-	/// <typeparam name="T">The type of elements in the collection.</typeparam>
-	public abstract class Enumerable<T> : IEnumerable<T>
+	/// <returns>
+	/// An <see cref="IEnumerator"/> object that can be used to iterate through the collection.
+	/// </returns>
+	IEnumerator IEnumerable.GetEnumerator()
 	{
-		#region IEnumerable<T> Members
-
-		/// <summary>
-		/// Returns an enumerator that iterates through the collection.
-		/// </summary>
-		/// <returns>An enumerator that can be used to iterate through the collection.</returns>
-		IEnumerator<T> IEnumerable<T>.GetEnumerator()
-		{
-			return GetEnumerator();
-		}
-
-		#endregion
-
-		#region IEnumerable Members
-
-		/// <summary>
-		/// Returns an enumerator that iterates through a collection.
-		/// </summary>
-		/// <returns>
-		/// An <see cref="IEnumerator"/> object that can be used to iterate through the collection.
-		/// </returns>
-		IEnumerator IEnumerable.GetEnumerator()
-		{
-			return GetEnumerator();
-		}
-
-		#endregion
-
-		/// <summary>
-		/// When overridden in a derived class, returns an enumerator that iterates through the collection.
-		/// </summary>
-		/// <returns>An enumerator that can be used to iterate through the collection.</returns>
-		protected abstract IEnumerator<T> GetEnumerator();
+		return GetEnumerator();
 	}
+
+	#endregion
+
+	/// <summary>
+	/// When overridden in a derived class, returns an enumerator that iterates through the collection.
+	/// </summary>
+	/// <returns>An enumerator that can be used to iterate through the collection.</returns>
+	protected abstract IEnumerator<T> GetEnumerator();
 }
\ No newline at end of file
diff --git a/Common/Enumerator.cs b/Common/Enumerator.cs
index 79b9b705..f621011b 100644
--- a/Common/Enumerator.cs
+++ b/Common/Enumerator.cs
@@ -1,295 +1,294 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+#region Using Directives
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+
+#endregion
+
+/// <summary>
+/// Provides extension methods and utilities for enum types.
+/// </summary>
+public static class Enumerator
 {
-	#region Using Directives
+	/// <summary>
+	/// Gets the underlying base type of the enum type T.
+	/// </summary>
+	/// <typeparam name="T">The enum type.</typeparam>
+	/// <returns>The underlying numeric type for the enum.</returns>
+	public static Type GetEnumBaseType<T>()
+	{
+		return typeof(T).GetEnumBaseType();
+	}
+
+	/// <summary>
+	/// Gets the underlying type of the specified enum type.
+	/// </summary>
+	/// <param name="enumType">The enum type.</param>
+	/// <returns>The underlying numeric type for the enum.</returns>
+	public static Type GetEnumBaseType(this Type enumType)
+	{
+		return Enum.GetUnderlyingType(enumType);
+	}
+
+	/// <summary>
+	/// Gets the name of the specified enum value.
+	/// </summary>
+	/// <typeparam name="T">The enum type.</typeparam>
+	/// <param name="value">The enum value.</param>
+	/// <returns>The name of the enum value.</returns>
+	public static string GetName<T>(T value)
+	{
+		return value.To<Enum>().GetName();
+	}
+
+	/// <summary>
+	/// Gets the name of the enum value.
+	/// </summary>
+	/// <param name="value">The enum value.</param>
+	/// <returns>The name of the enum value.</returns>
+	public static string GetName(this Enum value)
+	{
+		return Enum.GetName(value.GetType(), value);
+	}
+
+	/// <summary>
+	/// Gets all enum values of type T.
+	/// </summary>
+	/// <typeparam name="T">The enum type.</typeparam>
+	/// <returns>An enumerable of all enum values.</returns>
+	public static IEnumerable<T> GetValues<T>()
+	{
+		return typeof(T).GetValues().Cast<T>();
+	}
+
+	/// <summary>
+	/// Excludes obsolete enum values from the provided collection.
+	/// </summary>
+	/// <typeparam name="T">The enum type.</typeparam>
+	/// <param name="values">The collection of enum values.</param>
+	/// <returns>An enumerable without obsolete enum values.</returns>
+	public static IEnumerable<T> ExcludeObsolete<T>(this IEnumerable<T> values)
+	{
+		return values.Where(v => v.GetAttributeOfType<ObsoleteAttribute>() is null);
+	}
 
-	using System;
-	using System.Collections.Generic;
-	using System.ComponentModel;
-	using System.Linq;
+	/// <summary>
+	/// Gets all enum values for the specified enum type as objects.
+	/// </summary>
+	/// <param name="enumType">The enum type.</param>
+	/// <returns>An enumerable of enum values as objects.</returns>
+	public static IEnumerable<object> GetValues(this Type enumType)
+	{
+		return Enum.GetValues(enumType).Cast<object>();
+	}
 
-	#endregion
+	/// <summary>
+	/// Gets all names of the enum type T as a collection of strings.
+	/// </summary>
+	/// <typeparam name="T">The enum type.</typeparam>
+	/// <returns>An enumerable of enum names.</returns>
+	public static IEnumerable<string> GetNames<T>()
+	{
+		return typeof(T).GetNames();
+	}
 
 	/// <summary>
-	/// Provides extension methods and utilities for enum types.
+	/// Gets all names of the specified enum type.
 	/// </summary>
-	public static class Enumerator
+	/// <param name="enumType">The enum type.</param>
+	/// <returns>An enumerable of enum names.</returns>
+	public static IEnumerable<string> GetNames(this Type enumType)
 	{
-		/// <summary>
-		/// Gets the underlying base type of the enum type T.
-		/// </summary>
-		/// <typeparam name="T">The enum type.</typeparam>
-		/// <returns>The underlying numeric type for the enum.</returns>
-		public static Type GetEnumBaseType<T>()
-		{
-			return typeof(T).GetEnumBaseType();
-		}
-
-		/// <summary>
-		/// Gets the underlying type of the specified enum type.
-		/// </summary>
-		/// <param name="enumType">The enum type.</param>
-		/// <returns>The underlying numeric type for the enum.</returns>
-		public static Type GetEnumBaseType(this Type enumType)
-		{
-			return Enum.GetUnderlyingType(enumType);
-		}
-
-		/// <summary>
-		/// Gets the name of the specified enum value.
-		/// </summary>
-		/// <typeparam name="T">The enum type.</typeparam>
-		/// <param name="value">The enum value.</param>
-		/// <returns>The name of the enum value.</returns>
-		public static string GetName<T>(T value)
-		{
-			return value.To<Enum>().GetName();
-		}
-
-		/// <summary>
-		/// Gets the name of the enum value.
-		/// </summary>
-		/// <param name="value">The enum value.</param>
-		/// <returns>The name of the enum value.</returns>
-		public static string GetName(this Enum value)
-		{
-			return Enum.GetName(value.GetType(), value);
-		}
-
-		/// <summary>
-		/// Gets all enum values of type T.
-		/// </summary>
-		/// <typeparam name="T">The enum type.</typeparam>
-		/// <returns>An enumerable of all enum values.</returns>
-		public static IEnumerable<T> GetValues<T>()
-		{
-			return typeof(T).GetValues().Cast<T>();
-		}
-
-		/// <summary>
-		/// Excludes obsolete enum values from the provided collection.
-		/// </summary>
-		/// <typeparam name="T">The enum type.</typeparam>
-		/// <param name="values">The collection of enum values.</param>
-		/// <returns>An enumerable without obsolete enum values.</returns>
-		public static IEnumerable<T> ExcludeObsolete<T>(this IEnumerable<T> values)
-		{
-			return values.Where(v => v.GetAttributeOfType<ObsoleteAttribute>() is null);
-		}
-
-		/// <summary>
-		/// Gets all enum values for the specified enum type as objects.
-		/// </summary>
-		/// <param name="enumType">The enum type.</param>
-		/// <returns>An enumerable of enum values as objects.</returns>
-		public static IEnumerable<object> GetValues(this Type enumType)
-		{
-			return Enum.GetValues(enumType).Cast<object>();
-		}
-
-		/// <summary>
-		/// Gets all names of the enum type T as a collection of strings.
-		/// </summary>
-		/// <typeparam name="T">The enum type.</typeparam>
-		/// <returns>An enumerable of enum names.</returns>
-		public static IEnumerable<string> GetNames<T>()
-		{
-			return typeof(T).GetNames();
-		}
-
-		/// <summary>
-		/// Gets all names of the specified enum type.
-		/// </summary>
-		/// <param name="enumType">The enum type.</param>
-		/// <returns>An enumerable of enum names.</returns>
-		public static IEnumerable<string> GetNames(this Type enumType)
-		{
-			return Enum.GetNames(enumType);
-		}
-
-		/// <summary>
-		/// Determines whether the specified enum value is defined in its type.
-		/// </summary>
-		/// <typeparam name="T">The enum type.</typeparam>
-		/// <param name="enumValue">The enum value.</param>
-		/// <returns><c>true</c> if the value is defined; otherwise, <c>false</c>.</returns>
-		public static bool IsDefined<T>(this T enumValue)
-		{
-			return Enum.IsDefined(typeof(T), enumValue);
-		}
-
-		/// <summary>
-		/// Determines whether the specified enum type has the Flags attribute.
-		/// </summary>
-		/// <param name="enumType">The enum type.</param>
-		/// <returns><c>true</c> if the Flags attribute is present; otherwise, <c>false</c>.</returns>
-		public static bool IsFlags(this Type enumType)
-			=> enumType.GetAttribute<FlagsAttribute>() is not null;
-
-		/// <summary>
-		/// Splits the masked enum value into its constituent flag values and returns them as objects.
-		/// </summary>
-		/// <param name="maskedValue">The masked enum value.</param>
-		/// <returns>An enumerable of individual flag values as objects.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when maskedValue is null.</exception>
-		public static IEnumerable<object> SplitMask2(this object maskedValue)
-		{
-			if (maskedValue is null)
-				throw new ArgumentNullException(nameof(maskedValue));
-
-			return maskedValue.GetType().GetValues().Where(v => HasFlags(maskedValue, v));
-		}
-
-		/// <summary>
-		/// Splits the masked enum value into its constituent flag values of type T.
-		/// </summary>
-		/// <typeparam name="T">The enum type.</typeparam>
-		/// <param name="maskedValue">The masked enum value.</param>
-		/// <returns>An enumerable of individual flag values of type T.</returns>
-		public static IEnumerable<T> SplitMask<T>(this T maskedValue)
-		{
-			return GetValues<T>().Where(v => HasFlags(maskedValue, v));
-		}
-
-		/// <summary>
-		/// Joins all flags of type T into a single masked enum value.
-		/// </summary>
-		/// <typeparam name="T">The enum type.</typeparam>
-		/// <returns>The joined masked enum value.</returns>
-		public static T JoinMask<T>()
-		{
-			return GetValues<T>().JoinMask();
-		}
-
-		/// <summary>
-		/// Joins the provided collection of enum values into a single masked enum value.
-		/// </summary>
-		/// <typeparam name="T">The enum type.</typeparam>
-		/// <param name="values">An enumerable of enum values.</param>
-		/// <returns>The resulting joined masked enum value.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when values is null.</exception>
-		public static T JoinMask<T>(this IEnumerable<T> values)
-		{
-			if (values is null)
-				throw new ArgumentNullException(nameof(values));
-
-			return values.Aggregate(default(T), (current, t) => (current.To<long>() | t.To<long>()).To<T>());
-		}
-
-		/// <summary>
-		/// Removes the specified flag(s) from the source enum value and returns the result.
-		/// </summary>
-		/// <typeparam name="T">The enum type.</typeparam>
-		/// <param name="enumSource">The source enum value.</param>
-		/// <param name="enumPart">The flag(s) to remove.</param>
-		/// <returns>The enum value after removal of the specified flag(s).</returns>
-		public static T Remove<T>(T enumSource, T enumPart)
-		{
-			return enumSource.To<Enum>().Remove(enumPart);
-		}
-
-		/// <summary>
-		/// Removes the specified flag from the enum value.
-		/// </summary>
-		/// <typeparam name="T">The enum type.</typeparam>
-		/// <param name="enumSource">The source enum value.</param>
-		/// <param name="enumPart">The flag to remove.</param>
-		/// <returns>The enum value after removal of the flag.</returns>
-		/// <exception cref="ArgumentException">Thrown when the type of enumPart does not match enumSource.</exception>
-		public static T Remove<T>(this Enum enumSource, T enumPart)
-		{
-			if (enumSource.GetType() != typeof(T))
-				throw new ArgumentException(nameof(enumPart));
-
-			return (enumSource.To<long>() & ~enumPart.To<long>()).To<T>();
-		}
-
-		/// <summary>
-		/// Determines whether the specified enum value contains the given flag(s). (Obsolete: Use HasFlags method.)
-		/// </summary>
-		/// <typeparam name="T">The enum type.</typeparam>
-		/// <param name="enumSource">The source enum value.</param>
-		/// <param name="enumPart">The flag(s) to check for.</param>
-		/// <returns><c>true</c> if the source contains the flag(s); otherwise, <c>false</c>.</returns>
-		[Obsolete("Use HasFlags method.")]
-		public static bool Contains<T>(T enumSource, T enumPart)
-		{
-			return HasFlags(enumSource, enumPart);
-		}
-
-		/// <summary>
-		/// Determines whether the specified enum value has the given flag(s).
-		/// </summary>
-		/// <typeparam name="T">The enum type.</typeparam>
-		/// <param name="enumSource">The source enum value.</param>
-		/// <param name="enumPart">The flag(s) to check for.</param>
-		/// <returns><c>true</c> if the flag(s) are present; otherwise, <c>false</c>.</returns>
-		public static bool HasFlags<T>(T enumSource, T enumPart)
-		{
-			return enumSource.To<Enum>().HasFlag(enumPart.To<Enum>());
-		}
-
-		/// <summary>
-		/// Determines whether the enum value contains the specified flag. (Obsolete: Use Enum.HasFlag method.)
-		/// </summary>
-		/// <param name="enumSource">The source enum value.</param>
-		/// <param name="enumPart">The flag to check for.</param>
-		/// <returns><c>true</c> if the flag is present; otherwise, <c>false</c>.</returns>
-		[Obsolete("Use Enum.HasFlag method.")]
-		public static bool Contains(this Enum enumSource, Enum enumPart)
-		{
-			return enumSource.HasFlag(enumPart);
-		}
-
-		/// <summary>
-		/// Attempts to parse the string to an enum value of type T.
-		/// </summary>
-		/// <typeparam name="T">The enum type.</typeparam>
-		/// <param name="str">The string representation of the enum value.</param>
-		/// <param name="value">When this method returns, contains the enum value equivalent to the string, if the parse succeeded.</param>
-		/// <param name="ignoreCase">if set to <c>true</c> ignores case during parsing.</param>
-		/// <returns><c>true</c> if the parse was successful; otherwise, <c>false</c>.</returns>
-		public static bool TryParse<T>(this string str, out T value, bool ignoreCase = true)
-			where T : struct
-		{
-			return Enum.TryParse(str, ignoreCase, out value);
-		}
-
-		//
-		// https://stackoverflow.com/a/9276348
-		//
-
-		/// <summary>
-		/// Retrieves an attribute of type TAttribute from the enum field value.
-		/// </summary>
-		/// <typeparam name="TAttribute">The type of attribute to retrieve.</typeparam>
-		/// <param name="enumVal">The enum value.</param>
-		/// <returns>The attribute instance if found; otherwise, <c>null</c>.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when enumVal is null.</exception>
-		public static TAttribute GetAttributeOfType<TAttribute>(this object enumVal)
-			where TAttribute : Attribute
-		{
-			if (enumVal is null)
-				throw new ArgumentNullException(nameof(enumVal));
-
-			var memInfo = enumVal.GetType().GetMember(enumVal.ToString());
-			return memInfo[0].GetAttribute<TAttribute>(false);
-		}
-
-		/// <summary>
-		/// Determines whether the enum value is marked as browsable.
-		/// </summary>
-		/// <param name="enumVal">The enum value.</param>
-		/// <returns><c>true</c> if the enum value is browsable; otherwise, <c>false</c>.</returns>
-		public static bool IsEnumBrowsable(this object enumVal)
-			=> enumVal.GetAttributeOfType<BrowsableAttribute>()?.Browsable ?? true;
-
-		/// <summary>
-		/// Excludes non-browsable enum values from the collection.
-		/// </summary>
-		/// <typeparam name="T">The enum type.</typeparam>
-		/// <param name="values">The collection of enum values.</param>
-		/// <returns>An enumerable of browsable enum values.</returns>
-		public static IEnumerable<T> ExcludeNonBrowsable<T>(this IEnumerable<T> values)
-			=> values.Where(v => v.IsEnumBrowsable());
+		return Enum.GetNames(enumType);
 	}
+
+	/// <summary>
+	/// Determines whether the specified enum value is defined in its type.
+	/// </summary>
+	/// <typeparam name="T">The enum type.</typeparam>
+	/// <param name="enumValue">The enum value.</param>
+	/// <returns><c>true</c> if the value is defined; otherwise, <c>false</c>.</returns>
+	public static bool IsDefined<T>(this T enumValue)
+	{
+		return Enum.IsDefined(typeof(T), enumValue);
+	}
+
+	/// <summary>
+	/// Determines whether the specified enum type has the Flags attribute.
+	/// </summary>
+	/// <param name="enumType">The enum type.</param>
+	/// <returns><c>true</c> if the Flags attribute is present; otherwise, <c>false</c>.</returns>
+	public static bool IsFlags(this Type enumType)
+		=> enumType.GetAttribute<FlagsAttribute>() is not null;
+
+	/// <summary>
+	/// Splits the masked enum value into its constituent flag values and returns them as objects.
+	/// </summary>
+	/// <param name="maskedValue">The masked enum value.</param>
+	/// <returns>An enumerable of individual flag values as objects.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when maskedValue is null.</exception>
+	public static IEnumerable<object> SplitMask2(this object maskedValue)
+	{
+		if (maskedValue is null)
+			throw new ArgumentNullException(nameof(maskedValue));
+
+		return maskedValue.GetType().GetValues().Where(v => HasFlags(maskedValue, v));
+	}
+
+	/// <summary>
+	/// Splits the masked enum value into its constituent flag values of type T.
+	/// </summary>
+	/// <typeparam name="T">The enum type.</typeparam>
+	/// <param name="maskedValue">The masked enum value.</param>
+	/// <returns>An enumerable of individual flag values of type T.</returns>
+	public static IEnumerable<T> SplitMask<T>(this T maskedValue)
+	{
+		return GetValues<T>().Where(v => HasFlags(maskedValue, v));
+	}
+
+	/// <summary>
+	/// Joins all flags of type T into a single masked enum value.
+	/// </summary>
+	/// <typeparam name="T">The enum type.</typeparam>
+	/// <returns>The joined masked enum value.</returns>
+	public static T JoinMask<T>()
+	{
+		return GetValues<T>().JoinMask();
+	}
+
+	/// <summary>
+	/// Joins the provided collection of enum values into a single masked enum value.
+	/// </summary>
+	/// <typeparam name="T">The enum type.</typeparam>
+	/// <param name="values">An enumerable of enum values.</param>
+	/// <returns>The resulting joined masked enum value.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when values is null.</exception>
+	public static T JoinMask<T>(this IEnumerable<T> values)
+	{
+		if (values is null)
+			throw new ArgumentNullException(nameof(values));
+
+		return values.Aggregate(default(T), (current, t) => (current.To<long>() | t.To<long>()).To<T>());
+	}
+
+	/// <summary>
+	/// Removes the specified flag(s) from the source enum value and returns the result.
+	/// </summary>
+	/// <typeparam name="T">The enum type.</typeparam>
+	/// <param name="enumSource">The source enum value.</param>
+	/// <param name="enumPart">The flag(s) to remove.</param>
+	/// <returns>The enum value after removal of the specified flag(s).</returns>
+	public static T Remove<T>(T enumSource, T enumPart)
+	{
+		return enumSource.To<Enum>().Remove(enumPart);
+	}
+
+	/// <summary>
+	/// Removes the specified flag from the enum value.
+	/// </summary>
+	/// <typeparam name="T">The enum type.</typeparam>
+	/// <param name="enumSource">The source enum value.</param>
+	/// <param name="enumPart">The flag to remove.</param>
+	/// <returns>The enum value after removal of the flag.</returns>
+	/// <exception cref="ArgumentException">Thrown when the type of enumPart does not match enumSource.</exception>
+	public static T Remove<T>(this Enum enumSource, T enumPart)
+	{
+		if (enumSource.GetType() != typeof(T))
+			throw new ArgumentException(nameof(enumPart));
+
+		return (enumSource.To<long>() & ~enumPart.To<long>()).To<T>();
+	}
+
+	/// <summary>
+	/// Determines whether the specified enum value contains the given flag(s). (Obsolete: Use HasFlags method.)
+	/// </summary>
+	/// <typeparam name="T">The enum type.</typeparam>
+	/// <param name="enumSource">The source enum value.</param>
+	/// <param name="enumPart">The flag(s) to check for.</param>
+	/// <returns><c>true</c> if the source contains the flag(s); otherwise, <c>false</c>.</returns>
+	[Obsolete("Use HasFlags method.")]
+	public static bool Contains<T>(T enumSource, T enumPart)
+	{
+		return HasFlags(enumSource, enumPart);
+	}
+
+	/// <summary>
+	/// Determines whether the specified enum value has the given flag(s).
+	/// </summary>
+	/// <typeparam name="T">The enum type.</typeparam>
+	/// <param name="enumSource">The source enum value.</param>
+	/// <param name="enumPart">The flag(s) to check for.</param>
+	/// <returns><c>true</c> if the flag(s) are present; otherwise, <c>false</c>.</returns>
+	public static bool HasFlags<T>(T enumSource, T enumPart)
+	{
+		return enumSource.To<Enum>().HasFlag(enumPart.To<Enum>());
+	}
+
+	/// <summary>
+	/// Determines whether the enum value contains the specified flag. (Obsolete: Use Enum.HasFlag method.)
+	/// </summary>
+	/// <param name="enumSource">The source enum value.</param>
+	/// <param name="enumPart">The flag to check for.</param>
+	/// <returns><c>true</c> if the flag is present; otherwise, <c>false</c>.</returns>
+	[Obsolete("Use Enum.HasFlag method.")]
+	public static bool Contains(this Enum enumSource, Enum enumPart)
+	{
+		return enumSource.HasFlag(enumPart);
+	}
+
+	/// <summary>
+	/// Attempts to parse the string to an enum value of type T.
+	/// </summary>
+	/// <typeparam name="T">The enum type.</typeparam>
+	/// <param name="str">The string representation of the enum value.</param>
+	/// <param name="value">When this method returns, contains the enum value equivalent to the string, if the parse succeeded.</param>
+	/// <param name="ignoreCase">if set to <c>true</c> ignores case during parsing.</param>
+	/// <returns><c>true</c> if the parse was successful; otherwise, <c>false</c>.</returns>
+	public static bool TryParse<T>(this string str, out T value, bool ignoreCase = true)
+		where T : struct
+	{
+		return Enum.TryParse(str, ignoreCase, out value);
+	}
+
+	//
+	// https://stackoverflow.com/a/9276348
+	//
+
+	/// <summary>
+	/// Retrieves an attribute of type TAttribute from the enum field value.
+	/// </summary>
+	/// <typeparam name="TAttribute">The type of attribute to retrieve.</typeparam>
+	/// <param name="enumVal">The enum value.</param>
+	/// <returns>The attribute instance if found; otherwise, <c>null</c>.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when enumVal is null.</exception>
+	public static TAttribute GetAttributeOfType<TAttribute>(this object enumVal)
+		where TAttribute : Attribute
+	{
+		if (enumVal is null)
+			throw new ArgumentNullException(nameof(enumVal));
+
+		var memInfo = enumVal.GetType().GetMember(enumVal.ToString());
+		return memInfo[0].GetAttribute<TAttribute>(false);
+	}
+
+	/// <summary>
+	/// Determines whether the enum value is marked as browsable.
+	/// </summary>
+	/// <param name="enumVal">The enum value.</param>
+	/// <returns><c>true</c> if the enum value is browsable; otherwise, <c>false</c>.</returns>
+	public static bool IsEnumBrowsable(this object enumVal)
+		=> enumVal.GetAttributeOfType<BrowsableAttribute>()?.Browsable ?? true;
+
+	/// <summary>
+	/// Excludes non-browsable enum values from the collection.
+	/// </summary>
+	/// <typeparam name="T">The enum type.</typeparam>
+	/// <param name="values">The collection of enum values.</param>
+	/// <returns>An enumerable of browsable enum values.</returns>
+	public static IEnumerable<T> ExcludeNonBrowsable<T>(this IEnumerable<T> values)
+		=> values.Where(v => v.IsEnumBrowsable());
 }
\ No newline at end of file
diff --git a/Common/Equatable.cs b/Common/Equatable.cs
index 5be33d35..9393c0f0 100644
--- a/Common/Equatable.cs
+++ b/Common/Equatable.cs
@@ -1,154 +1,153 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+using System;
+
+/// <summary>
+/// Provides a base implementation for objects that support equality, comparison, and cloning.
+/// </summary>
+/// <typeparam name="T">The type of the derived class.</typeparam>
+[Serializable]
+public abstract class Equatable<T> : Cloneable<T>, IEquatable<T>, IComparable<T>, IComparable
+	where T : class
 {
-	using System;
+	/// <summary>
+	/// Determines whether two Equatable objects are not equal.
+	/// </summary>
+	/// <param name="left">The left Equatable object.</param>
+	/// <param name="right">The right object of type T.</param>
+	/// <returns>true if the objects are not equal; otherwise, false.</returns>
+	public static bool operator !=(Equatable<T> left, T right)
+	{
+		return !(left == right);
+	}
+
+	/// <summary>
+	/// Determines whether two Equatable objects are not equal.
+	/// </summary>
+	/// <param name="left">The left Equatable object.</param>
+	/// <param name="right">The right Equatable object.</param>
+	/// <returns>true if the objects are not equal; otherwise, false.</returns>
+	public static bool operator !=(Equatable<T> left, Equatable<T> right)
+	{
+		return !(left == right);
+	}
+
+	/// <summary>
+	/// Determines whether an Equatable object and an object of type T are equal.
+	/// </summary>
+	/// <param name="left">The Equatable object.</param>
+	/// <param name="right">The object of type T.</param>
+	/// <returns>true if the objects are equal; otherwise, false.</returns>
+	public static bool operator ==(Equatable<T> left, T right)
+	{
+		if (ReferenceEquals(left, right))
+			return true;
+
+		return left is null ? right is null : left.Equals(right);
+	}
+
+	/// <summary>
+	/// Determines whether two Equatable objects are equal.
+	/// </summary>
+	/// <param name="left">The left Equatable object.</param>
+	/// <param name="right">The right Equatable object.</param>
+	/// <returns>true if the objects are equal; otherwise, false.</returns>
+	public static bool operator ==(Equatable<T> left, Equatable<T> right)
+	{
+		if (ReferenceEquals(left, right))
+			return true;
+
+		return left is null ? right is null : left.Equals(right as T);
+	}
+
+	#region IEquatable<T> Members
+
+	/// <summary>
+	/// Indicates whether the current object is equal to another object of the same type.
+	/// </summary>
+	/// <param name="other">An object to compare with this object.</param>
+	/// <returns>true if the current object is equal to the other parameter; otherwise, false.</returns>
+	public virtual bool Equals(T other)
+	{
+		if (other is null)
+			return false;
+		
+		if (ReferenceEquals(other, this))
+			return true;
+
+		if (GetType() == other.GetType())
+			return OnEquals(other);
+		else
+			return false;
+	}
+
+	#endregion
+
+	#region IComparable<T> Members
+
+	/// <summary>
+	/// Compares the current object with another object of the same type.
+	/// </summary>
+	/// <param name="value">An object to compare with this object.</param>
+	/// <returns>
+	/// 0 if equal; -1 if not equal.
+	/// </returns>
+	public virtual int CompareTo(T value)
+	{
+		return Equals(value) ? 0 : -1;
+	}
+
+	#endregion
+
+	#region IComparable Members
+
+	/// <summary>
+	/// Compares the current object with another object.
+	/// </summary>
+	/// <param name="value">An object to compare with this object.</param>
+	/// <returns>
+	/// 0 if equal; -1 if not equal.
+	/// </returns>
+	public int CompareTo(object value)
+	{
+		return CompareTo((T)value);
+	}
+
+	#endregion
+
+	#region Object Members
+
+	/// <summary>
+	/// Determines whether the specified object is equal to the current object.
+	/// </summary>
+	/// <param name="obj">The object to compare with this object.</param>
+	/// <returns>true if the specified object is equal to the current object; otherwise, false.</returns>
+	public override bool Equals(object obj)
+	{
+		if (obj is T t)
+			return Equals(t);
+		else
+			return false;
+	}
+
+	/// <summary>
+	/// Serves as the default hash function.
+	/// </summary>
+	/// <returns>A hash code for the current object.</returns>
+	public override int GetHashCode()
+	{
+		return base.GetHashCode();
+	}
+
+	#endregion
 
 	/// <summary>
-	/// Provides a base implementation for objects that support equality, comparison, and cloning.
+	/// Determines equality between this instance and another instance of the same type.
 	/// </summary>
-	/// <typeparam name="T">The type of the derived class.</typeparam>
-	[Serializable]
-	public abstract class Equatable<T> : Cloneable<T>, IEquatable<T>, IComparable<T>, IComparable
-		where T : class
+	/// <param name="other">An object to compare with this instance.</param>
+	/// <returns>true if the objects are equal; otherwise, false.</returns>
+	protected virtual bool OnEquals(T other)
 	{
-		/// <summary>
-		/// Determines whether two Equatable objects are not equal.
-		/// </summary>
-		/// <param name="left">The left Equatable object.</param>
-		/// <param name="right">The right object of type T.</param>
-		/// <returns>true if the objects are not equal; otherwise, false.</returns>
-		public static bool operator !=(Equatable<T> left, T right)
-		{
-			return !(left == right);
-		}
-
-		/// <summary>
-		/// Determines whether two Equatable objects are not equal.
-		/// </summary>
-		/// <param name="left">The left Equatable object.</param>
-		/// <param name="right">The right Equatable object.</param>
-		/// <returns>true if the objects are not equal; otherwise, false.</returns>
-		public static bool operator !=(Equatable<T> left, Equatable<T> right)
-		{
-			return !(left == right);
-		}
-
-		/// <summary>
-		/// Determines whether an Equatable object and an object of type T are equal.
-		/// </summary>
-		/// <param name="left">The Equatable object.</param>
-		/// <param name="right">The object of type T.</param>
-		/// <returns>true if the objects are equal; otherwise, false.</returns>
-		public static bool operator ==(Equatable<T> left, T right)
-		{
-			if (ReferenceEquals(left, right))
-				return true;
-
-			return left is null ? right is null : left.Equals(right);
-		}
-
-		/// <summary>
-		/// Determines whether two Equatable objects are equal.
-		/// </summary>
-		/// <param name="left">The left Equatable object.</param>
-		/// <param name="right">The right Equatable object.</param>
-		/// <returns>true if the objects are equal; otherwise, false.</returns>
-		public static bool operator ==(Equatable<T> left, Equatable<T> right)
-		{
-			if (ReferenceEquals(left, right))
-				return true;
-
-			return left is null ? right is null : left.Equals(right as T);
-		}
-
-		#region IEquatable<T> Members
-
-		/// <summary>
-		/// Indicates whether the current object is equal to another object of the same type.
-		/// </summary>
-		/// <param name="other">An object to compare with this object.</param>
-		/// <returns>true if the current object is equal to the other parameter; otherwise, false.</returns>
-		public virtual bool Equals(T other)
-		{
-			if (other is null)
-				return false;
-			
-			if (ReferenceEquals(other, this))
-				return true;
-
-			if (GetType() == other.GetType())
-				return OnEquals(other);
-			else
-				return false;
-		}
-
-		#endregion
-
-		#region IComparable<T> Members
-
-		/// <summary>
-		/// Compares the current object with another object of the same type.
-		/// </summary>
-		/// <param name="value">An object to compare with this object.</param>
-		/// <returns>
-		/// 0 if equal; -1 if not equal.
-		/// </returns>
-		public virtual int CompareTo(T value)
-		{
-			return Equals(value) ? 0 : -1;
-		}
-
-		#endregion
-
-		#region IComparable Members
-
-		/// <summary>
-		/// Compares the current object with another object.
-		/// </summary>
-		/// <param name="value">An object to compare with this object.</param>
-		/// <returns>
-		/// 0 if equal; -1 if not equal.
-		/// </returns>
-		public int CompareTo(object value)
-		{
-			return CompareTo((T)value);
-		}
-
-		#endregion
-
-		#region Object Members
-
-		/// <summary>
-		/// Determines whether the specified object is equal to the current object.
-		/// </summary>
-		/// <param name="obj">The object to compare with this object.</param>
-		/// <returns>true if the specified object is equal to the current object; otherwise, false.</returns>
-		public override bool Equals(object obj)
-		{
-			if (obj is T t)
-				return Equals(t);
-			else
-				return false;
-		}
-
-		/// <summary>
-		/// Serves as the default hash function.
-		/// </summary>
-		/// <returns>A hash code for the current object.</returns>
-		public override int GetHashCode()
-		{
-			return base.GetHashCode();
-		}
-
-		#endregion
-
-		/// <summary>
-		/// Determines equality between this instance and another instance of the same type.
-		/// </summary>
-		/// <param name="other">An object to compare with this instance.</param>
-		/// <returns>true if the objects are equal; otherwise, false.</returns>
-		protected virtual bool OnEquals(T other)
-		{
-			return ReferenceEquals(this, other);
-		}
+		return ReferenceEquals(this, other);
 	}
 }
\ No newline at end of file
diff --git a/Common/FastActivator.cs b/Common/FastActivator.cs
index 2858768d..5422594f 100644
--- a/Common/FastActivator.cs
+++ b/Common/FastActivator.cs
@@ -1,78 +1,77 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+
+/// <summary>
+/// <see cref="FastActivator{T}"/> isn't supported.
+/// </summary>
+public class FastEmitNotSupported
 {
-	using System;
-	using System.Reflection;
-	using System.Reflection.Emit;
+}
 
+/// <summary>
+/// Fast alternative to Activator.CreateInstance&lt;T> for reference types with default constructor
+/// </summary>
+/// <remarks>
+/// Измененная версия FastObjectFactory2&lt;T> отсюда:
+/// http://stackoverflow.com/questions/2024435/how-to-pass-ctor-args-in-activator-createinstance-or-use-il
+/// </remarks>
+public static class FastActivator<T>
+	// чтобы можно было создавать классы с закрытым конструктором
+	//where T :new()
+{
 	/// <summary>
-	/// <see cref="FastActivator{T}"/> isn't supported.
+	/// Not supported mode.
 	/// </summary>
-	public class FastEmitNotSupported
-	{
-	}
+	public static bool NotSupported { get; set; }
 
 	/// <summary>
-	/// Fast alternative to Activator.CreateInstance&lt;T> for reference types with default constructor
+	/// Create object handler.
 	/// </summary>
-	/// <remarks>
-	/// Измененная версия FastObjectFactory2&lt;T> отсюда:
-	/// http://stackoverflow.com/questions/2024435/how-to-pass-ctor-args-in-activator-createinstance-or-use-il
-	/// </remarks>
-	public static class FastActivator<T>
-		// чтобы можно было создавать классы с закрытым конструктором
-		//where T :new()
-	{
-		/// <summary>
-		/// Not supported mode.
-		/// </summary>
-		public static bool NotSupported { get; set; }
+	public static Func<T> CreateObject { get; }
 
-		/// <summary>
-		/// Create object handler.
-		/// </summary>
-		public static Func<T> CreateObject { get; }
+	static FastActivator()
+	{
+		var objType = typeof(T);
+		var cinfo = objType.GetConstructor(BindingFlags.Public | BindingFlags.Instance | BindingFlags.NonPublic, null, Type.EmptyTypes, null);
 
-		static FastActivator()
+		if ((NotSupported || Scope<FastEmitNotSupported>.Current != null) || objType.IsValueType || cinfo is null)
 		{
-			var objType = typeof(T);
-			var cinfo = objType.GetConstructor(BindingFlags.Public | BindingFlags.Instance | BindingFlags.NonPublic, null, Type.EmptyTypes, null);
+			CreateObject = Activator.CreateInstance<T>;
+		}
+		else
+		{
+			DynamicMethod dynMethod;
 
-			if ((NotSupported || Scope<FastEmitNotSupported>.Current != null) || objType.IsValueType || cinfo is null)
+			try
 			{
-				CreateObject = Activator.CreateInstance<T>;
+				dynMethod = new DynamicMethod("DM$OBJ_FACTORY_" + objType.Name, objType, null, typeof(T), true);
 			}
-			else
+			catch (PlatformNotSupportedException)
 			{
-				DynamicMethod dynMethod;
-
-				try
-				{
-					dynMethod = new DynamicMethod("DM$OBJ_FACTORY_" + objType.Name, objType, null, typeof(T), true);
-				}
-				catch (PlatformNotSupportedException)
-				{
-					NotSupported = true;
-					CreateObject = Activator.CreateInstance<T>;
-					return;
-				}
+				NotSupported = true;
+				CreateObject = Activator.CreateInstance<T>;
+				return;
+			}
 
-				ILGenerator ilGen = dynMethod.GetILGenerator();
-				ilGen.Emit(OpCodes.Newobj, cinfo);
-				ilGen.Emit(OpCodes.Ret);
-				CreateObject = (Func<T>)dynMethod.CreateDelegate(typeof(Func<T>));
+			ILGenerator ilGen = dynMethod.GetILGenerator();
+			ilGen.Emit(OpCodes.Newobj, cinfo);
+			ilGen.Emit(OpCodes.Ret);
+			CreateObject = (Func<T>)dynMethod.CreateDelegate(typeof(Func<T>));
 
-				// mika
-				// если будет Disposable объект, то проверочный запуск приведет к подвисшему в памяти объекту с неуправляемыми ресурсами
-				//
-				//try
-				//{
-				//    CreateObject();
-				//}
-				//catch
-				//{
-				//    CreateObject = () => new T();
-				//}
-			}
+			// mika
+			// если будет Disposable объект, то проверочный запуск приведет к подвисшему в памяти объекту с неуправляемыми ресурсами
+			//
+			//try
+			//{
+			//    CreateObject();
+			//}
+			//catch
+			//{
+			//    CreateObject = () => new T();
+			//}
 		}
 	}
 }
diff --git a/Common/FastCsvReader.cs b/Common/FastCsvReader.cs
index 946b571d..304046a4 100644
--- a/Common/FastCsvReader.cs
+++ b/Common/FastCsvReader.cs
@@ -1,607 +1,606 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+using System;
+using System.IO;
+using System.Numerics;
+using System.Text;
+
+/// <summary>
+/// Provides fast CSV reading capabilities from various input sources.
+/// </summary>
+public class FastCsvReader
 {
-	using System;
-	using System.IO;
-	using System.Numerics;
-	using System.Text;
+	private static readonly Func<string, bool> _toBool = Converter.GetTypedConverter<string, bool>();
+	private static readonly Func<string, double> _toDouble = Converter.GetTypedConverter<string, double>();
+
+	private const int _buffSize = FileSizes.MB;
+	private readonly char[] _buffer = new char[_buffSize];
+	private int _bufferLen;
+	private int _bufferPos;
+	private char[] _line = new char[_buffSize];
+	private int _lineLen;
+	private RefPair<int, int>[] _columnPos = new RefPair<int, int>[_buffSize];
+	private readonly char[] _lineSeparatorChars;
+
+	private int _lineSeparatorCharPos;
 
 	/// <summary>
-	/// Provides fast CSV reading capabilities from various input sources.
+	/// Initializes a new instance of the <see cref="FastCsvReader"/> class using a stream, encoding, and line separator.
 	/// </summary>
-	public class FastCsvReader
+	/// <param name="stream">The input stream to read CSV data from.</param>
+	/// <param name="encoding">The character encoding to use.</param>
+	/// <param name="lineSeparator">The string that separates lines.</param>
+	public FastCsvReader(Stream stream, Encoding encoding, string lineSeparator)
+		: this(new StreamReader(stream, encoding), lineSeparator)
 	{
-		private static readonly Func<string, bool> _toBool = Converter.GetTypedConverter<string, bool>();
-		private static readonly Func<string, double> _toDouble = Converter.GetTypedConverter<string, double>();
-
-		private const int _buffSize = FileSizes.MB;
-		private readonly char[] _buffer = new char[_buffSize];
-		private int _bufferLen;
-		private int _bufferPos;
-		private char[] _line = new char[_buffSize];
-		private int _lineLen;
-		private RefPair<int, int>[] _columnPos = new RefPair<int, int>[_buffSize];
-		private readonly char[] _lineSeparatorChars;
-
-		private int _lineSeparatorCharPos;
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="FastCsvReader"/> class using a stream, encoding, and line separator.
-		/// </summary>
-		/// <param name="stream">The input stream to read CSV data from.</param>
-		/// <param name="encoding">The character encoding to use.</param>
-		/// <param name="lineSeparator">The string that separates lines.</param>
-		public FastCsvReader(Stream stream, Encoding encoding, string lineSeparator)
-			: this(new StreamReader(stream, encoding), lineSeparator)
-		{
-		}
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="FastCsvReader"/> class using a string content and line separator.
-		/// </summary>
-		/// <param name="content">The string content to read CSV data from.</param>
-		/// <param name="lineSeparator">The string that separates lines.</param>
-		public FastCsvReader(string content, string lineSeparator)
-			: this(new StringReader(content), lineSeparator)
-		{
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="FastCsvReader"/> class using a string content and line separator.
+	/// </summary>
+	/// <param name="content">The string content to read CSV data from.</param>
+	/// <param name="lineSeparator">The string that separates lines.</param>
+	public FastCsvReader(string content, string lineSeparator)
+		: this(new StringReader(content), lineSeparator)
+	{
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="FastCsvReader"/> class using a TextReader and line separator.
-		/// </summary>
-		/// <param name="reader">The TextReader to read CSV data from.</param>
-		/// <param name="lineSeparator">The string that separates lines.</param>
-		public FastCsvReader(TextReader reader, string lineSeparator)
-		{
-			if (lineSeparator.IsEmpty())
-				throw new ArgumentNullException(nameof(lineSeparator));
+	/// <summary>
+	/// Initializes a new instance of the <see cref="FastCsvReader"/> class using a TextReader and line separator.
+	/// </summary>
+	/// <param name="reader">The TextReader to read CSV data from.</param>
+	/// <param name="lineSeparator">The string that separates lines.</param>
+	public FastCsvReader(TextReader reader, string lineSeparator)
+	{
+		if (lineSeparator.IsEmpty())
+			throw new ArgumentNullException(nameof(lineSeparator));
 
-			Reader = reader ?? throw new ArgumentNullException(nameof(reader));
-			_lineSeparatorChars = [.. lineSeparator];
+		Reader = reader ?? throw new ArgumentNullException(nameof(reader));
+		_lineSeparatorChars = [.. lineSeparator];
 
-			for (var i = 0; i < _columnPos.Length; i++)
-				_columnPos[i] = new RefPair<int, int>();
-		}
+		for (var i = 0; i < _columnPos.Length; i++)
+			_columnPos[i] = new RefPair<int, int>();
+	}
 
-		/// <summary>
-		/// Gets the underlying text reader.
-		/// </summary>
-		public TextReader Reader { get; }
+	/// <summary>
+	/// Gets the underlying text reader.
+	/// </summary>
+	public TextReader Reader { get; }
 
-		/// <summary>
-		/// Gets or sets the character used to separate columns.
-		/// </summary>
-		public char ColumnSeparator { get; set; } = ';';
+	/// <summary>
+	/// Gets or sets the character used to separate columns.
+	/// </summary>
+	public char ColumnSeparator { get; set; } = ';';
 
-		/// <summary>
-		/// Gets the current CSV line as a string.
-		/// </summary>
-		public string CurrentLine
+	/// <summary>
+	/// Gets the current CSV line as a string.
+	/// </summary>
+	public string CurrentLine
+	{
+		get
 		{
-			get
-			{
-				if (_lineLen == 0)
-					return null;
+			if (_lineLen == 0)
+				return null;
 
-				return new string(_line, 0, _lineLen);
-			}
+			return new string(_line, 0, _lineLen);
 		}
+	}
 
-		private int _columnCount;
+	private int _columnCount;
 
-		/// <summary>
-		/// Gets the number of columns in the current CSV line.
-		/// </summary>
-		public int ColumnCount => _columnCount;
+	/// <summary>
+	/// Gets the number of columns in the current CSV line.
+	/// </summary>
+	public int ColumnCount => _columnCount;
+
+	private int _columnCurr;
 
-		private int _columnCurr;
+	/// <summary>
+	/// Gets the current column index being processed.
+	/// </summary>
+	public int ColumnCurr => _columnCurr;
 
-		/// <summary>
-		/// Gets the current column index being processed.
-		/// </summary>
-		public int ColumnCurr => _columnCurr;
+	private RefPair<int, int> GetColumnPos()
+	{
+		var prevLen = _columnPos.Length;
 
-		private RefPair<int, int> GetColumnPos()
+		if (prevLen <= _columnCount)
 		{
-			var prevLen = _columnPos.Length;
+			Array.Resize(ref _columnPos, prevLen + _buffSize);
 
-			if (prevLen <= _columnCount)
+			for (var i = prevLen; i < prevLen + _buffSize; i++)
 			{
-				Array.Resize(ref _columnPos, prevLen + _buffSize);
-
-				for (var i = prevLen; i < prevLen + _buffSize; i++)
-				{
-					_columnPos[i] = new RefPair<int, int>();
-				}
+				_columnPos[i] = new RefPair<int, int>();
 			}
-
-			return _columnPos[_columnCount];
 		}
 
-		/// <summary>
-		/// Reads the next CSV line from the underlying stream or reader.
-		/// </summary>
-		/// <returns><c>true</c> if a new line was successfully read; otherwise, <c>false</c>.</returns>
-		public bool NextLine()
-		{
-			_lineLen = 0;
-			_columnCount = 0;
-			_columnCurr = -1;
-
-			var inQuote = false;
-			var columnStart = 0;
+		return _columnPos[_columnCount];
+	}
 
-			while (true)
-			{
-				if (_bufferPos >= _bufferLen)
-				{
-					_bufferPos = 0;
-					_bufferLen = 0;
+	/// <summary>
+	/// Reads the next CSV line from the underlying stream or reader.
+	/// </summary>
+	/// <returns><c>true</c> if a new line was successfully read; otherwise, <c>false</c>.</returns>
+	public bool NextLine()
+	{
+		_lineLen = 0;
+		_columnCount = 0;
+		_columnCurr = -1;
 
-					var left = _buffer.Length;
+		var inQuote = false;
+		var columnStart = 0;
 
-					while (left > 0)
-					{
-						var read = Reader.ReadBlock(_buffer, 0, _buffer.Length);
+		while (true)
+		{
+			if (_bufferPos >= _bufferLen)
+			{
+				_bufferPos = 0;
+				_bufferLen = 0;
 
-						if (read == 0)
-							break;
+				var left = _buffer.Length;
 
-						left -= read;
-						_bufferLen += read;
-					}
+				while (left > 0)
+				{
+					var read = Reader.ReadBlock(_buffer, 0, _buffer.Length);
 
-					if (_bufferLen == 0)
+					if (read == 0)
 						break;
+
+					left -= read;
+					_bufferLen += read;
 				}
 
-				var c = _buffer[_bufferPos++];
+				if (_bufferLen == 0)
+					break;
+			}
 
-				if (!inQuote)
-				{
-					if (c == _lineSeparatorChars[_lineSeparatorCharPos])
-					{
-						_lineSeparatorCharPos++;
+			var c = _buffer[_bufferPos++];
 
-						if (_lineSeparatorCharPos == _lineSeparatorChars.Length)
-						{
-							_lineSeparatorCharPos = 0;
-							break;
-						}
+			if (!inQuote)
+			{
+				if (c == _lineSeparatorChars[_lineSeparatorCharPos])
+				{
+					_lineSeparatorCharPos++;
 
-						continue;
-					}
-					else if (_lineSeparatorCharPos > 0)
+					if (_lineSeparatorCharPos == _lineSeparatorChars.Length)
 					{
-						if ((_lineLen + _lineSeparatorCharPos) >= _line.Length)
-							Array.Resize(ref _line, _line.Length + _buffSize);
-
-						Array.Copy(_lineSeparatorChars, 0, _line, _lineLen, _lineSeparatorCharPos);
-
-						_lineLen += _lineSeparatorCharPos;
 						_lineSeparatorCharPos = 0;
+						break;
 					}
 
-					if (c == ColumnSeparator)
-					{
-						if (columnStart > _lineLen)
-							throw new InvalidOperationException();
-
-						var pair = GetColumnPos();
-
-						pair.First = columnStart;
-						pair.Second = _lineLen;
+					continue;
+				}
+				else if (_lineSeparatorCharPos > 0)
+				{
+					if ((_lineLen + _lineSeparatorCharPos) >= _line.Length)
+						Array.Resize(ref _line, _line.Length + _buffSize);
 
-						columnStart = _lineLen + 1;
+					Array.Copy(_lineSeparatorChars, 0, _line, _lineLen, _lineSeparatorCharPos);
 
-						_columnCount++;
-					}
+					_lineLen += _lineSeparatorCharPos;
+					_lineSeparatorCharPos = 0;
 				}
 
-				if (c == '"')
+				if (c == ColumnSeparator)
 				{
-					inQuote = !inQuote;
-
-					if (inQuote && _bufferPos > 1 && _buffer[_bufferPos - 2] == '"')
-					{
-						if (_lineLen >= _line.Length)
-							Array.Resize(ref _line, _line.Length + _buffSize);
+					if (columnStart > _lineLen)
+						throw new InvalidOperationException();
 
-						_line[_lineLen++] = c;
-					}
+					var pair = GetColumnPos();
 
-					//if (inQuote)
-					continue;
-					//else
-					//	break;
-				}
+					pair.First = columnStart;
+					pair.Second = _lineLen;
 
-				if (_lineLen >= _line.Length)
-					Array.Resize(ref _line, _line.Length + _buffSize);
+					columnStart = _lineLen + 1;
 
-				_line[_lineLen++] = c;
+					_columnCount++;
+				}
 			}
 
-			if (_columnCount > 0)
+			if (c == '"')
 			{
-				var pair = GetColumnPos();
+				inQuote = !inQuote;
 
-				pair.First = columnStart;
-				pair.Second = _lineLen;
+				if (inQuote && _bufferPos > 1 && _buffer[_bufferPos - 2] == '"')
+				{
+					if (_lineLen >= _line.Length)
+						Array.Resize(ref _line, _line.Length + _buffSize);
+
+					_line[_lineLen++] = c;
+				}
 
-				_columnCount++;
+				//if (inQuote)
+				continue;
+				//else
+				//	break;
 			}
 
-			return _lineLen > 0;
+			if (_lineLen >= _line.Length)
+				Array.Resize(ref _line, _line.Length + _buffSize);
+
+			_line[_lineLen++] = c;
 		}
 
-		/// <summary>
-		/// Skips the specified number of columns.
-		/// </summary>
-		/// <param name="count">The number of columns to skip. Defaults to 1.</param>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown if the count is less than or equal to 0.</exception>
-		/// <exception cref="ArgumentException">Thrown if skipping the specified columns would exceed the number of columns available in the current line.</exception>
-		public void Skip(int count = 1)
+		if (_columnCount > 0)
 		{
-			if (count <= 0)
-				throw new ArgumentOutOfRangeException(nameof(count));
+			var pair = GetColumnPos();
 
-			if ((_columnCurr + count) >= _columnCount)
-				throw new ArgumentException(nameof(count));
+			pair.First = columnStart;
+			pair.Second = _lineLen;
 
-			_columnCurr += count;
+			_columnCount++;
 		}
 
-		/// <summary>
-		/// Reads the next column as a boolean value.
-		/// </summary>
-		/// <returns>The boolean value read from the column.</returns>
-		public bool ReadBool()
-		{
-			return ReadNullableBool().Value;
-		}
+		return _lineLen > 0;
+	}
 
-		/// <summary>
-		/// Reads the next column as a nullable boolean value.
-		/// </summary>
-		/// <returns>A nullable boolean value read from the column, or null if the column is empty.</returns>
-		public bool? ReadNullableBool()
-		{
-			var str = ReadString();
+	/// <summary>
+	/// Skips the specified number of columns.
+	/// </summary>
+	/// <param name="count">The number of columns to skip. Defaults to 1.</param>
+	/// <exception cref="ArgumentOutOfRangeException">Thrown if the count is less than or equal to 0.</exception>
+	/// <exception cref="ArgumentException">Thrown if skipping the specified columns would exceed the number of columns available in the current line.</exception>
+	public void Skip(int count = 1)
+	{
+		if (count <= 0)
+			throw new ArgumentOutOfRangeException(nameof(count));
 
-			if (str is null)
-				return null;
+		if ((_columnCurr + count) >= _columnCount)
+			throw new ArgumentException(nameof(count));
 
-			return _toBool(str);
-		}
+		_columnCurr += count;
+	}
 
-		/// <summary>
-		/// Reads the next column as an enum value of type <typeparamref name="T"/>.
-		/// </summary>
-		/// <typeparam name="T">The enum type to convert to.</typeparam>
-		/// <returns>The enum value read from the column.</returns>
-		public T ReadEnum<T>()
-			where T : struct
-		{
-			return ReadNullableEnum<T>().Value;
-		}
+	/// <summary>
+	/// Reads the next column as a boolean value.
+	/// </summary>
+	/// <returns>The boolean value read from the column.</returns>
+	public bool ReadBool()
+	{
+		return ReadNullableBool().Value;
+	}
 
-		/// <summary>
-		/// Reads the next column as a nullable enum value of type <typeparamref name="T"/>.
-		/// </summary>
-		/// <typeparam name="T">The enum type to convert to.</typeparam>
-		/// <returns>A nullable enum value read from the column, or null if the column is empty.</returns>
-		public T? ReadNullableEnum<T>()
-			where T : struct
-		{
-			var str = ReadString();
+	/// <summary>
+	/// Reads the next column as a nullable boolean value.
+	/// </summary>
+	/// <returns>A nullable boolean value read from the column, or null if the column is empty.</returns>
+	public bool? ReadNullableBool()
+	{
+		var str = ReadString();
 
-			if (str.IsEmpty())
-				return null;
+		if (str is null)
+			return null;
 
-			if (int.TryParse(str, out var num))
-				return num.To<T>();
+		return _toBool(str);
+	}
 
-			return str.To<T>();
-		}
+	/// <summary>
+	/// Reads the next column as an enum value of type <typeparamref name="T"/>.
+	/// </summary>
+	/// <typeparam name="T">The enum type to convert to.</typeparam>
+	/// <returns>The enum value read from the column.</returns>
+	public T ReadEnum<T>()
+		where T : struct
+	{
+		return ReadNullableEnum<T>().Value;
+	}
 
-		/// <summary>
-		/// Reads the next column as a double value.
-		/// </summary>
-		/// <returns>The double value read from the column.</returns>
-		public double ReadDouble()
-		{
-			return ReadNullableDouble().Value;
-		}
+	/// <summary>
+	/// Reads the next column as a nullable enum value of type <typeparamref name="T"/>.
+	/// </summary>
+	/// <typeparam name="T">The enum type to convert to.</typeparam>
+	/// <returns>A nullable enum value read from the column, or null if the column is empty.</returns>
+	public T? ReadNullableEnum<T>()
+		where T : struct
+	{
+		var str = ReadString();
 
-		/// <summary>
-		/// Reads the next column as a nullable double value.
-		/// </summary>
-		/// <returns>A nullable double value read from the column, or null if the column is empty.</returns>
-		public double? ReadNullableDouble()
-		{
-			var str = ReadString();
+		if (str.IsEmpty())
+			return null;
 
-			if (str is null)
-				return null;
+		if (int.TryParse(str, out var num))
+			return num.To<T>();
 
-			return _toDouble(str);
-		}
+		return str.To<T>();
+	}
 
-		/// <summary>
-		/// Reads the next column as a decimal value.
-		/// </summary>
-		/// <returns>The decimal value read from the column.</returns>
-		public decimal ReadDecimal()
-		{
-			return ReadNullableDecimal().Value;
-		}
+	/// <summary>
+	/// Reads the next column as a double value.
+	/// </summary>
+	/// <returns>The double value read from the column.</returns>
+	public double ReadDouble()
+	{
+		return ReadNullableDouble().Value;
+	}
 
-		/// <summary>
-		/// Reads the next column as a nullable decimal value.
-		/// </summary>
-		/// <returns>A nullable decimal value read from the column, or null if the column is empty.</returns>
-		public decimal? ReadNullableDecimal()
-		{
-			var pair = GetNextColumnPos();
+	/// <summary>
+	/// Reads the next column as a nullable double value.
+	/// </summary>
+	/// <returns>A nullable double value read from the column, or null if the column is empty.</returns>
+	public double? ReadNullableDouble()
+	{
+		var str = ReadString();
 
-			if (pair.First == pair.Second)
-				return null;
+		if (str is null)
+			return null;
 
-			long? intPart = null;
-			BigInteger? intPart2 = null;
-			long? fractalPart = null;
+		return _toDouble(str);
+	}
 
-			var isNegative = false;
+	/// <summary>
+	/// Reads the next column as a decimal value.
+	/// </summary>
+	/// <returns>The decimal value read from the column.</returns>
+	public decimal ReadDecimal()
+	{
+		return ReadNullableDecimal().Value;
+	}
 
-			int i;
+	/// <summary>
+	/// Reads the next column as a nullable decimal value.
+	/// </summary>
+	/// <returns>A nullable decimal value read from the column, or null if the column is empty.</returns>
+	public decimal? ReadNullableDecimal()
+	{
+		var pair = GetNextColumnPos();
 
-			for (i = pair.First; i < pair.Second; i++)
-			{
-				var c = _line[i];
+		if (pair.First == pair.Second)
+			return null;
 
-				if (c == '.')
-					break;
+		long? intPart = null;
+		BigInteger? intPart2 = null;
+		long? fractalPart = null;
 
-				if (c == '+')
-				{
-					if (i != pair.First)
-						throw new InvalidOperationException("+");
+		var isNegative = false;
 
-					continue;
-				}
+		int i;
 
-				if (c == '-')
-				{
-					if (i != pair.First)
-						throw new InvalidOperationException("-");
+		for (i = pair.First; i < pair.Second; i++)
+		{
+			var c = _line[i];
 
-					isNegative = true;
-					continue;
-				}
+			if (c == '.')
+				break;
 
-				if (intPart2 is null)
-				{
-					intPart = (intPart ?? 0) * 10 + (c - '0');
+			if (c == '+')
+			{
+				if (i != pair.First)
+					throw new InvalidOperationException("+");
 
-					if (intPart >= long.MaxValue / 10)
-					{
-						intPart2 = intPart;
-						intPart = null;
-					}
-				}
-				else
-					intPart2 = intPart2.Value * 10 + (c - '0');
+				continue;
 			}
 
-			var canSkipZero = true;
-			var fractalPartSize = 0;
-
-			for (var j = pair.Second - 1; j > i; j--)
+			if (c == '-')
 			{
-				var c = _line[j];
+				if (i != pair.First)
+					throw new InvalidOperationException("-");
 
-				if (c == '.')
-					throw new InvalidOperationException();
-
-				if (c == '0' && canSkipZero)
-					continue;
+				isNegative = true;
+				continue;
+			}
 
-				canSkipZero = false;
-				fractalPartSize++;
+			if (intPart2 is null)
+			{
+				intPart = (intPart ?? 0) * 10 + (c - '0');
 
-				fractalPart = (c - '0') * 10.Pow(fractalPartSize - 1) + (fractalPart ?? 0);
+				if (intPart >= long.MaxValue / 10)
+				{
+					intPart2 = intPart;
+					intPart = null;
+				}
 			}
+			else
+				intPart2 = intPart2.Value * 10 + (c - '0');
+		}
 
-			decimal? retVal = intPart ?? (decimal?)intPart2;
+		var canSkipZero = true;
+		var fractalPartSize = 0;
 
-			if (fractalPart is object)
-			{
-				if (intPart2 is object)
-					retVal = (decimal)intPart2.Value + (decimal)fractalPart.Value / (long)Math.Pow(10, fractalPartSize);
-				else
-					retVal = (intPart ?? 0L) + (decimal)fractalPart.Value / (long)Math.Pow(10, fractalPartSize);
-			}
+		for (var j = pair.Second - 1; j > i; j--)
+		{
+			var c = _line[j];
+
+			if (c == '.')
+				throw new InvalidOperationException();
 
-			if (retVal > 0 && isNegative)
-				retVal = -retVal;
+			if (c == '0' && canSkipZero)
+				continue;
 
-			return retVal;
+			canSkipZero = false;
+			fractalPartSize++;
+
+			fractalPart = (c - '0') * 10.Pow(fractalPartSize - 1) + (fractalPart ?? 0);
 		}
 
-		/// <summary>
-		/// Reads the next column as an integer value.
-		/// </summary>
-		/// <returns>The integer value read from the column.</returns>
-		public int ReadInt()
+		decimal? retVal = intPart ?? (decimal?)intPart2;
+
+		if (fractalPart is object)
 		{
-			return ReadNullableInt().Value;
+			if (intPart2 is object)
+				retVal = (decimal)intPart2.Value + (decimal)fractalPart.Value / (long)Math.Pow(10, fractalPartSize);
+			else
+				retVal = (intPart ?? 0L) + (decimal)fractalPart.Value / (long)Math.Pow(10, fractalPartSize);
 		}
 
-		/// <summary>
-		/// Reads the next column as a nullable integer value.
-		/// </summary>
-		/// <returns>A nullable integer value read from the column, or null if the column is empty.</returns>
-		public int? ReadNullableInt()
-		{
-			var pair = GetNextColumnPos();
+		if (retVal > 0 && isNegative)
+			retVal = -retVal;
 
-			if (pair.First == pair.Second)
-				return null;
+		return retVal;
+	}
 
-			var isNegative = false;
+	/// <summary>
+	/// Reads the next column as an integer value.
+	/// </summary>
+	/// <returns>The integer value read from the column.</returns>
+	public int ReadInt()
+	{
+		return ReadNullableInt().Value;
+	}
 
-			var retVal = 0;
+	/// <summary>
+	/// Reads the next column as a nullable integer value.
+	/// </summary>
+	/// <returns>A nullable integer value read from the column, or null if the column is empty.</returns>
+	public int? ReadNullableInt()
+	{
+		var pair = GetNextColumnPos();
 
-			for (var i = pair.First; i < pair.Second; i++)
-			{
-				var c = _line[i];
+		if (pair.First == pair.Second)
+			return null;
 
-				if (c == '+')
-				{
-					if (i != pair.First)
-						throw new InvalidOperationException("+");
+		var isNegative = false;
 
-					continue;
-				}
+		var retVal = 0;
 
-				if (c == '-')
-				{
-					if (i != pair.First)
-						throw new InvalidOperationException("-");
+		for (var i = pair.First; i < pair.Second; i++)
+		{
+			var c = _line[i];
 
-					isNegative = true;
-					continue;
-				}
+			if (c == '+')
+			{
+				if (i != pair.First)
+					throw new InvalidOperationException("+");
 
-				retVal = retVal * 10 + (c - '0');
+				continue;
 			}
 
-			if (retVal > 0 && isNegative)
-				retVal = -retVal;
+			if (c == '-')
+			{
+				if (i != pair.First)
+					throw new InvalidOperationException("-");
 
-			return retVal;
-		}
+				isNegative = true;
+				continue;
+			}
 
-		/// <summary>
-		/// Reads the next column as a long value.
-		/// </summary>
-		/// <returns>The long value read from the column.</returns>
-		public long ReadLong()
-		{
-			return ReadNullableLong().Value;
+			retVal = retVal * 10 + (c - '0');
 		}
 
-		/// <summary>
-		/// Reads the next column as a nullable long value.
-		/// </summary>
-		/// <returns>A nullable long value read from the column, or null if the column is empty.</returns>
-		public long? ReadNullableLong()
-		{
-			var pair = GetNextColumnPos();
+		if (retVal > 0 && isNegative)
+			retVal = -retVal;
 
-			if (pair.First == pair.Second)
-				return null;
+		return retVal;
+	}
 
-			var isNegative = false;
+	/// <summary>
+	/// Reads the next column as a long value.
+	/// </summary>
+	/// <returns>The long value read from the column.</returns>
+	public long ReadLong()
+	{
+		return ReadNullableLong().Value;
+	}
 
-			var retVal = 0L;
+	/// <summary>
+	/// Reads the next column as a nullable long value.
+	/// </summary>
+	/// <returns>A nullable long value read from the column, or null if the column is empty.</returns>
+	public long? ReadNullableLong()
+	{
+		var pair = GetNextColumnPos();
 
-			for (var i = pair.First; i < pair.Second; i++)
-			{
-				var c = _line[i];
+		if (pair.First == pair.Second)
+			return null;
 
-				if (c == '+')
-				{
-					if (i != pair.First)
-						throw new InvalidOperationException("+");
+		var isNegative = false;
 
-					continue;
-				}
+		var retVal = 0L;
 
-				if (c == '-')
-				{
-					if (i != pair.First)
-						throw new InvalidOperationException("-");
+		for (var i = pair.First; i < pair.Second; i++)
+		{
+			var c = _line[i];
 
-					isNegative = true;
-					continue;
-				}
+			if (c == '+')
+			{
+				if (i != pair.First)
+					throw new InvalidOperationException("+");
 
-				retVal = retVal * 10 + (c - '0');
+				continue;
 			}
 
-			if (retVal > 0 && isNegative)
-				retVal = -retVal;
+			if (c == '-')
+			{
+				if (i != pair.First)
+					throw new InvalidOperationException("-");
+
+				isNegative = true;
+				continue;
+			}
 
-			return retVal;
+			retVal = retVal * 10 + (c - '0');
 		}
 
-		/// <summary>
-		/// Reads the next column as a string.
-		/// </summary>
-		/// <returns>The string read from the column, or null if the column is empty.</returns>
-		public string ReadString()
-		{
-			var pair = GetNextColumnPos();
+		if (retVal > 0 && isNegative)
+			retVal = -retVal;
 
-			var len = pair.Second - pair.First;
+		return retVal;
+	}
 
-			if (len == 0)
-				return null;
+	/// <summary>
+	/// Reads the next column as a string.
+	/// </summary>
+	/// <returns>The string read from the column, or null if the column is empty.</returns>
+	public string ReadString()
+	{
+		var pair = GetNextColumnPos();
 
-			return new string(_line, pair.First, len);
-		}
+		var len = pair.Second - pair.First;
 
-		/// <summary>
-		/// Reads the next column as a DateTime value using the specified format.
-		/// </summary>
-		/// <param name="format">The date and time format string.</param>
-		/// <returns>The DateTime value read from the column.</returns>
-		public DateTime ReadDateTime(string format)
-		{
-			return ReadNullableDateTime(format).Value;
-		}
+		if (len == 0)
+			return null;
 
-		/// <summary>
-		/// Reads the next column as a nullable DateTime value using the specified format.
-		/// </summary>
-		/// <param name="format">The date and time format string.</param>
-		/// <returns>A nullable DateTime value read from the column, or null if the column is empty.</returns>
-		public DateTime? ReadNullableDateTime(string format)
-		{
-			var str = ReadString();
+		return new string(_line, pair.First, len);
+	}
 
-			return str?.ToDateTime(format);
-		}
+	/// <summary>
+	/// Reads the next column as a DateTime value using the specified format.
+	/// </summary>
+	/// <param name="format">The date and time format string.</param>
+	/// <returns>The DateTime value read from the column.</returns>
+	public DateTime ReadDateTime(string format)
+	{
+		return ReadNullableDateTime(format).Value;
+	}
 
-		/// <summary>
-		/// Reads the next column as a TimeSpan value using the specified format.
-		/// </summary>
-		/// <param name="format">The time span format string.</param>
-		/// <returns>The TimeSpan value read from the column.</returns>
-		public TimeSpan ReadTimeSpan(string format)
-		{
-			return ReadNullableTimeSpan(format).Value;
-		}
+	/// <summary>
+	/// Reads the next column as a nullable DateTime value using the specified format.
+	/// </summary>
+	/// <param name="format">The date and time format string.</param>
+	/// <returns>A nullable DateTime value read from the column, or null if the column is empty.</returns>
+	public DateTime? ReadNullableDateTime(string format)
+	{
+		var str = ReadString();
 
-		/// <summary>
-		/// Reads the next column as a nullable TimeSpan value using the specified format.
-		/// </summary>
-		/// <param name="format">The time span format string.</param>
-		/// <returns>A nullable TimeSpan value read from the column, or null if the column is empty.</returns>
-		public TimeSpan? ReadNullableTimeSpan(string format)
-		{
-			var str = ReadString();
+		return str?.ToDateTime(format);
+	}
 
-			return str?.ToTimeSpan(format);
-		}
+	/// <summary>
+	/// Reads the next column as a TimeSpan value using the specified format.
+	/// </summary>
+	/// <param name="format">The time span format string.</param>
+	/// <returns>The TimeSpan value read from the column.</returns>
+	public TimeSpan ReadTimeSpan(string format)
+	{
+		return ReadNullableTimeSpan(format).Value;
+	}
 
-		private RefPair<int, int> GetNextColumnPos()
-		{
-			if (_columnCurr >= _columnCount)
-				throw new InvalidOperationException();
+	/// <summary>
+	/// Reads the next column as a nullable TimeSpan value using the specified format.
+	/// </summary>
+	/// <param name="format">The time span format string.</param>
+	/// <returns>A nullable TimeSpan value read from the column, or null if the column is empty.</returns>
+	public TimeSpan? ReadNullableTimeSpan(string format)
+	{
+		var str = ReadString();
 
-			return _columnPos[++_columnCurr];
-		}
+		return str?.ToTimeSpan(format);
+	}
+
+	private RefPair<int, int> GetNextColumnPos()
+	{
+		if (_columnCurr >= _columnCount)
+			throw new InvalidOperationException();
+
+		return _columnPos[++_columnCurr];
 	}
 }
\ No newline at end of file
diff --git a/Common/FastDateTimeParser.cs b/Common/FastDateTimeParser.cs
index a4bdb3cc..a03b57cf 100644
--- a/Common/FastDateTimeParser.cs
+++ b/Common/FastDateTimeParser.cs
@@ -1,331 +1,330 @@
-namespace Ecng.Common
-{
-	using System;
-	using System.Collections.Generic;
-	using System.Text;
+namespace Ecng.Common;
 
-	/// <summary>
-	/// Provides methods to parse and format date and time strings using a fast custom parser.
-	/// </summary>
-	public class FastDateTimeParser
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+/// <summary>
+/// Provides methods to parse and format date and time strings using a fast custom parser.
+/// </summary>
+public class FastDateTimeParser
+{
+	private enum Parts
 	{
-		private enum Parts
-		{
-			String,
-			Year,
-			Month,
-			Day,
-			Hour,
-			Minute,
-			Second,
-			Mls,
-			Mcs,
-			Nano,
-		}
+		String,
+		Year,
+		Month,
+		Day,
+		Hour,
+		Minute,
+		Second,
+		Mls,
+		Mcs,
+		Nano,
+	}
 
-		private readonly Tuple<Parts, string>[] _parts;
-
-		private readonly int _yearStart;
-		private readonly int _monthStart;
-		private readonly int _dayStart;
-		private readonly int _hourStart;
-		private readonly int _minuteStart;
-		private readonly int _secondStart;
-		private readonly int _milliStart;
-		private readonly int _microStart;
-		private readonly int _nanoStart;
-
-		private readonly int _timeZoneStart;
-
-		private readonly bool _isYearTwoChars;
-		private readonly bool _isMonthTwoChars = true;
-		private readonly bool _isDayTwoChars = true;
-
-		/// <summary>
-		/// Gets the date and time format template used for parsing and formatting.
-		/// </summary>
-		public string Template { get; }
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="FastDateTimeParser"/> class with the specified format template.
-		/// </summary>
-		/// <param name="template">The date and time format template.</param>
-		/// <exception cref="ArgumentNullException">Thrown when the template is null or empty.</exception>
-		public FastDateTimeParser(string template)
-		{
-			if (template.IsEmpty())
-				throw new ArgumentNullException(nameof(template));
+	private readonly Tuple<Parts, string>[] _parts;
 
-			Template = template;
+	private readonly int _yearStart;
+	private readonly int _monthStart;
+	private readonly int _dayStart;
+	private readonly int _hourStart;
+	private readonly int _minuteStart;
+	private readonly int _secondStart;
+	private readonly int _milliStart;
+	private readonly int _microStart;
+	private readonly int _nanoStart;
 
-			_yearStart = template.IndexOf('y');
-			_monthStart = template.IndexOf('M');
-			_dayStart = template.IndexOf('d');
-			_hourStart = template.IndexOf('H');
-			_minuteStart = template.IndexOf('m');
-			_secondStart = template.IndexOf('s');
-			_milliStart = template.IndexOf('f');
-			_timeZoneStart = template.IndexOf('z');
+	private readonly int _timeZoneStart;
 
-			if (_yearStart == -1)
-				_yearStart = template.IndexOf('Y');
+	private readonly bool _isYearTwoChars;
+	private readonly bool _isMonthTwoChars = true;
+	private readonly bool _isDayTwoChars = true;
 
-			if (_dayStart == -1)
-				_dayStart = template.IndexOf('D');
+	/// <summary>
+	/// Gets the date and time format template used for parsing and formatting.
+	/// </summary>
+	public string Template { get; }
 
-			if (_milliStart == -1)
-				_milliStart = template.IndexOf('F');
+	/// <summary>
+	/// Initializes a new instance of the <see cref="FastDateTimeParser"/> class with the specified format template.
+	/// </summary>
+	/// <param name="template">The date and time format template.</param>
+	/// <exception cref="ArgumentNullException">Thrown when the template is null or empty.</exception>
+	public FastDateTimeParser(string template)
+	{
+		if (template.IsEmpty())
+			throw new ArgumentNullException(nameof(template));
 
-			if (_monthStart == -1 && _minuteStart != -1 && _hourStart == -1)
-			{
-				_monthStart = _minuteStart;
-				_minuteStart = -1;
-			}
+		Template = template;
 
-			if (_yearStart != -1)
-				_isYearTwoChars = template.Length < _yearStart + 3 || template[_yearStart + 2] != template[_yearStart];
+		_yearStart = template.IndexOf('y');
+		_monthStart = template.IndexOf('M');
+		_dayStart = template.IndexOf('d');
+		_hourStart = template.IndexOf('H');
+		_minuteStart = template.IndexOf('m');
+		_secondStart = template.IndexOf('s');
+		_milliStart = template.IndexOf('f');
+		_timeZoneStart = template.IndexOf('z');
 
-			if (_monthStart != -1)
-				_isMonthTwoChars = template.Length > _monthStart + 1 && template[_monthStart + 1] == template[_monthStart];
+		if (_yearStart == -1)
+			_yearStart = template.IndexOf('Y');
 
-			if (_dayStart != -1)
-				_isDayTwoChars = template.Length > _dayStart + 1 && template[_dayStart + 1] == template[_dayStart];
+		if (_dayStart == -1)
+			_dayStart = template.IndexOf('D');
 
-			var parts = new SortedList<int, Parts>();
+		if (_milliStart == -1)
+			_milliStart = template.IndexOf('F');
 
-			if (_yearStart != -1)
-				parts.Add(_yearStart, Parts.Year);
+		if (_monthStart == -1 && _minuteStart != -1 && _hourStart == -1)
+		{
+			_monthStart = _minuteStart;
+			_minuteStart = -1;
+		}
 
-			if (_monthStart != -1)
-				parts.Add(_monthStart, Parts.Month);
+		if (_yearStart != -1)
+			_isYearTwoChars = template.Length < _yearStart + 3 || template[_yearStart + 2] != template[_yearStart];
 
-			if (_dayStart != -1)
-				parts.Add(_dayStart, Parts.Day);
+		if (_monthStart != -1)
+			_isMonthTwoChars = template.Length > _monthStart + 1 && template[_monthStart + 1] == template[_monthStart];
 
-			if (_hourStart != -1)
-				parts.Add(_hourStart, Parts.Hour);
+		if (_dayStart != -1)
+			_isDayTwoChars = template.Length > _dayStart + 1 && template[_dayStart + 1] == template[_dayStart];
 
-			if (_minuteStart != -1)
-				parts.Add(_minuteStart, Parts.Minute);
+		var parts = new SortedList<int, Parts>();
 
-			if (_secondStart != -1)
-				parts.Add(_secondStart, Parts.Second);
+		if (_yearStart != -1)
+			parts.Add(_yearStart, Parts.Year);
 
-			_microStart = -1;
-			_nanoStart = -1;
+		if (_monthStart != -1)
+			parts.Add(_monthStart, Parts.Month);
 
-			if (_milliStart != -1)
-			{
-				parts.Add(_milliStart, Parts.Mls);
+		if (_dayStart != -1)
+			parts.Add(_dayStart, Parts.Day);
 
-				var microStart = _milliStart + 3;
+		if (_hourStart != -1)
+			parts.Add(_hourStart, Parts.Hour);
 
-				if (template.Length > (microStart + 1) && (template[microStart] == 'f' || template[microStart] == 'F'))
-				{
-					_microStart = microStart;
-					parts.Add(_microStart, Parts.Mcs);
+		if (_minuteStart != -1)
+			parts.Add(_minuteStart, Parts.Minute);
 
-					var nanoStart = _microStart + 3;
+		if (_secondStart != -1)
+			parts.Add(_secondStart, Parts.Second);
 
-					if (template.Length > (nanoStart + 1) && (template[nanoStart] == 'f' || template[nanoStart] == 'F'))
-					{
-						_nanoStart = nanoStart;
-						parts.Add(_nanoStart, Parts.Nano);
-					}
-				}
-			}
+		_microStart = -1;
+		_nanoStart = -1;
 
-			var parts2 = new List<Tuple<Parts, string>>();
+		if (_milliStart != -1)
+		{
+			parts.Add(_milliStart, Parts.Mls);
 
-			var prevIndex = 0;
+			var microStart = _milliStart + 3;
 
-			foreach (var part in parts)
+			if (template.Length > (microStart + 1) && (template[microStart] == 'f' || template[microStart] == 'F'))
 			{
-				if (prevIndex != part.Key)
-				{
-					var len = part.Key - prevIndex;
-					parts2.Add(Tuple.Create(Parts.String, template.Substring(prevIndex, len)));
-					prevIndex += len;
-				}
+				_microStart = microStart;
+				parts.Add(_microStart, Parts.Mcs);
 
-				parts2.Add(Tuple.Create(part.Value, (string)null));
+				var nanoStart = _microStart + 3;
 
-				prevIndex += part.Value switch
+				if (template.Length > (nanoStart + 1) && (template[nanoStart] == 'f' || template[nanoStart] == 'F'))
 				{
-					Parts.Year => _isYearTwoChars ? 2 : 4,
-					Parts.Month => _isMonthTwoChars ? 2 : 1,
-					Parts.Day => _isDayTwoChars ? 2 : 1,
-					Parts.Mls => 3,
-					Parts.Mcs => 3,
-					Parts.Nano => 3,
-					_ => 2,
-				};
+					_nanoStart = nanoStart;
+					parts.Add(_nanoStart, Parts.Nano);
+				}
 			}
+		}
 
-			_parts = [.. parts2];
+		var parts2 = new List<Tuple<Parts, string>>();
 
-			//TimeHelper.InitBounds(template, 'y', out _yearStart, out _yearLen);
-			//TimeHelper.InitBounds(template, 'M', out _monthStart, out _monthLen);
-			//TimeHelper.InitBounds(template, 'd', out _dayStart, out _dayLen);
-			//TimeHelper.InitBounds(template, 'H', out _hourStart, out _hourLen);
-			//TimeHelper.InitBounds(template, 'm', out _minuteStart, out _minuteLen);
-			//TimeHelper.InitBounds(template, 's', out _secondStart, out _secondLen);
-			//TimeHelper.InitBounds(template, 'f', out _milliStart, out _milliLen);
-		}
+		var prevIndex = 0;
 
-		/// <summary>
-		/// Parses the specified input string into a <see cref="DateTime"/> based on the predefined template.
-		/// </summary>
-		/// <param name="input">The string input representing the date and time.</param>
-		/// <returns>A <see cref="DateTime"/> object parsed from the input string.</returns>
-		/// <exception cref="InvalidCastException">Thrown when the input cannot be parsed into a valid <see cref="DateTime"/>.</exception>
-		public DateTime Parse(string input)
+		foreach (var part in parts)
 		{
-			try
+			if (prevIndex != part.Key)
 			{
-				//fixed (char* stringBuffer = input)
-				//{
-				var years = _yearStart == -1 ? DateTime.Now.Year : (_isYearTwoChars ? ((DateTime.Now.Year / 1000) * 1000 + (input[_yearStart] - '0') * 10 + (input[_yearStart + 1] - '0')) : (input[_yearStart] - '0') * 1000 + (input[_yearStart + 1] - '0') * 100 + (input[_yearStart + 2] - '0') * 10 + (input[_yearStart + 3] - '0'));
-				var months = _monthStart == -1 ? DateTime.Now.Month : (_isMonthTwoChars ? (input[_monthStart] - '0') * 10 + (input[_monthStart + 1] - '0') : input[_monthStart] - '0');
-				var days = _dayStart == -1 ? DateTime.Now.Day : (_isDayTwoChars ? (input[_dayStart] - '0') * 10 + (input[_dayStart + 1] - '0') : input[_dayStart] - '0');
+				var len = part.Key - prevIndex;
+				parts2.Add(Tuple.Create(Parts.String, template.Substring(prevIndex, len)));
+				prevIndex += len;
+			}
 
-				var hours = _hourStart == -1 ? 0 : (input[_hourStart] - '0') * 10 + (input[_hourStart + 1] - '0');
-				var minutes = _minuteStart == -1 ? 0 : (input[_minuteStart] - '0') * 10 + (input[_minuteStart + 1] - '0');
-				var seconds = _secondStart == -1 ? 0 : (input[_secondStart] - '0') * 10 + (input[_secondStart + 1] - '0');
+			parts2.Add(Tuple.Create(part.Value, (string)null));
 
-				var millis = _milliStart == -1 ? 0 : (input[_milliStart] - '0') * 100 + (input[_milliStart + 1] - '0') * 10 + (input[_milliStart + 2] - '0');
-				var micro = _microStart == -1 ? 0 : (input[_microStart] - '0') * 100 + (input[_microStart + 1] - '0') * 10 + (input[_microStart + 2] - '0');
-				var nano = _nanoStart == -1 ? 0 : (input[_nanoStart] - '0') * 100 + (input[_nanoStart + 1] - '0') * 10 + (input[_nanoStart + 2] - '0');
+			prevIndex += part.Value switch
+			{
+				Parts.Year => _isYearTwoChars ? 2 : 4,
+				Parts.Month => _isMonthTwoChars ? 2 : 1,
+				Parts.Day => _isDayTwoChars ? 2 : 1,
+				Parts.Mls => 3,
+				Parts.Mcs => 3,
+				Parts.Nano => 3,
+				_ => 2,
+			};
+		}
 
-				var dt = new DateTime(years, months, days, hours, minutes, seconds, millis);
+		_parts = [.. parts2];
 
-				if (micro > 0)
-				{
-					dt = dt.AddMicroseconds(micro);
+		//TimeHelper.InitBounds(template, 'y', out _yearStart, out _yearLen);
+		//TimeHelper.InitBounds(template, 'M', out _monthStart, out _monthLen);
+		//TimeHelper.InitBounds(template, 'd', out _dayStart, out _dayLen);
+		//TimeHelper.InitBounds(template, 'H', out _hourStart, out _hourLen);
+		//TimeHelper.InitBounds(template, 'm', out _minuteStart, out _minuteLen);
+		//TimeHelper.InitBounds(template, 's', out _secondStart, out _secondLen);
+		//TimeHelper.InitBounds(template, 'f', out _milliStart, out _milliLen);
+	}
 
-					if (nano > 0)
-						dt = dt.AddNanoseconds(nano);
-				}
+	/// <summary>
+	/// Parses the specified input string into a <see cref="DateTime"/> based on the predefined template.
+	/// </summary>
+	/// <param name="input">The string input representing the date and time.</param>
+	/// <returns>A <see cref="DateTime"/> object parsed from the input string.</returns>
+	/// <exception cref="InvalidCastException">Thrown when the input cannot be parsed into a valid <see cref="DateTime"/>.</exception>
+	public DateTime Parse(string input)
+	{
+		try
+		{
+			//fixed (char* stringBuffer = input)
+			//{
+			var years = _yearStart == -1 ? DateTime.Now.Year : (_isYearTwoChars ? ((DateTime.Now.Year / 1000) * 1000 + (input[_yearStart] - '0') * 10 + (input[_yearStart + 1] - '0')) : (input[_yearStart] - '0') * 1000 + (input[_yearStart + 1] - '0') * 100 + (input[_yearStart + 2] - '0') * 10 + (input[_yearStart + 3] - '0'));
+			var months = _monthStart == -1 ? DateTime.Now.Month : (_isMonthTwoChars ? (input[_monthStart] - '0') * 10 + (input[_monthStart + 1] - '0') : input[_monthStart] - '0');
+			var days = _dayStart == -1 ? DateTime.Now.Day : (_isDayTwoChars ? (input[_dayStart] - '0') * 10 + (input[_dayStart + 1] - '0') : input[_dayStart] - '0');
 
-				return dt;
-				//}
-			}
-			catch (Exception ex)
-			{
-				throw new InvalidCastException($"Cannot convert {input} with format {Template} to {typeof(DateTime).Name}.", ex);
-			}
-		}
+			var hours = _hourStart == -1 ? 0 : (input[_hourStart] - '0') * 10 + (input[_hourStart + 1] - '0');
+			var minutes = _minuteStart == -1 ? 0 : (input[_minuteStart] - '0') * 10 + (input[_minuteStart + 1] - '0');
+			var seconds = _secondStart == -1 ? 0 : (input[_secondStart] - '0') * 10 + (input[_secondStart + 1] - '0');
 
-		/// <summary>
-		/// Parses the specified input string into a <see cref="DateTimeOffset"/> based on the predefined template,
-		/// applying the time zone if specified.
-		/// </summary>
-		/// <param name="input">The string input representing the date and time with time zone.</param>
-		/// <returns>A <see cref="DateTimeOffset"/> object parsed from the input string.</returns>
-		public DateTimeOffset ParseDto(string input)
-		{
-			var dt = Parse(input);
+			var millis = _milliStart == -1 ? 0 : (input[_milliStart] - '0') * 100 + (input[_milliStart + 1] - '0') * 10 + (input[_milliStart + 2] - '0');
+			var micro = _microStart == -1 ? 0 : (input[_microStart] - '0') * 100 + (input[_microStart + 1] - '0') * 10 + (input[_microStart + 2] - '0');
+			var nano = _nanoStart == -1 ? 0 : (input[_nanoStart] - '0') * 100 + (input[_nanoStart + 1] - '0') * 10 + (input[_nanoStart + 2] - '0');
 
-			var timeZone = TimeSpan.Zero;
+			var dt = new DateTime(years, months, days, hours, minutes, seconds, millis);
 
-			if (_timeZoneStart != -1)
+			if (micro > 0)
 			{
-				var pos = input[_timeZoneStart] == '+';
-				var hours = (input[_timeZoneStart + 1] - '0') * 10 + (input[_timeZoneStart + 2] - '0');
-				var minutes = (input[_timeZoneStart + 4] - '0') * 10 + (input[_timeZoneStart + 5] - '0');
+				dt = dt.AddMicroseconds(micro);
 
-				timeZone = new TimeSpan(pos ? hours : -hours, minutes, 0);
+				if (nano > 0)
+					dt = dt.AddNanoseconds(nano);
 			}
 
-			return dt.ApplyTimeZone(timeZone);
+			return dt;
+			//}
 		}
-
-		/// <summary>
-		/// Converts the specified <see cref="DateTime"/> to its string representation based on the predefined template.
-		/// </summary>
-		/// <param name="value">The <see cref="DateTime"/> value to format.</param>
-		/// <returns>A string representation of the date and time.</returns>
-		public string ToString(DateTime value)
+		catch (Exception ex)
 		{
-			var builder = new StringBuilder();
+			throw new InvalidCastException($"Cannot convert {input} with format {Template} to {typeof(DateTime).Name}.", ex);
+		}
+	}
 
-			foreach (var part in _parts)
-			{
-				switch (part.Item1)
-				{
-					case Parts.String:
-						builder.Append(part.Item2);
-						break;
-					case Parts.Year:
-						Append(builder, _isYearTwoChars ? value.Year % 100 : value.Year, _isYearTwoChars ? 2 : 4);
-						break;
-					case Parts.Month:
-						Append(builder, value.Month, _isMonthTwoChars ? 2 : 1);
-						break;
-					case Parts.Day:
-						Append(builder, value.Day, _isDayTwoChars ? 2 : 1);
-						break;
-					case Parts.Hour:
-						Append(builder, value.Hour);
-						break;
-					case Parts.Minute:
-						Append(builder, value.Minute);
-						break;
-					case Parts.Second:
-						Append(builder, value.Second);
-						break;
-					case Parts.Mls:
-						Append(builder, value.Millisecond, 3);
-						break;
-					case Parts.Mcs:
-						Append(builder, value.GetMicroseconds(), 3);
-						break;
-					case Parts.Nano:
-						Append(builder, value.GetNanoseconds(), 3);
-						break;
-					default:
-						throw new ArgumentOutOfRangeException();
-				}
-			}
+	/// <summary>
+	/// Parses the specified input string into a <see cref="DateTimeOffset"/> based on the predefined template,
+	/// applying the time zone if specified.
+	/// </summary>
+	/// <param name="input">The string input representing the date and time with time zone.</param>
+	/// <returns>A <see cref="DateTimeOffset"/> object parsed from the input string.</returns>
+	public DateTimeOffset ParseDto(string input)
+	{
+		var dt = Parse(input);
+
+		var timeZone = TimeSpan.Zero;
 
-			return builder.ToString();
+		if (_timeZoneStart != -1)
+		{
+			var pos = input[_timeZoneStart] == '+';
+			var hours = (input[_timeZoneStart + 1] - '0') * 10 + (input[_timeZoneStart + 2] - '0');
+			var minutes = (input[_timeZoneStart + 4] - '0') * 10 + (input[_timeZoneStart + 5] - '0');
+
+			timeZone = new TimeSpan(pos ? hours : -hours, minutes, 0);
 		}
 
-		/// <summary>
-		/// Appends the specified integer value to the <see cref="StringBuilder"/> with a given size.
-		/// </summary>
-		/// <param name="builder">The <see cref="StringBuilder"/> to append to.</param>
-		/// <param name="value">The integer value to append.</param>
-		/// <param name="size">The number of digits to include.</param>
-		private static void Append(StringBuilder builder, int value, int size = 2)
+		return dt.ApplyTimeZone(timeZone);
+	}
+
+	/// <summary>
+	/// Converts the specified <see cref="DateTime"/> to its string representation based on the predefined template.
+	/// </summary>
+	/// <param name="value">The <see cref="DateTime"/> value to format.</param>
+	/// <returns>A string representation of the date and time.</returns>
+	public string ToString(DateTime value)
+	{
+		var builder = new StringBuilder();
+
+		foreach (var part in _parts)
 		{
-			if (size == 1)
+			switch (part.Item1)
 			{
-				builder.Append((char)(value + '0'));
-			}
-			else if (size == 2)
-			{
-				builder.Append((char)(value / 10 + '0'));
-				builder.Append((char)(value % 10 + '0'));
-			}
-			else if (size == 3)
-			{
-				builder.Append((char)(value / 100 + '0'));
-				builder.Append((char)((value - (value / 100) * 100) / 10 + '0'));
-				builder.Append((char)(value % 10 + '0'));
-			}
-			else
-			{
-				builder.Append((char)(value / 1000 + '0'));
-				value -= (value / 1000) * 1000;
-				builder.Append((char)(value / 100 + '0'));
-				value -= (value / 100) * 100;
-				builder.Append((char)(value / 10 + '0'));
-				builder.Append((char)(value % 10 + '0'));
+				case Parts.String:
+					builder.Append(part.Item2);
+					break;
+				case Parts.Year:
+					Append(builder, _isYearTwoChars ? value.Year % 100 : value.Year, _isYearTwoChars ? 2 : 4);
+					break;
+				case Parts.Month:
+					Append(builder, value.Month, _isMonthTwoChars ? 2 : 1);
+					break;
+				case Parts.Day:
+					Append(builder, value.Day, _isDayTwoChars ? 2 : 1);
+					break;
+				case Parts.Hour:
+					Append(builder, value.Hour);
+					break;
+				case Parts.Minute:
+					Append(builder, value.Minute);
+					break;
+				case Parts.Second:
+					Append(builder, value.Second);
+					break;
+				case Parts.Mls:
+					Append(builder, value.Millisecond, 3);
+					break;
+				case Parts.Mcs:
+					Append(builder, value.GetMicroseconds(), 3);
+					break;
+				case Parts.Nano:
+					Append(builder, value.GetNanoseconds(), 3);
+					break;
+				default:
+					throw new ArgumentOutOfRangeException();
 			}
 		}
 
-		/// <inheritdoc />
-		public override string ToString() => Template;
+		return builder.ToString();
+	}
+
+	/// <summary>
+	/// Appends the specified integer value to the <see cref="StringBuilder"/> with a given size.
+	/// </summary>
+	/// <param name="builder">The <see cref="StringBuilder"/> to append to.</param>
+	/// <param name="value">The integer value to append.</param>
+	/// <param name="size">The number of digits to include.</param>
+	private static void Append(StringBuilder builder, int value, int size = 2)
+	{
+		if (size == 1)
+		{
+			builder.Append((char)(value + '0'));
+		}
+		else if (size == 2)
+		{
+			builder.Append((char)(value / 10 + '0'));
+			builder.Append((char)(value % 10 + '0'));
+		}
+		else if (size == 3)
+		{
+			builder.Append((char)(value / 100 + '0'));
+			builder.Append((char)((value - (value / 100) * 100) / 10 + '0'));
+			builder.Append((char)(value % 10 + '0'));
+		}
+		else
+		{
+			builder.Append((char)(value / 1000 + '0'));
+			value -= (value / 1000) * 1000;
+			builder.Append((char)(value / 100 + '0'));
+			value -= (value / 100) * 100;
+			builder.Append((char)(value / 10 + '0'));
+			builder.Append((char)(value % 10 + '0'));
+		}
 	}
+
+	/// <inheritdoc />
+	public override string ToString() => Template;
 }
\ No newline at end of file
diff --git a/Common/FastTimeSpanParser.cs b/Common/FastTimeSpanParser.cs
index 7caa0cdf..72afd070 100644
--- a/Common/FastTimeSpanParser.cs
+++ b/Common/FastTimeSpanParser.cs
@@ -1,246 +1,245 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+/// <summary>
+/// Provides high-performance parsing and formatting of TimeSpan values based on a specified template.
+/// </summary>
+public class FastTimeSpanParser
 {
-	using System;
-	using System.Collections.Generic;
-	using System.Text;
+	private enum Parts
+	{
+		String,
+		Day,
+		Hour,
+		Minute,
+		Second,
+		Mls,
+		Mcs,
+		Nano,
+	}
+
+	private readonly Tuple<Parts, string>[] _parts;
+
+	private readonly int _dayStart;
+	private readonly int _hourStart;
+	private readonly int _minuteStart;
+	private readonly int _secondStart;
+	private readonly int _milliStart;
+	private readonly int _microStart;
+	private readonly int _nanoStart;
 
 	/// <summary>
-	/// Provides high-performance parsing and formatting of TimeSpan values based on a specified template.
+	/// Gets the template string used for parsing and formatting TimeSpan values.
 	/// </summary>
-	public class FastTimeSpanParser
+	public string Template { get; }
+
+	/// <summary>
+	/// Initializes a new instance of the <see cref="FastTimeSpanParser"/> class using the specified template.
+	/// </summary>
+	/// <param name="template">A format template that defines how TimeSpan values are parsed and formatted. Must not be null or empty.</param>
+	/// <exception cref="ArgumentNullException">Thrown when the provided template is null or empty.</exception>
+	public FastTimeSpanParser(string template)
 	{
-		private enum Parts
-		{
-			String,
-			Day,
-			Hour,
-			Minute,
-			Second,
-			Mls,
-			Mcs,
-			Nano,
-		}
+		if (template.IsEmpty())
+			throw new ArgumentNullException(nameof(template));
 
-		private readonly Tuple<Parts, string>[] _parts;
-
-		private readonly int _dayStart;
-		private readonly int _hourStart;
-		private readonly int _minuteStart;
-		private readonly int _secondStart;
-		private readonly int _milliStart;
-		private readonly int _microStart;
-		private readonly int _nanoStart;
-
-		/// <summary>
-		/// Gets the template string used for parsing and formatting TimeSpan values.
-		/// </summary>
-		public string Template { get; }
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="FastTimeSpanParser"/> class using the specified template.
-		/// </summary>
-		/// <param name="template">A format template that defines how TimeSpan values are parsed and formatted. Must not be null or empty.</param>
-		/// <exception cref="ArgumentNullException">Thrown when the provided template is null or empty.</exception>
-		public FastTimeSpanParser(string template)
-		{
-			if (template.IsEmpty())
-				throw new ArgumentNullException(nameof(template));
+		Template = template;
 
-			Template = template;
+		template = template.Remove("\\");
 
-			template = template.Remove("\\");
+		_dayStart = template.IndexOf('d');
+		_hourStart = template.IndexOf('h');
+		_minuteStart = template.IndexOf('m');
+		_secondStart = template.IndexOf('s');
+		_milliStart = template.IndexOf('f');
 
-			_dayStart = template.IndexOf('d');
-			_hourStart = template.IndexOf('h');
-			_minuteStart = template.IndexOf('m');
-			_secondStart = template.IndexOf('s');
-			_milliStart = template.IndexOf('f');
+		if (_dayStart == -1)
+			_dayStart = template.IndexOf('D');
 
-			if (_dayStart == -1)
-				_dayStart = template.IndexOf('D');
+		if (_hourStart == -1)
+			_hourStart = template.IndexOf('H');
 
-			if (_hourStart == -1)
-				_hourStart = template.IndexOf('H');
+		if (_minuteStart == -1)
+			_minuteStart = template.IndexOf('M');
 
-			if (_minuteStart == -1)
-				_minuteStart = template.IndexOf('M');
+		if (_secondStart == -1)
+			_secondStart = template.IndexOf('S');
 
-			if (_secondStart == -1)
-				_secondStart = template.IndexOf('S');
+		if (_milliStart == -1)
+			_milliStart = template.IndexOf('F');
 
-			if (_milliStart == -1)
-				_milliStart = template.IndexOf('F');
+		var parts = new SortedList<int, Parts>();
 
-			var parts = new SortedList<int, Parts>();
+		if (_dayStart != -1)
+			parts.Add(_dayStart, Parts.Day);
 
-			if (_dayStart != -1)
-				parts.Add(_dayStart, Parts.Day);
+		if (_hourStart != -1)
+			parts.Add(_hourStart, Parts.Hour);
 
-			if (_hourStart != -1)
-				parts.Add(_hourStart, Parts.Hour);
+		if (_minuteStart != -1)
+			parts.Add(_minuteStart, Parts.Minute);
 
-			if (_minuteStart != -1)
-				parts.Add(_minuteStart, Parts.Minute);
+		if (_secondStart != -1)
+			parts.Add(_secondStart, Parts.Second);
 
-			if (_secondStart != -1)
-				parts.Add(_secondStart, Parts.Second);
+		_microStart = -1;
+		_nanoStart = -1;
 
-			_microStart = -1;
-			_nanoStart = -1;
+		if (_milliStart != -1)
+		{
+			parts.Add(_milliStart, Parts.Mls);
+
+			var microStart = _milliStart + 3;
 
-			if (_milliStart != -1)
+			if (template.Length > (microStart + 1) && (template[microStart] == 'f' || template[microStart] == 'F'))
 			{
-				parts.Add(_milliStart, Parts.Mls);
+				_microStart = microStart;
+				parts.Add(_microStart, Parts.Mcs);
 
-				var microStart = _milliStart + 3;
+				var nanoStart = _microStart + 3;
 
-				if (template.Length > (microStart + 1) && (template[microStart] == 'f' || template[microStart] == 'F'))
+				if (template.Length > (nanoStart + 1) && (template[nanoStart] == 'f' || template[nanoStart] == 'F'))
 				{
-					_microStart = microStart;
-					parts.Add(_microStart, Parts.Mcs);
-
-					var nanoStart = _microStart + 3;
-
-					if (template.Length > (nanoStart + 1) && (template[nanoStart] == 'f' || template[nanoStart] == 'F'))
-					{
-						_nanoStart = nanoStart;
-						parts.Add(_nanoStart, Parts.Nano);
-					}
+					_nanoStart = nanoStart;
+					parts.Add(_nanoStart, Parts.Nano);
 				}
 			}
+		}
 
-			var parts2 = new List<Tuple<Parts, string>>();
+		var parts2 = new List<Tuple<Parts, string>>();
 
-			var prevIndex = 0;
+		var prevIndex = 0;
 
-			foreach (var part in parts)
+		foreach (var part in parts)
+		{
+			if (prevIndex != part.Key)
 			{
-				if (prevIndex != part.Key)
-				{
-					var len = part.Key - prevIndex;
-					parts2.Add(Tuple.Create(Parts.String, template.Substring(prevIndex, len)));
-					prevIndex += len;
-				}
-
-				parts2.Add(Tuple.Create(part.Value, (string)null));
-
-				prevIndex += part.Value switch
-				{
-					Parts.Mls => 3,
-					Parts.Mcs => 3,
-					Parts.Nano => 3,
-					_ => 2,
-				};
+				var len = part.Key - prevIndex;
+				parts2.Add(Tuple.Create(Parts.String, template.Substring(prevIndex, len)));
+				prevIndex += len;
 			}
 
-			_parts = [.. parts2];
+			parts2.Add(Tuple.Create(part.Value, (string)null));
 
-			//TimeHelper.InitBounds(template, 'd', out _dayStart, out _dayLen);
-			//TimeHelper.InitBounds(template, 'h', out _hourStart, out _hourLen);
-			//TimeHelper.InitBounds(template, 'm', out _minuteStart, out _minuteLen);
-			//TimeHelper.InitBounds(template, 's', out _secondStart, out _secondLen);
-			//TimeHelper.InitBounds(template, 'f', out _milliStart, out _milliLen);
+			prevIndex += part.Value switch
+			{
+				Parts.Mls => 3,
+				Parts.Mcs => 3,
+				Parts.Nano => 3,
+				_ => 2,
+			};
 		}
 
-		/// <summary>
-		/// Parses the specified input string into a <see cref="TimeSpan"/> value based on the parser's template.
-		/// </summary>
-		/// <param name="input">The string representation of a time span to parse.</param>
-		/// <returns>A <see cref="TimeSpan"/> value that corresponds to the given input.</returns>
-		/// <exception cref="InvalidCastException">Thrown when the input cannot be converted to a TimeSpan using the provided template.</exception>
-		public TimeSpan Parse(string input)
-		{
-			try
-			{
-				var days = _dayStart == -1 ? 0 : (input[_dayStart] - '0') * 10 + (input[_dayStart + 1] - '0');
+		_parts = [.. parts2];
 
-				var hours = _hourStart == -1 ? 0 : (input[_hourStart] - '0') * 10 + (input[_hourStart + 1] - '0');
-				var minutes = _minuteStart == -1 ? 0 : (input[_minuteStart] - '0') * 10 + (input[_minuteStart + 1] - '0');
-				var seconds = _secondStart == -1 ? 0 : (input[_secondStart] - '0') * 10 + (input[_secondStart + 1] - '0');
+		//TimeHelper.InitBounds(template, 'd', out _dayStart, out _dayLen);
+		//TimeHelper.InitBounds(template, 'h', out _hourStart, out _hourLen);
+		//TimeHelper.InitBounds(template, 'm', out _minuteStart, out _minuteLen);
+		//TimeHelper.InitBounds(template, 's', out _secondStart, out _secondLen);
+		//TimeHelper.InitBounds(template, 'f', out _milliStart, out _milliLen);
+	}
 
-				var millis = _milliStart == -1 ? 0 : (input[_milliStart] - '0') * 100 + (input[_milliStart + 1] - '0') * 10 + (input[_milliStart + 2] - '0');
-				var micro = _microStart == -1 ? 0 : (input[_microStart] - '0') * 100 + (input[_microStart + 1] - '0') * 10 + (input[_microStart + 2] - '0');
-				var nano = _nanoStart == -1 ? 0 : (input[_nanoStart] - '0') * 100 + (input[_nanoStart + 1] - '0') * 10 + (input[_nanoStart + 2] - '0');
+	/// <summary>
+	/// Parses the specified input string into a <see cref="TimeSpan"/> value based on the parser's template.
+	/// </summary>
+	/// <param name="input">The string representation of a time span to parse.</param>
+	/// <returns>A <see cref="TimeSpan"/> value that corresponds to the given input.</returns>
+	/// <exception cref="InvalidCastException">Thrown when the input cannot be converted to a TimeSpan using the provided template.</exception>
+	public TimeSpan Parse(string input)
+	{
+		try
+		{
+			var days = _dayStart == -1 ? 0 : (input[_dayStart] - '0') * 10 + (input[_dayStart + 1] - '0');
 
-				var ts = new TimeSpan(days, hours, minutes, seconds, millis);
+			var hours = _hourStart == -1 ? 0 : (input[_hourStart] - '0') * 10 + (input[_hourStart + 1] - '0');
+			var minutes = _minuteStart == -1 ? 0 : (input[_minuteStart] - '0') * 10 + (input[_minuteStart + 1] - '0');
+			var seconds = _secondStart == -1 ? 0 : (input[_secondStart] - '0') * 10 + (input[_secondStart + 1] - '0');
 
-				if (micro > 0)
-				{
-					ts = ts.AddMicroseconds(micro);
+			var millis = _milliStart == -1 ? 0 : (input[_milliStart] - '0') * 100 + (input[_milliStart + 1] - '0') * 10 + (input[_milliStart + 2] - '0');
+			var micro = _microStart == -1 ? 0 : (input[_microStart] - '0') * 100 + (input[_microStart + 1] - '0') * 10 + (input[_microStart + 2] - '0');
+			var nano = _nanoStart == -1 ? 0 : (input[_nanoStart] - '0') * 100 + (input[_nanoStart + 1] - '0') * 10 + (input[_nanoStart + 2] - '0');
 
-					if (nano > 0)
-						ts = ts.AddNanoseconds(nano);
-				}
+			var ts = new TimeSpan(days, hours, minutes, seconds, millis);
 
-				return ts;
-			}
-			catch (Exception ex)
+			if (micro > 0)
 			{
-				throw new InvalidCastException($"Cannot convert {input} with format {Template} to {typeof(TimeSpan).Name}.", ex);
-			}
-		}
+				ts = ts.AddMicroseconds(micro);
 
-		/// <summary>
-		/// Formats the specified <see cref="TimeSpan"/> value into a string using the parser's template.
-		/// </summary>
-		/// <param name="value">The <see cref="TimeSpan"/> value to format.</param>
-		/// <returns>A string representation of the <see cref="TimeSpan"/> value according to the template.</returns>
-		public string ToString(TimeSpan value)
-		{
-			var builder = new StringBuilder();
-
-			foreach (var part in _parts)
-			{
-				switch (part.Item1)
-				{
-					case Parts.String:
-						builder.Append(part.Item2);
-						break;
-					case Parts.Day:
-						Append(builder, value.Days);
-						break;
-					case Parts.Hour:
-						Append(builder, value.Hours);
-						break;
-					case Parts.Minute:
-						Append(builder, value.Minutes);
-						break;
-					case Parts.Second:
-						Append(builder, value.Seconds);
-						break;
-					case Parts.Mls:
-						Append(builder, value.Milliseconds, 3);
-						break;
-					case Parts.Mcs:
-						Append(builder, value.GetMicroseconds(), 3);
-						break;
-					case Parts.Nano:
-						Append(builder, value.GetNanoseconds(), 3);
-						break;
-					default:
-						throw new ArgumentOutOfRangeException();
-				}
+				if (nano > 0)
+					ts = ts.AddNanoseconds(nano);
 			}
 
-			return builder.ToString();
+			return ts;
 		}
+		catch (Exception ex)
+		{
+			throw new InvalidCastException($"Cannot convert {input} with format {Template} to {typeof(TimeSpan).Name}.", ex);
+		}
+	}
 
-		private static void Append(StringBuilder builder, int value, int size = 2)
+	/// <summary>
+	/// Formats the specified <see cref="TimeSpan"/> value into a string using the parser's template.
+	/// </summary>
+	/// <param name="value">The <see cref="TimeSpan"/> value to format.</param>
+	/// <returns>A string representation of the <see cref="TimeSpan"/> value according to the template.</returns>
+	public string ToString(TimeSpan value)
+	{
+		var builder = new StringBuilder();
+
+		foreach (var part in _parts)
 		{
-			if (size == 2)
+			switch (part.Item1)
 			{
-				builder.Append((char)(value / 10 + '0'));
-				builder.Append((char)(value % 10 + '0'));
-			}
-			else
-			{
-				builder.Append((char)(value / 100 + '0'));
-				builder.Append((char)((value - (value / 100) * 100) / 10 + '0'));
-				builder.Append((char)(value % 10 + '0'));
+				case Parts.String:
+					builder.Append(part.Item2);
+					break;
+				case Parts.Day:
+					Append(builder, value.Days);
+					break;
+				case Parts.Hour:
+					Append(builder, value.Hours);
+					break;
+				case Parts.Minute:
+					Append(builder, value.Minutes);
+					break;
+				case Parts.Second:
+					Append(builder, value.Seconds);
+					break;
+				case Parts.Mls:
+					Append(builder, value.Milliseconds, 3);
+					break;
+				case Parts.Mcs:
+					Append(builder, value.GetMicroseconds(), 3);
+					break;
+				case Parts.Nano:
+					Append(builder, value.GetNanoseconds(), 3);
+					break;
+				default:
+					throw new ArgumentOutOfRangeException();
 			}
 		}
 
-		/// <inheritdoc />
-		public override string ToString() => Template;
+		return builder.ToString();
+	}
+
+	private static void Append(StringBuilder builder, int value, int size = 2)
+	{
+		if (size == 2)
+		{
+			builder.Append((char)(value / 10 + '0'));
+			builder.Append((char)(value % 10 + '0'));
+		}
+		else
+		{
+			builder.Append((char)(value / 100 + '0'));
+			builder.Append((char)((value - (value / 100) * 100) / 10 + '0'));
+			builder.Append((char)(value % 10 + '0'));
+		}
 	}
+
+	/// <inheritdoc />
+	public override string ToString() => Template;
 }
\ No newline at end of file
diff --git a/Common/ForbiddenException.cs b/Common/ForbiddenException.cs
index 6f321339..5e7db170 100644
--- a/Common/ForbiddenException.cs
+++ b/Common/ForbiddenException.cs
@@ -1,12 +1,11 @@
-namespace Ecng.Common
-{
-	using System;
+namespace Ecng.Common;
+
+using System;
 
-	/// <summary>
-	/// Exception thrown when an operation is forbidden.
-	/// </summary>
-	/// <param name="message">The error message that explains the reason for the exception.</param>
-	public class ForbiddenException(string message) : InvalidOperationException(message)
-	{
-	}
+/// <summary>
+/// Exception thrown when an operation is forbidden.
+/// </summary>
+/// <param name="message">The error message that explains the reason for the exception.</param>
+public class ForbiddenException(string message) : InvalidOperationException(message)
+{
 }
\ No newline at end of file
diff --git a/Common/HexEncoding.cs b/Common/HexEncoding.cs
index 6f19279f..3fbd195f 100644
--- a/Common/HexEncoding.cs
+++ b/Common/HexEncoding.cs
@@ -1,328 +1,327 @@
-namespace Ecng.Common
-{
-	using System;
-	using System.Text;
+namespace Ecng.Common;
+
+using System;
+using System.Text;
 
+/// <summary>
+/// Summary description for HexEncoding.
+/// http://www.codeproject.com/KB/recipes/hexencoding.aspx
+/// </summary>
+public class HexEncoding : Encoding
+{
 	/// <summary>
-	/// Summary description for HexEncoding.
-	/// http://www.codeproject.com/KB/recipes/hexencoding.aspx
+	/// When overridden in a derived class, calculates the number of bytes produced by encoding the characters in the specified <see cref="T:System.String"/>.
 	/// </summary>
-	public class HexEncoding : Encoding
+	/// <returns>
+	/// The number of bytes produced by encoding the specified characters.
+	/// </returns>
+	/// <param name="hexString">The <see cref="T:System.String"/> containing the set of characters to encode.</param>
+	/// <exception cref="T:System.ArgumentNullException"><paramref name="hexString"/> is null.</exception>
+	/// <exception cref="T:System.Text.EncoderFallbackException">A fallback occurred (see Understanding Encodings for complete explanation)
+	/// -and-
+	/// <see cref="P:System.Text.Encoding.EncoderFallback"/> is set to <see cref="T:System.Text.EncoderExceptionFallback"/>.
+	/// </exception>
+	/// <filterpriority>1</filterpriority>
+	public override int GetByteCount(string hexString)
 	{
-		/// <summary>
-		/// When overridden in a derived class, calculates the number of bytes produced by encoding the characters in the specified <see cref="T:System.String"/>.
-		/// </summary>
-		/// <returns>
-		/// The number of bytes produced by encoding the specified characters.
-		/// </returns>
-		/// <param name="hexString">The <see cref="T:System.String"/> containing the set of characters to encode.</param>
-		/// <exception cref="T:System.ArgumentNullException"><paramref name="hexString"/> is null.</exception>
-		/// <exception cref="T:System.Text.EncoderFallbackException">A fallback occurred (see Understanding Encodings for complete explanation)
-		/// -and-
-		/// <see cref="P:System.Text.Encoding.EncoderFallback"/> is set to <see cref="T:System.Text.EncoderExceptionFallback"/>.
-		/// </exception>
-		/// <filterpriority>1</filterpriority>
-		public override int GetByteCount(string hexString)
-		{
-			if (hexString.IsEmpty())
-				throw new ArgumentNullException(nameof(hexString));
+		if (hexString.IsEmpty())
+			throw new ArgumentNullException(nameof(hexString));
 
-			return GetByteCount(hexString.ToCharArray(), 0, hexString.Length);
-		}
-
-		/// <summary>
-		/// When overridden in a derived class, calculates the number of bytes produced by encoding a set of characters from the specified character array.
-		/// </summary>
-		/// <returns>
-		/// The number of bytes produced by encoding the specified characters.
-		/// </returns>
-		/// <param name="chars">The character array containing the set of characters to encode.</param>
-		/// <param name="index">The index of the first character to encode.</param>
-		/// <param name="count">The number of characters to encode.</param>
-		/// <exception cref="T:System.ArgumentNullException"><paramref name="chars"/> is null.</exception>
-		/// <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="index"/> or <paramref name="count"/> is less than zero.
-		/// -or- 
-		/// <paramref name="index"/> and <paramref name="count"/> do not denote a valid range in <paramref name="chars"/>. 
-		/// </exception>
-		/// <exception cref="T:System.Text.EncoderFallbackException">A fallback occurred (see Understanding Encodings for complete explanation)
-		///     -and-
-		/// <see cref="P:System.Text.Encoding.EncoderFallback"/> is set to <see cref="T:System.Text.EncoderExceptionFallback"/>.
-		/// </exception>
-		/// <filterpriority>1</filterpriority>
-		public override int GetByteCount(char[] chars, int index, int count)
-		{
-			if (chars is null)
-				throw new ArgumentNullException(nameof(chars));
-
-			if (chars.Length < (index + count))
-				throw new ArgumentOutOfRangeException(nameof(chars));
+		return GetByteCount(hexString.ToCharArray(), 0, hexString.Length);
+	}
 
-			var numHexChars = 0;
+	/// <summary>
+	/// When overridden in a derived class, calculates the number of bytes produced by encoding a set of characters from the specified character array.
+	/// </summary>
+	/// <returns>
+	/// The number of bytes produced by encoding the specified characters.
+	/// </returns>
+	/// <param name="chars">The character array containing the set of characters to encode.</param>
+	/// <param name="index">The index of the first character to encode.</param>
+	/// <param name="count">The number of characters to encode.</param>
+	/// <exception cref="T:System.ArgumentNullException"><paramref name="chars"/> is null.</exception>
+	/// <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="index"/> or <paramref name="count"/> is less than zero.
+	/// -or- 
+	/// <paramref name="index"/> and <paramref name="count"/> do not denote a valid range in <paramref name="chars"/>. 
+	/// </exception>
+	/// <exception cref="T:System.Text.EncoderFallbackException">A fallback occurred (see Understanding Encodings for complete explanation)
+	///     -and-
+	/// <see cref="P:System.Text.Encoding.EncoderFallback"/> is set to <see cref="T:System.Text.EncoderExceptionFallback"/>.
+	/// </exception>
+	/// <filterpriority>1</filterpriority>
+	public override int GetByteCount(char[] chars, int index, int count)
+	{
+		if (chars is null)
+			throw new ArgumentNullException(nameof(chars));
 
-			// remove all none A-F, 0-9, characters
-			for (int i = index; i < index + count; i++)
-			{
-				var c = chars[i];
+		if (chars.Length < (index + count))
+			throw new ArgumentOutOfRangeException(nameof(chars));
 
-				if (IsHexDigit(c))
-					numHexChars++;
-			}
+		var numHexChars = 0;
 
-			// if odd number of characters, discard last character
-			if (numHexChars % 2 != 0)
-			{
-				numHexChars--;
-			}
+		// remove all none A-F, 0-9, characters
+		for (int i = index; i < index + count; i++)
+		{
+			var c = chars[i];
 
-			return numHexChars / 2; // 2 characters per byte
+			if (IsHexDigit(c))
+				numHexChars++;
 		}
 
-		/// <summary>
-		/// When overridden in a derived class, encodes a set of characters from the specified character array into the specified byte array.
-		/// </summary>
-		/// <returns>
-		/// The actual number of bytes written into <paramref name="bytes"/>.
-		/// </returns>
-		/// <param name="chars">The character array containing the set of characters to encode.</param>
-		/// <param name="charIndex">The index of the first character to encode.</param>
-		/// <param name="charCount">The number of characters to encode.</param>
-		/// <param name="bytes">The byte array to contain the resulting sequence of bytes.</param>
-		/// <param name="byteIndex">The index at which to start writing the resulting sequence of bytes.</param>
-		/// <exception cref="T:System.ArgumentNullException"><paramref name="chars"/> is null.
-		///     -or- 
-		/// <paramref name="bytes"/> is null. 
-		/// </exception>
-		/// <exception cref="T:System.ArgumentOutOfRangeException">
-		/// <paramref name="charIndex"/> or <paramref name="charCount"/> or <paramref name="byteIndex"/> is less than zero.
-		///     -or- 
-		/// <paramref name="charIndex"/> and <paramref name="charCount"/> do not denote a valid range in <paramref name="chars"/>.
-		///     -or- 
-		/// <paramref name="byteIndex"/> is not a valid index in <paramref name="bytes"/>. 
-		/// </exception>
-		/// <exception cref="T:System.ArgumentException"><paramref name="bytes"/> does not have enough capacity from <paramref name="byteIndex"/> to the end of the array to accommodate the resulting bytes. 
-		/// </exception>
-		/// <exception cref="T:System.Text.EncoderFallbackException">A fallback occurred (see Understanding Encodings for complete explanation)
-		///     -and-
-		/// <see cref="P:System.Text.Encoding.EncoderFallback"/> is set to <see cref="T:System.Text.EncoderExceptionFallback"/>.
-		/// </exception>
-		/// <filterpriority>1</filterpriority>
-		public override int GetBytes(char[] chars, int charIndex, int charCount, byte[] bytes, int byteIndex)
+		// if odd number of characters, discard last character
+		if (numHexChars % 2 != 0)
 		{
-			var hexBytes = GetBytes(chars, charIndex, charCount, out int discarded);
-			Array.Copy(hexBytes, 0, bytes, byteIndex, hexBytes.Length);
-			return hexBytes.Length;
+			numHexChars--;
 		}
 
-		/// <summary>
-		/// Creates a byte array from the hexadecimal string. Each two characters are combined
-		/// to create one byte. First two hexadecimal characters become first byte in returned array.
-		/// Non-hexadecimal characters are ignored. 
-		/// </summary>
-		/// <param name="hexString">string to convert to byte array</param>
-		/// <returns>byte array, in the same left-to-right order as the hexString</returns>
-		public override byte[] GetBytes(string hexString)
-		{
-			if (hexString.IsEmpty())
-				throw new ArgumentNullException(nameof(hexString));
+		return numHexChars / 2; // 2 characters per byte
+	}
 
-			return GetBytes(hexString.ToCharArray(), 0, hexString.Length, out int discarded);
-		}
+	/// <summary>
+	/// When overridden in a derived class, encodes a set of characters from the specified character array into the specified byte array.
+	/// </summary>
+	/// <returns>
+	/// The actual number of bytes written into <paramref name="bytes"/>.
+	/// </returns>
+	/// <param name="chars">The character array containing the set of characters to encode.</param>
+	/// <param name="charIndex">The index of the first character to encode.</param>
+	/// <param name="charCount">The number of characters to encode.</param>
+	/// <param name="bytes">The byte array to contain the resulting sequence of bytes.</param>
+	/// <param name="byteIndex">The index at which to start writing the resulting sequence of bytes.</param>
+	/// <exception cref="T:System.ArgumentNullException"><paramref name="chars"/> is null.
+	///     -or- 
+	/// <paramref name="bytes"/> is null. 
+	/// </exception>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// <paramref name="charIndex"/> or <paramref name="charCount"/> or <paramref name="byteIndex"/> is less than zero.
+	///     -or- 
+	/// <paramref name="charIndex"/> and <paramref name="charCount"/> do not denote a valid range in <paramref name="chars"/>.
+	///     -or- 
+	/// <paramref name="byteIndex"/> is not a valid index in <paramref name="bytes"/>. 
+	/// </exception>
+	/// <exception cref="T:System.ArgumentException"><paramref name="bytes"/> does not have enough capacity from <paramref name="byteIndex"/> to the end of the array to accommodate the resulting bytes. 
+	/// </exception>
+	/// <exception cref="T:System.Text.EncoderFallbackException">A fallback occurred (see Understanding Encodings for complete explanation)
+	///     -and-
+	/// <see cref="P:System.Text.Encoding.EncoderFallback"/> is set to <see cref="T:System.Text.EncoderExceptionFallback"/>.
+	/// </exception>
+	/// <filterpriority>1</filterpriority>
+	public override int GetBytes(char[] chars, int charIndex, int charCount, byte[] bytes, int byteIndex)
+	{
+		var hexBytes = GetBytes(chars, charIndex, charCount, out int discarded);
+		Array.Copy(hexBytes, 0, bytes, byteIndex, hexBytes.Length);
+		return hexBytes.Length;
+	}
 
-		/// <summary>
-		/// When overridden in a derived class, calculates the number of characters produced by decoding a sequence of bytes from the specified byte array.
-		/// </summary>
-		/// <returns>
-		/// The number of characters produced by decoding the specified sequence of bytes.
-		/// </returns>
-		/// <param name="bytes">The byte array containing the sequence of bytes to decode.</param>
-		/// <param name="index">The index of the first byte to decode.</param>
-		/// <param name="count">The number of bytes to decode.</param>
-		/// <exception cref="T:System.ArgumentNullException"><paramref name="bytes"/> is null.</exception>
-		/// <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="index"/> or <paramref name="count"/> is less than zero.
-		///     -or- 
-		/// <paramref name="index"/> and <paramref name="count"/> do not denote a valid range in <paramref name="bytes"/>. 
-		/// </exception><exception cref="T:System.Text.DecoderFallbackException">A fallback occurred (see Understanding Encodings for complete explanation)
-		///     -and-
-		/// <see cref="P:System.Text.Encoding.DecoderFallback"/> is set to <see cref="T:System.Text.DecoderExceptionFallback"/>.
-		/// </exception>
-		/// <filterpriority>1</filterpriority>
-		public override int GetCharCount(byte[] bytes, int index, int count)
-		{
-			var charCount = 0;
+	/// <summary>
+	/// Creates a byte array from the hexadecimal string. Each two characters are combined
+	/// to create one byte. First two hexadecimal characters become first byte in returned array.
+	/// Non-hexadecimal characters are ignored. 
+	/// </summary>
+	/// <param name="hexString">string to convert to byte array</param>
+	/// <returns>byte array, in the same left-to-right order as the hexString</returns>
+	public override byte[] GetBytes(string hexString)
+	{
+		if (hexString.IsEmpty())
+			throw new ArgumentNullException(nameof(hexString));
 
-			for (var i = index; i < (index + count); i++)
-				charCount += bytes[i].ToString("X2").Length;
+		return GetBytes(hexString.ToCharArray(), 0, hexString.Length, out int discarded);
+	}
 
-			return charCount;
-		}
+	/// <summary>
+	/// When overridden in a derived class, calculates the number of characters produced by decoding a sequence of bytes from the specified byte array.
+	/// </summary>
+	/// <returns>
+	/// The number of characters produced by decoding the specified sequence of bytes.
+	/// </returns>
+	/// <param name="bytes">The byte array containing the sequence of bytes to decode.</param>
+	/// <param name="index">The index of the first byte to decode.</param>
+	/// <param name="count">The number of bytes to decode.</param>
+	/// <exception cref="T:System.ArgumentNullException"><paramref name="bytes"/> is null.</exception>
+	/// <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="index"/> or <paramref name="count"/> is less than zero.
+	///     -or- 
+	/// <paramref name="index"/> and <paramref name="count"/> do not denote a valid range in <paramref name="bytes"/>. 
+	/// </exception><exception cref="T:System.Text.DecoderFallbackException">A fallback occurred (see Understanding Encodings for complete explanation)
+	///     -and-
+	/// <see cref="P:System.Text.Encoding.DecoderFallback"/> is set to <see cref="T:System.Text.DecoderExceptionFallback"/>.
+	/// </exception>
+	/// <filterpriority>1</filterpriority>
+	public override int GetCharCount(byte[] bytes, int index, int count)
+	{
+		var charCount = 0;
 
-		/// <summary>
-		/// When overridden in a derived class, decodes a sequence of bytes from the specified byte array into the specified character array.
-		/// </summary>
-		/// <returns>
-		/// The actual number of characters written into <paramref name="chars"/>.
-		/// </returns>
-		/// <param name="bytes">The byte array containing the sequence of bytes to decode.</param>
-		/// <param name="byteIndex">The index of the first byte to decode.</param>
-		/// <param name="byteCount">The number of bytes to decode.</param>
-		/// <param name="chars">The character array to contain the resulting set of characters.</param>
-		/// <param name="charIndex">The index at which to start writing the resulting set of characters.</param>
-		/// <exception cref="T:System.ArgumentNullException"><paramref name="bytes"/> is null.
-		///     -or- 
-		/// <paramref name="chars"/> is null. 
-		/// </exception><exception cref="T:System.ArgumentOutOfRangeException"><paramref name="byteIndex"/> or <paramref name="byteCount"/> or <paramref name="charIndex"/> is less than zero.
-		///     -or- 
-		/// <paramref name="byteIndex"/> and <paramref name="byteCount"/> do not denote a valid range in <paramref name="bytes"/>.
-		///     -or- 
-		/// <paramref name="charIndex"/> is not a valid index in <paramref name="chars"/>. 
-		/// </exception>
-		/// <exception cref="T:System.ArgumentException"><paramref name="chars"/> does not have enough capacity from <paramref name="charIndex"/> to the end of the array to accommodate the resulting characters. 
-		/// </exception>
-		/// <exception cref="T:System.Text.DecoderFallbackException">A fallback occurred (see Understanding Encodings for complete explanation)
-		///     -and-
-		/// <see cref="P:System.Text.Encoding.DecoderFallback"/> is set to <see cref="T:System.Text.DecoderExceptionFallback"/>.
-		/// </exception>
-		/// <filterpriority>1</filterpriority>
-		public override int GetChars(byte[] bytes, int byteIndex, int byteCount, char[] chars, int charIndex)
-		{
-			var result = new StringBuilder();
+		for (var i = index; i < (index + count); i++)
+			charCount += bytes[i].ToString("X2").Length;
 
-			for (var i = byteIndex; i < (byteIndex + byteCount); i++)
-				result.AppendFormat(bytes[i].ToString("X2"));
+		return charCount;
+	}
 
-			Array.Copy(result.ToString().ToCharArray(), 0, chars, charIndex, result.Length);
-			return result.Length;
-		}
+	/// <summary>
+	/// When overridden in a derived class, decodes a sequence of bytes from the specified byte array into the specified character array.
+	/// </summary>
+	/// <returns>
+	/// The actual number of characters written into <paramref name="chars"/>.
+	/// </returns>
+	/// <param name="bytes">The byte array containing the sequence of bytes to decode.</param>
+	/// <param name="byteIndex">The index of the first byte to decode.</param>
+	/// <param name="byteCount">The number of bytes to decode.</param>
+	/// <param name="chars">The character array to contain the resulting set of characters.</param>
+	/// <param name="charIndex">The index at which to start writing the resulting set of characters.</param>
+	/// <exception cref="T:System.ArgumentNullException"><paramref name="bytes"/> is null.
+	///     -or- 
+	/// <paramref name="chars"/> is null. 
+	/// </exception><exception cref="T:System.ArgumentOutOfRangeException"><paramref name="byteIndex"/> or <paramref name="byteCount"/> or <paramref name="charIndex"/> is less than zero.
+	///     -or- 
+	/// <paramref name="byteIndex"/> and <paramref name="byteCount"/> do not denote a valid range in <paramref name="bytes"/>.
+	///     -or- 
+	/// <paramref name="charIndex"/> is not a valid index in <paramref name="chars"/>. 
+	/// </exception>
+	/// <exception cref="T:System.ArgumentException"><paramref name="chars"/> does not have enough capacity from <paramref name="charIndex"/> to the end of the array to accommodate the resulting characters. 
+	/// </exception>
+	/// <exception cref="T:System.Text.DecoderFallbackException">A fallback occurred (see Understanding Encodings for complete explanation)
+	///     -and-
+	/// <see cref="P:System.Text.Encoding.DecoderFallback"/> is set to <see cref="T:System.Text.DecoderExceptionFallback"/>.
+	/// </exception>
+	/// <filterpriority>1</filterpriority>
+	public override int GetChars(byte[] bytes, int byteIndex, int byteCount, char[] chars, int charIndex)
+	{
+		var result = new StringBuilder();
 
-		/// <summary>
-		/// When overridden in a derived class, calculates the maximum number of bytes produced by encoding the specified number of characters.
-		/// </summary>
-		/// <returns>
-		/// The maximum number of bytes produced by encoding the specified number of characters.
-		/// </returns>
-		/// <param name="charCount">The number of characters to encode.</param>
-		/// <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="charCount"/> is less than zero. 
-		/// </exception><exception cref="T:System.Text.EncoderFallbackException">A fallback occurred (see Understanding Encodings for complete explanation)
-		///     -and-
-		/// <see cref="P:System.Text.Encoding.EncoderFallback"/> is set to <see cref="T:System.Text.EncoderExceptionFallback"/>.
-		/// </exception>
-		/// <filterpriority>1</filterpriority>
-		public override int GetMaxByteCount(int charCount)
-		{
-			return charCount * 2;
-		}
+		for (var i = byteIndex; i < (byteIndex + byteCount); i++)
+			result.AppendFormat(bytes[i].ToString("X2"));
 
-		/// <summary>
-		/// When overridden in a derived class, calculates the maximum number of characters produced by decoding the specified number of bytes.
-		/// </summary>
-		/// <returns>
-		/// The maximum number of characters produced by decoding the specified number of bytes.
-		/// </returns>
-		/// <param name="byteCount">The number of bytes to decode.</param>
-		/// <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="byteCount"/> is less than zero. 
-		/// </exception><exception cref="T:System.Text.DecoderFallbackException">A fallback occurred (see Understanding Encodings for complete explanation)
-		///     -and-
-		/// <see cref="P:System.Text.Encoding.DecoderFallback"/> is set to <see cref="T:System.Text.DecoderExceptionFallback"/>.
-		/// </exception>
-		/// <filterpriority>1</filterpriority>
-		public override int GetMaxCharCount(int byteCount)
-		{
-			if (byteCount % 2 != 0)
-			{
-				byteCount--;
-			}
+		Array.Copy(result.ToString().ToCharArray(), 0, chars, charIndex, result.Length);
+		return result.Length;
+	}
 
-			return byteCount / 2;
-		}
+	/// <summary>
+	/// When overridden in a derived class, calculates the maximum number of bytes produced by encoding the specified number of characters.
+	/// </summary>
+	/// <returns>
+	/// The maximum number of bytes produced by encoding the specified number of characters.
+	/// </returns>
+	/// <param name="charCount">The number of characters to encode.</param>
+	/// <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="charCount"/> is less than zero. 
+	/// </exception><exception cref="T:System.Text.EncoderFallbackException">A fallback occurred (see Understanding Encodings for complete explanation)
+	///     -and-
+	/// <see cref="P:System.Text.Encoding.EncoderFallback"/> is set to <see cref="T:System.Text.EncoderExceptionFallback"/>.
+	/// </exception>
+	/// <filterpriority>1</filterpriority>
+	public override int GetMaxByteCount(int charCount)
+	{
+		return charCount * 2;
+	}
 
-		/// <summary>
-		/// Creates a byte array from the hexadecimal string. Each two characters are combined
-		/// to create one byte. First two hexadecimal characters become first byte in returned array.
-		/// Non-hexadecimal characters are ignored. 
-		/// </summary>
-		/// <param name="chars">The character array containing the set of characters to encode.</param>
-		/// <param name="charIndex">The index of the first character to encode.</param>
-		/// <param name="charCount">The number of characters to encode.</param>
-		/// <param name="discarded">number of characters in string ignored.</param>
-		/// <returns>byte array, in the same left-to-right order as the hexString.</returns>
-		public static byte[] GetBytes(char[] chars, int charIndex, int charCount, out int discarded)
+	/// <summary>
+	/// When overridden in a derived class, calculates the maximum number of characters produced by decoding the specified number of bytes.
+	/// </summary>
+	/// <returns>
+	/// The maximum number of characters produced by decoding the specified number of bytes.
+	/// </returns>
+	/// <param name="byteCount">The number of bytes to decode.</param>
+	/// <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="byteCount"/> is less than zero. 
+	/// </exception><exception cref="T:System.Text.DecoderFallbackException">A fallback occurred (see Understanding Encodings for complete explanation)
+	///     -and-
+	/// <see cref="P:System.Text.Encoding.DecoderFallback"/> is set to <see cref="T:System.Text.DecoderExceptionFallback"/>.
+	/// </exception>
+	/// <filterpriority>1</filterpriority>
+	public override int GetMaxCharCount(int byteCount)
+	{
+		if (byteCount % 2 != 0)
 		{
-			if (chars is null)
-				throw new ArgumentNullException(nameof(chars));
+			byteCount--;
+		}
 
-			if (chars.Length < (charIndex + charCount))
-				throw new ArgumentOutOfRangeException(nameof(chars));
+		return byteCount / 2;
+	}
 
+	/// <summary>
+	/// Creates a byte array from the hexadecimal string. Each two characters are combined
+	/// to create one byte. First two hexadecimal characters become first byte in returned array.
+	/// Non-hexadecimal characters are ignored. 
+	/// </summary>
+	/// <param name="chars">The character array containing the set of characters to encode.</param>
+	/// <param name="charIndex">The index of the first character to encode.</param>
+	/// <param name="charCount">The number of characters to encode.</param>
+	/// <param name="discarded">number of characters in string ignored.</param>
+	/// <returns>byte array, in the same left-to-right order as the hexString.</returns>
+	public static byte[] GetBytes(char[] chars, int charIndex, int charCount, out int discarded)
+	{
+		if (chars is null)
+			throw new ArgumentNullException(nameof(chars));
 
-			discarded = 0;
-			var newString = string.Empty;
+		if (chars.Length < (charIndex + charCount))
+			throw new ArgumentOutOfRangeException(nameof(chars));
 
-			// remove all none A-F, 0-9, characters
-			for (var i = charIndex; i < (charIndex + charCount); i++)
-			{
-				var c = chars[i];
 
-				if (IsHexDigit(c))
-					newString += c;
-				else
-					discarded++;
-			}
+		discarded = 0;
+		var newString = string.Empty;
+
+		// remove all none A-F, 0-9, characters
+		for (var i = charIndex; i < (charIndex + charCount); i++)
+		{
+			var c = chars[i];
 
-			// if odd number of characters, discard last character
-			if (newString.Length % 2 != 0)
-			{
+			if (IsHexDigit(c))
+				newString += c;
+			else
 				discarded++;
-				newString = newString.Substring(0, newString.Length - 1);
-			}
-
-			var byteLength = newString.Length / 2;
-			var bytes = new byte[byteLength];
-			var j = 0;
-			for (var i = 0; i < bytes.Length; i++)
-			{
-				var hex = new string([newString[j], newString[j + 1]]);
-				bytes[i] = HexToByte(hex);
-				j = j + 2;
-			}
-
-			return bytes;
 		}
 
-		/// <summary>
-		/// Returns true is c is a hexadecimal digit (A-F, a-f, 0-9)
-		/// </summary>
-		/// <param name="c">Character to test.</param>
-		/// <returns>true if hex digit, false if not.</returns>
-		public static bool IsHexDigit(char c)
+		// if odd number of characters, discard last character
+		if (newString.Length % 2 != 0)
 		{
-			var numA = 'A'.To<int>();
-			var num1 = '0'.To<int>();
+			discarded++;
+			newString = newString.Substring(0, newString.Length - 1);
+		}
 
-			c = c.ToUpper(false);
+		var byteLength = newString.Length / 2;
+		var bytes = new byte[byteLength];
+		var j = 0;
+		for (var i = 0; i < bytes.Length; i++)
+		{
+			var hex = new string([newString[j], newString[j + 1]]);
+			bytes[i] = HexToByte(hex);
+			j = j + 2;
+		}
 
-			var numChar = c.To<int>();
-			if (numChar >= numA && numChar < (numA + 6))
-				return true;
-			if (numChar >= num1 && numChar < (num1 + 10))
-				return true;
+		return bytes;
+	}
 
-			return false;
-		}
+	/// <summary>
+	/// Returns true is c is a hexadecimal digit (A-F, a-f, 0-9)
+	/// </summary>
+	/// <param name="c">Character to test.</param>
+	/// <returns>true if hex digit, false if not.</returns>
+	public static bool IsHexDigit(char c)
+	{
+		var numA = 'A'.To<int>();
+		var num1 = '0'.To<int>();
 
-		/// <summary>
-		/// Converts 1 or 2 character string into equivalant byte value
-		/// </summary>
-		/// <param name="hexString">1 or 2 character string.</param>
-		/// <returns>byte</returns>
-		private static byte HexToByte(string hexString)
-		{
-			if (hexString.IsEmpty())
-				throw new ArgumentNullException(nameof(hexString));
+		c = c.ToUpper(false);
 
-			if (hexString.Length > 2 || hexString.Length <= 0)
-				throw new ArgumentException("hex must be 1 or 2 characters in length");
+		var numChar = c.To<int>();
+		if (numChar >= numA && numChar < (numA + 6))
+			return true;
+		if (numChar >= num1 && numChar < (num1 + 10))
+			return true;
 
-			return byte.Parse(hexString, System.Globalization.NumberStyles.HexNumber);
-		}
+		return false;
+	}
+
+	/// <summary>
+	/// Converts 1 or 2 character string into equivalant byte value
+	/// </summary>
+	/// <param name="hexString">1 or 2 character string.</param>
+	/// <returns>byte</returns>
+	private static byte HexToByte(string hexString)
+	{
+		if (hexString.IsEmpty())
+			throw new ArgumentNullException(nameof(hexString));
+
+		if (hexString.Length > 2 || hexString.Length <= 0)
+			throw new ArgumentException("hex must be 1 or 2 characters in length");
+
+		return byte.Parse(hexString, System.Globalization.NumberStyles.HexNumber);
 	}
 }
\ No newline at end of file
diff --git a/Common/ICloneable.cs b/Common/ICloneable.cs
index cc19d293..2063cf36 100644
--- a/Common/ICloneable.cs
+++ b/Common/ICloneable.cs
@@ -1,21 +1,20 @@
-namespace Ecng.Common
-{
-	#region Using Directives
+namespace Ecng.Common;
+
+#region Using Directives
 
-	using System;
+using System;
 
-	#endregion
+#endregion
 
+/// <summary>
+/// Defines a method that creates a new object that is a deep copy of the current instance.
+/// </summary>
+/// <typeparam name="T">The type of the object that is cloned.</typeparam>
+public interface ICloneable<T> : ICloneable
+{
 	/// <summary>
-	/// Defines a method that creates a new object that is a deep copy of the current instance.
+	/// Creates a new object that is a deep copy of the current instance.
 	/// </summary>
-	/// <typeparam name="T">The type of the object that is cloned.</typeparam>
-	public interface ICloneable<T> : ICloneable
-	{
-		/// <summary>
-		/// Creates a new object that is a deep copy of the current instance.
-		/// </summary>
-		/// <returns>A new object that is a deep copy of this instance.</returns>
-		new T Clone();
-	}
+	/// <returns>A new object that is a deep copy of this instance.</returns>
+	new T Clone();
 }
\ No newline at end of file
diff --git a/Common/IOHelper.cs b/Common/IOHelper.cs
index d4b3ce46..7ffdd1a1 100644
--- a/Common/IOHelper.cs
+++ b/Common/IOHelper.cs
@@ -1,1228 +1,1227 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Text;
+using System.Linq;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+using System.Globalization;
+
+using Nito.AsyncEx;
+
+/// <summary>
+/// Provides helper methods for file and directory operations.
+/// </summary>
+public static class IOHelper
 {
-	using System;
-	using System.Threading;
-	using System.Threading.Tasks;
-	using System.Collections.Generic;
-	using System.Text;
-	using System.Linq;
-	using System.Diagnostics;
-	using System.IO;
-	using System.Reflection;
-	using System.ComponentModel;
-	using System.Runtime.InteropServices;
-	using System.Globalization;
-
-	using Nito.AsyncEx;
+	/// <summary>
+	/// Clears the specified directory by deleting its files and subdirectories.
+	/// </summary>
+	/// <param name="path">The directory path to clear.</param>
+	/// <param name="filter">Optional filter to determine which files to delete.</param>
+	/// <returns>A DirectoryInfo for the cleared directory.</returns>
+	public static DirectoryInfo ClearDirectory(string path, Func<string, bool> filter = null)
+		=> AsyncContext.Run(() => ClearDirectoryAsync(path, filter));
 
 	/// <summary>
-	/// Provides helper methods for file and directory operations.
+	/// Asynchronously clears the specified directory by deleting its files and subdirectories.
 	/// </summary>
-	public static class IOHelper
+	/// <param name="path">The directory path to clear.</param>
+	/// <param name="filter">Optional filter to determine which files to delete.</param>
+	/// <param name="cancellationToken">A cancellation token.</param>
+	/// <returns>A task that represents the asynchronous operation, containing a DirectoryInfo for the cleared directory.</returns>
+	public static Task<DirectoryInfo> ClearDirectoryAsync(string path, Func<string, bool> filter = null, CancellationToken cancellationToken = default)
 	{
-		/// <summary>
-		/// Clears the specified directory by deleting its files and subdirectories.
-		/// </summary>
-		/// <param name="path">The directory path to clear.</param>
-		/// <param name="filter">Optional filter to determine which files to delete.</param>
-		/// <returns>A DirectoryInfo for the cleared directory.</returns>
-		public static DirectoryInfo ClearDirectory(string path, Func<string, bool> filter = null)
-			=> AsyncContext.Run(() => ClearDirectoryAsync(path, filter));
-
-		/// <summary>
-		/// Asynchronously clears the specified directory by deleting its files and subdirectories.
-		/// </summary>
-		/// <param name="path">The directory path to clear.</param>
-		/// <param name="filter">Optional filter to determine which files to delete.</param>
-		/// <param name="cancellationToken">A cancellation token.</param>
-		/// <returns>A task that represents the asynchronous operation, containing a DirectoryInfo for the cleared directory.</returns>
-		public static Task<DirectoryInfo> ClearDirectoryAsync(string path, Func<string, bool> filter = null, CancellationToken cancellationToken = default)
-		{
-			var parentDir = new DirectoryInfo(path);
-
-			foreach (var file in parentDir.EnumerateFiles())
-			{
-				if (filter != null && !filter(file.FullName))
-					continue;
-
-				file.Delete();
-
-				cancellationToken.ThrowIfCancellationRequested();
-			}
+		var parentDir = new DirectoryInfo(path);
 
-			foreach (var dir in parentDir.EnumerateDirectories())
-			{
-				dir.Delete(true);
+		foreach (var file in parentDir.EnumerateFiles())
+		{
+			if (filter != null && !filter(file.FullName))
+				continue;
 
-				cancellationToken.ThrowIfCancellationRequested();
-			}
+			file.Delete();
 
-			return parentDir.FromResult();
+			cancellationToken.ThrowIfCancellationRequested();
 		}
 
-		/// <summary>
-		/// Copies the content of one directory to another.
-		/// </summary>
-		/// <param name="sourcePath">The source directory path.</param>
-		/// <param name="destPath">The destination directory path.</param>
-		public static void CopyDirectory(string sourcePath, string destPath)
-			=> AsyncContext.Run(() => CopyDirectoryAsync(sourcePath, destPath));
-
-		/// <summary>
-		/// Asynchronously copies the content of one directory to another.
-		/// </summary>
-		/// <param name="sourcePath">The source directory path.</param>
-		/// <param name="destPath">The destination directory path.</param>
-		/// <param name="cancellationToken">A cancellation token.</param>
-		/// <returns>A task that represents the asynchronous operation.</returns>
-		public static async Task CopyDirectoryAsync(string sourcePath, string destPath, CancellationToken cancellationToken = default)
+		foreach (var dir in parentDir.EnumerateDirectories())
 		{
-			Directory.CreateDirectory(destPath);
-
-			foreach (var fileName in Directory.GetFiles(sourcePath))
-			{
-				CopyAndMakeWritable(fileName, destPath);
+			dir.Delete(true);
 
-				cancellationToken.ThrowIfCancellationRequested();
-			}
-
-			foreach (var directory in Directory.GetDirectories(sourcePath))
-			{
-				await CopyDirectoryAsync(directory, Path.Combine(destPath, Path.GetFileName(directory)), cancellationToken);
-			}
+			cancellationToken.ThrowIfCancellationRequested();
 		}
 
-		/// <summary>
-		/// Copies a file to the specified destination and makes the copy writable.
-		/// </summary>
-		/// <param name="fileName">The source file path.</param>
-		/// <param name="destPath">The destination directory path.</param>
-		/// <returns>The destination file path.</returns>
-		public static string CopyAndMakeWritable(string fileName, string destPath)
-		{
-			var destFile = Path.Combine(destPath, Path.GetFileName(fileName));
+		return parentDir.FromResult();
+	}
 
-			File.Copy(fileName, destFile, true);
-			new FileInfo(destFile).IsReadOnly = false;
+	/// <summary>
+	/// Copies the content of one directory to another.
+	/// </summary>
+	/// <param name="sourcePath">The source directory path.</param>
+	/// <param name="destPath">The destination directory path.</param>
+	public static void CopyDirectory(string sourcePath, string destPath)
+		=> AsyncContext.Run(() => CopyDirectoryAsync(sourcePath, destPath));
 
-			return destFile;
-		}
+	/// <summary>
+	/// Asynchronously copies the content of one directory to another.
+	/// </summary>
+	/// <param name="sourcePath">The source directory path.</param>
+	/// <param name="destPath">The destination directory path.</param>
+	/// <param name="cancellationToken">A cancellation token.</param>
+	/// <returns>A task that represents the asynchronous operation.</returns>
+	public static async Task CopyDirectoryAsync(string sourcePath, string destPath, CancellationToken cancellationToken = default)
+	{
+		Directory.CreateDirectory(destPath);
 
-		/// <summary>
-		/// Converts a relative or partial path to a fully qualified path.
-		/// </summary>
-		/// <param name="path">The input path.</param>
-		/// <returns>The absolute path.</returns>
-		public static string ToFullPath(this string path)
+		foreach (var fileName in Directory.GetFiles(sourcePath))
 		{
-			if (path is null)
-				throw new ArgumentNullException(nameof(path));
+			CopyAndMakeWritable(fileName, destPath);
 
-			return Path.GetFullPath(path);
+			cancellationToken.ThrowIfCancellationRequested();
 		}
 
-		/// <summary>
-		/// Adds a relative segment to the current path and returns the fully qualified path.
-		/// </summary>
-		/// <param name="path">The base path.</param>
-		/// <param name="relativePart">The relative segment to add.</param>
-		/// <returns>The combined full path.</returns>
-		public static string AddRelative(this string path, string relativePart)
+		foreach (var directory in Directory.GetDirectories(sourcePath))
 		{
-			return (path + relativePart).ToFullPath();
+			await CopyDirectoryAsync(directory, Path.Combine(destPath, Path.GetFileName(directory)), cancellationToken);
 		}
+	}
 
-		/// <summary>
-		/// Executes a process with specified arguments and output handlers.
-		/// </summary>
-		/// <param name="fileName">The process file name.</param>
-		/// <param name="arg">Arguments for the process.</param>
-		/// <param name="output">Action to handle standard output.</param>
-		/// <param name="error">Action to handle standard error.</param>
-		/// <param name="infoHandler">Optional action to modify process start info.</param>
-		/// <param name="waitForExit">TimeSpan to wait for process exit.</param>
-		/// <param name="stdInput">Standard input to write to the process.</param>
-		/// <param name="priority">Optional process priority.</param>
-		/// <returns>The process exit code.</returns>
-		public static int Execute(string fileName, string arg, Action<string> output, Action<string> error, Action<ProcessStartInfo> infoHandler = null, TimeSpan waitForExit = default, string stdInput = null, ProcessPriorityClass? priority = null)
-		{
-			var source = new CancellationTokenSource();
-
-			if (waitForExit != default)
-				source.CancelAfter(waitForExit);
+	/// <summary>
+	/// Copies a file to the specified destination and makes the copy writable.
+	/// </summary>
+	/// <param name="fileName">The source file path.</param>
+	/// <param name="destPath">The destination directory path.</param>
+	/// <returns>The destination file path.</returns>
+	public static string CopyAndMakeWritable(string fileName, string destPath)
+	{
+		var destFile = Path.Combine(destPath, Path.GetFileName(fileName));
 
-			return AsyncContext.Run(() => ExecuteAsync(fileName, arg, output, error, infoHandler, stdInput, priority, source.Token));
-		}
+		File.Copy(fileName, destFile, true);
+		new FileInfo(destFile).IsReadOnly = false;
 
-		/// <summary>
-		/// Asynchronously executes a process with specified arguments and output handlers.
-		/// </summary>
-		/// <param name="fileName">The file name to execute.</param>
-		/// <param name="arg">Arguments for the process.</param>
-		/// <param name="output">Action to handle standard output.</param>
-		/// <param name="error">Action to handle standard error.</param>
-		/// <param name="infoHandler">Optional action to modify process start info.</param>
-		/// <param name="stdInput">Standard input to send to the process.</param>
-		/// <param name="priority">Optional process priority.</param>
-		/// <param name="cancellationToken">A cancellation token.</param>
-		/// <returns>A task that represents the asynchronous operation, containing the process exit code.</returns>
-		public static async Task<int> ExecuteAsync(string fileName, string arg, Action<string> output, Action<string> error, Action<ProcessStartInfo> infoHandler = null, string stdInput = null, ProcessPriorityClass? priority = null, CancellationToken cancellationToken = default)
-		{
-			if (output is null)
-				throw new ArgumentNullException(nameof(output));
+		return destFile;
+	}
 
-			if (error is null)
-				throw new ArgumentNullException(nameof(error));
+	/// <summary>
+	/// Converts a relative or partial path to a fully qualified path.
+	/// </summary>
+	/// <param name="path">The input path.</param>
+	/// <returns>The absolute path.</returns>
+	public static string ToFullPath(this string path)
+	{
+		if (path is null)
+			throw new ArgumentNullException(nameof(path));
 
-			var input = !stdInput.IsEmpty();
+		return Path.GetFullPath(path);
+	}
 
-			var procInfo = new ProcessStartInfo(fileName, arg)
-			{
-				UseShellExecute = false,
-				RedirectStandardError = true,
-				RedirectStandardOutput = true,
-				RedirectStandardInput = input,
-				CreateNoWindow = true,
-				WindowStyle = ProcessWindowStyle.Hidden
-			};
+	/// <summary>
+	/// Adds a relative segment to the current path and returns the fully qualified path.
+	/// </summary>
+	/// <param name="path">The base path.</param>
+	/// <param name="relativePart">The relative segment to add.</param>
+	/// <returns>The combined full path.</returns>
+	public static string AddRelative(this string path, string relativePart)
+	{
+		return (path + relativePart).ToFullPath();
+	}
 
-			infoHandler?.Invoke(procInfo);
+	/// <summary>
+	/// Executes a process with specified arguments and output handlers.
+	/// </summary>
+	/// <param name="fileName">The process file name.</param>
+	/// <param name="arg">Arguments for the process.</param>
+	/// <param name="output">Action to handle standard output.</param>
+	/// <param name="error">Action to handle standard error.</param>
+	/// <param name="infoHandler">Optional action to modify process start info.</param>
+	/// <param name="waitForExit">TimeSpan to wait for process exit.</param>
+	/// <param name="stdInput">Standard input to write to the process.</param>
+	/// <param name="priority">Optional process priority.</param>
+	/// <returns>The process exit code.</returns>
+	public static int Execute(string fileName, string arg, Action<string> output, Action<string> error, Action<ProcessStartInfo> infoHandler = null, TimeSpan waitForExit = default, string stdInput = null, ProcessPriorityClass? priority = null)
+	{
+		var source = new CancellationTokenSource();
 
-			using var process = new Process
-			{
-				EnableRaisingEvents = true,
-				StartInfo = procInfo
-			};
+		if (waitForExit != default)
+			source.CancelAfter(waitForExit);
 
-			process.Start();
+		return AsyncContext.Run(() => ExecuteAsync(fileName, arg, output, error, infoHandler, stdInput, priority, source.Token));
+	}
 
-			// Set process priority if provided.
-			// https://stackoverflow.com/a/1010377/8029915
-			if (priority is not null)
-				process.PriorityClass = priority.Value;
+	/// <summary>
+	/// Asynchronously executes a process with specified arguments and output handlers.
+	/// </summary>
+	/// <param name="fileName">The file name to execute.</param>
+	/// <param name="arg">Arguments for the process.</param>
+	/// <param name="output">Action to handle standard output.</param>
+	/// <param name="error">Action to handle standard error.</param>
+	/// <param name="infoHandler">Optional action to modify process start info.</param>
+	/// <param name="stdInput">Standard input to send to the process.</param>
+	/// <param name="priority">Optional process priority.</param>
+	/// <param name="cancellationToken">A cancellation token.</param>
+	/// <returns>A task that represents the asynchronous operation, containing the process exit code.</returns>
+	public static async Task<int> ExecuteAsync(string fileName, string arg, Action<string> output, Action<string> error, Action<ProcessStartInfo> infoHandler = null, string stdInput = null, ProcessPriorityClass? priority = null, CancellationToken cancellationToken = default)
+	{
+		if (output is null)
+			throw new ArgumentNullException(nameof(output));
 
-			var locker = new object();
+		if (error is null)
+			throw new ArgumentNullException(nameof(error));
 
-			if (input)
-			{
-				process.StandardInput.WriteLine(stdInput);
-				process.StandardInput.Close();
-			}
+		var input = !stdInput.IsEmpty();
 
-			async Task ReadProcessOutput(TextReader reader, Action<string> action)
-			{
-				do
-				{
-					var str = await reader.ReadLineAsync().WithCancellation(cancellationToken);
-					if (str is null)
-						break;
+		var procInfo = new ProcessStartInfo(fileName, arg)
+		{
+			UseShellExecute = false,
+			RedirectStandardError = true,
+			RedirectStandardOutput = true,
+			RedirectStandardInput = input,
+			CreateNoWindow = true,
+			WindowStyle = ProcessWindowStyle.Hidden
+		};
 
-					if (!str.IsEmptyOrWhiteSpace())
-					{
-						lock (locker)
-							action(str);
-					}
+		infoHandler?.Invoke(procInfo);
 
-					cancellationToken.ThrowIfCancellationRequested();
-				}
-				while (true);
-			}
+		using var process = new Process
+		{
+			EnableRaisingEvents = true,
+			StartInfo = procInfo
+		};
 
-			var task1 = ReadProcessOutput(process.StandardOutput, output);
-			var task2 = ReadProcessOutput(process.StandardError, error);
+		process.Start();
 
-			await task1;
-			await task2;
+		// Set process priority if provided.
+		// https://stackoverflow.com/a/1010377/8029915
+		if (priority is not null)
+			process.PriorityClass = priority.Value;
 
-			await process.WaitForExitAsync(cancellationToken);
+		var locker = new object();
 
-			return process.ExitCode;
+		if (input)
+		{
+			process.StandardInput.WriteLine(stdInput);
+			process.StandardInput.Close();
 		}
 
-		/// <summary>
-		/// Creates the directory for the specified file if it does not already exist.
-		/// </summary>
-		/// <param name="fullPath">The full path to the file.</param>
-		/// <returns>True if the directory was created; otherwise, false.</returns>
-		public static bool CreateDirIfNotExists(this string fullPath)
+		async Task ReadProcessOutput(TextReader reader, Action<string> action)
 		{
-			var directory = Path.GetDirectoryName(fullPath);
+			do
+			{
+				var str = await reader.ReadLineAsync().WithCancellation(cancellationToken);
+				if (str is null)
+					break;
 
-			if (directory.IsEmpty() || Directory.Exists(directory))
-				return false;
+				if (!str.IsEmptyOrWhiteSpace())
+				{
+					lock (locker)
+						action(str);
+				}
 
-			Directory.CreateDirectory(directory);
-			return true;
+				cancellationToken.ThrowIfCancellationRequested();
+			}
+			while (true);
 		}
 
-		private static readonly string[] _suf = ["B", "KB", "MB", "GB", "TB", "PB", "EB"]; //Longs run out around EB
+		var task1 = ReadProcessOutput(process.StandardOutput, output);
+		var task2 = ReadProcessOutput(process.StandardError, error);
 
-		/// <summary>
-		/// Converts a byte count to a human-readable file size string.
-		/// </summary>
-		/// <param name="byteCount">The number of bytes.</param>
-		/// <returns>A formatted string representing the file size.</returns>
-		public static string ToHumanReadableFileSize(this long byteCount)
-		{
-			int place;
-			int num;
+		await task1;
+		await task2;
 
-			if (byteCount == 0)
-			{
-				num = 0;
-				place = 0;
-			}
-			else
-			{
-				var bytes = byteCount.Abs();
-				place = (int)Math.Log(bytes, FileSizes.KB).Floor();
-				num = (int)(Math.Sign(byteCount) * Math.Round(bytes / Math.Pow(FileSizes.KB, place), 1));
-			}
+		await process.WaitForExitAsync(cancellationToken);
 
-			return num + " " + _suf[place];
-		}
+		return process.ExitCode;
+	}
 
-		/// <summary>
-		/// Safely deletes a directory.
-		/// </summary>
-		/// <param name="path">The directory path.</param>
-		public static void SafeDeleteDir(this string path)
-		{
-			if (!Directory.Exists(path))
-				return;
+	/// <summary>
+	/// Creates the directory for the specified file if it does not already exist.
+	/// </summary>
+	/// <param name="fullPath">The full path to the file.</param>
+	/// <returns>True if the directory was created; otherwise, false.</returns>
+	public static bool CreateDirIfNotExists(this string fullPath)
+	{
+		var directory = Path.GetDirectoryName(fullPath);
 
-			Directory.Delete(path, true);
-		}
+		if (directory.IsEmpty() || Directory.Exists(directory))
+			return false;
 
-		/// <summary>
-		/// Creates a temporary directory and returns its path.
-		/// </summary>
-		/// <returns>The path to the new temporary directory.</returns>
-		public static string CreateTempDir()
-		{
-			var path = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString().Remove("-"));
+		Directory.CreateDirectory(directory);
+		return true;
+	}
 
-			if (!Directory.Exists(path))
-				Directory.CreateDirectory(path);
+	private static readonly string[] _suf = ["B", "KB", "MB", "GB", "TB", "PB", "EB"]; //Longs run out around EB
 
-			return path;
-		}
+	/// <summary>
+	/// Converts a byte count to a human-readable file size string.
+	/// </summary>
+	/// <param name="byteCount">The number of bytes.</param>
+	/// <returns>A formatted string representing the file size.</returns>
+	public static string ToHumanReadableFileSize(this long byteCount)
+	{
+		int place;
+		int num;
 
-		/// <summary>
-		/// Checks if the specified installation directory exists and contains files or subdirectories.
-		/// </summary>
-		/// <param name="path">The installation directory path.</param>
-		/// <returns>True if the installation is valid; otherwise, false.</returns>
-		public static bool CheckInstallation(string path)
+		if (byteCount == 0)
 		{
-			if (path.IsEmpty())
-				return false;
+			num = 0;
+			place = 0;
+		}
+		else
+		{
+			var bytes = byteCount.Abs();
+			place = (int)Math.Log(bytes, FileSizes.KB).Floor();
+			num = (int)(Math.Sign(byteCount) * Math.Round(bytes / Math.Pow(FileSizes.KB, place), 1));
+		}
 
-			if (!Directory.Exists(path))
-				return false;
+		return num + " " + _suf[place];
+	}
 
-			var files = Directory.GetFiles(path);
-			var directories = Directory.GetDirectories(path);
-			return files.Any() || directories.Any();
-		}
+	/// <summary>
+	/// Safely deletes a directory.
+	/// </summary>
+	/// <param name="path">The directory path.</param>
+	public static void SafeDeleteDir(this string path)
+	{
+		if (!Directory.Exists(path))
+			return;
 
-		/// <summary>
-		/// Gets the relative path from a folder to a file.
-		/// </summary>
-		/// <param name="fileFull">The full file path.</param>
-		/// <param name="folder">The base folder.</param>
-		/// <returns>The relative file path.</returns>
-		public static string GetRelativePath(this string fileFull, string folder)
-		{
-			var pathUri = new Uri(fileFull);
+		Directory.Delete(path, true);
+	}
 
-			if (!folder.EndsWith(Path.DirectorySeparatorChar.ToString()))
-				folder += Path.DirectorySeparatorChar;
+	/// <summary>
+	/// Creates a temporary directory and returns its path.
+	/// </summary>
+	/// <returns>The path to the new temporary directory.</returns>
+	public static string CreateTempDir()
+	{
+		var path = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString().Remove("-"));
 
-			var folderUri = new Uri(folder);
-			return folderUri.MakeRelativeUri(pathUri).ToString().Replace('/', Path.DirectorySeparatorChar).DataUnEscape();
-		}
+		if (!Directory.Exists(path))
+			Directory.CreateDirectory(path);
 
-		/// <summary>
-		/// Gets the available free space on the specified drive.
-		/// </summary>
-		/// <param name="driveName">The drive name (e.g., "C:").</param>
-		/// <returns>The amount of free space in bytes.</returns>
-		public static long GetDiskFreeSpace(string driveName)
-		{
-			return new DriveInfo(driveName).TotalFreeSpace;
-		}
+		return path;
+	}
 
-		/// <summary>
-		/// Creates a file with the specified content.
-		/// </summary>
-		/// <param name="rootPath">The root path.</param>
-		/// <param name="relativePath">The relative path to the file.</param>
-		/// <param name="fileName">The file name.</param>
-		/// <param name="content">The content as a byte array.</param>
-		public static void CreateFile(string rootPath, string relativePath, string fileName, byte[] content)
-		{
-			if (relativePath.IsEmpty())
-			{
-				File.WriteAllBytes(Path.Combine(rootPath, fileName), content);
-			}
-			else
-			{
-				var fullPath = Path.Combine(rootPath, relativePath, fileName);
-				var fileInfo = new FileInfo(fullPath);
-				fileInfo.Directory.Create();
-				File.WriteAllBytes(fullPath, content);
-			}
-		}
+	/// <summary>
+	/// Checks if the specified installation directory exists and contains files or subdirectories.
+	/// </summary>
+	/// <param name="path">The installation directory path.</param>
+	/// <returns>True if the installation is valid; otherwise, false.</returns>
+	public static bool CheckInstallation(string path)
+	{
+		if (path.IsEmpty())
+			return false;
 
-		// https://stackoverflow.com/a/2811746/8029915
+		if (!Directory.Exists(path))
+			return false;
 
-		/// <summary>
-		/// Recursively deletes empty directories starting from the specified directory.
-		/// </summary>
-		/// <param name="dir">The root directory to check and delete if empty.</param>
-		public static void DeleteEmptyDirs(string dir)
-		{
-			if (dir.IsEmpty())
-				throw new ArgumentNullException(nameof(dir));
+		var files = Directory.GetFiles(path);
+		var directories = Directory.GetDirectories(path);
+		return files.Any() || directories.Any();
+	}
 
-			try
-			{
-				foreach (var d in Directory.EnumerateDirectories(dir))
-				{
-					DeleteEmptyDirs(d);
-				}
+	/// <summary>
+	/// Gets the relative path from a folder to a file.
+	/// </summary>
+	/// <param name="fileFull">The full file path.</param>
+	/// <param name="folder">The base folder.</param>
+	/// <returns>The relative file path.</returns>
+	public static string GetRelativePath(this string fileFull, string folder)
+	{
+		var pathUri = new Uri(fileFull);
 
-				var entries = Directory.EnumerateFileSystemEntries(dir);
+		if (!folder.EndsWith(Path.DirectorySeparatorChar.ToString()))
+			folder += Path.DirectorySeparatorChar;
 
-				if (!entries.Any())
-				{
-					try
-					{
-						Directory.Delete(dir);
-					}
-					catch (UnauthorizedAccessException) { }
-					catch (DirectoryNotFoundException) { }
-				}
-			}
-			catch (UnauthorizedAccessException) { }
-		}
+		var folderUri = new Uri(folder);
+		return folderUri.MakeRelativeUri(pathUri).ToString().Replace('/', Path.DirectorySeparatorChar).DataUnEscape();
+	}
 
-		/// <summary>
-		/// The %Documents% variable.
-		/// </summary>
-		public const string DocsVar = "%Documents%";
-
-		/// <summary>
-		/// Replaces the %Documents% variable in the path with the actual Documents folder path.
-		/// </summary>
-		/// <param name="path">The path containing the %Documents% variable.</param>
-		/// <returns>The fully qualified path with the Documents folder.</returns>
-		public static string ToFullPathIfNeed(this string path)
-		{
-			if (path is null)
-				throw new ArgumentNullException(nameof(path));
+	/// <summary>
+	/// Gets the available free space on the specified drive.
+	/// </summary>
+	/// <param name="driveName">The drive name (e.g., "C:").</param>
+	/// <returns>The amount of free space in bytes.</returns>
+	public static long GetDiskFreeSpace(string driveName)
+	{
+		return new DriveInfo(driveName).TotalFreeSpace;
+	}
 
-			return path.ReplaceIgnoreCase(DocsVar, Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments));
+	/// <summary>
+	/// Creates a file with the specified content.
+	/// </summary>
+	/// <param name="rootPath">The root path.</param>
+	/// <param name="relativePath">The relative path to the file.</param>
+	/// <param name="fileName">The file name.</param>
+	/// <param name="content">The content as a byte array.</param>
+	public static void CreateFile(string rootPath, string relativePath, string fileName, byte[] content)
+	{
+		if (relativePath.IsEmpty())
+		{
+			File.WriteAllBytes(Path.Combine(rootPath, fileName), content);
+		}
+		else
+		{
+			var fullPath = Path.Combine(rootPath, relativePath, fileName);
+			var fileInfo = new FileInfo(fullPath);
+			fileInfo.Directory.Create();
+			File.WriteAllBytes(fullPath, content);
 		}
+	}
 
-		/// <summary>
-		/// Deletes a directory in a blocking manner.
-		/// </summary>
-		/// <param name="dir">The directory to delete.</param>
-		/// <param name="isRecursive">Indicates whether to delete subdirectories recursively.</param>
-		/// <param name="iterCount">Number of iterations to attempt deletion.</param>
-		/// <param name="sleep">Sleep duration between attempts in milliseconds.</param>
-		/// <returns>True if the directory still exists after deletion attempts; otherwise, false.</returns>
-		public static bool BlockDeleteDir(string dir, bool isRecursive = false, int iterCount = 1000, int sleep = 0)
+	// https://stackoverflow.com/a/2811746/8029915
+
+	/// <summary>
+	/// Recursively deletes empty directories starting from the specified directory.
+	/// </summary>
+	/// <param name="dir">The root directory to check and delete if empty.</param>
+	public static void DeleteEmptyDirs(string dir)
+	{
+		if (dir.IsEmpty())
+			throw new ArgumentNullException(nameof(dir));
+
+		try
 		{
-			if (isRecursive)
+			foreach (var d in Directory.EnumerateDirectories(dir))
 			{
-				// https://stackoverflow.com/a/329502/8029915
-				// Delete files and directories recursively.
-				var files = Directory.GetFiles(dir);
-				var dirs = Directory.GetDirectories(dir);
+				DeleteEmptyDirs(d);
+			}
 
-				foreach (var file in files)
-				{
-					File.SetAttributes(file, FileAttributes.Normal);
-					File.Delete(file);
-				}
+			var entries = Directory.EnumerateFileSystemEntries(dir);
 
-				foreach (var sub in dirs)
+			if (!entries.Any())
+			{
+				try
 				{
-					BlockDeleteDir(sub, true, iterCount, sleep);
+					Directory.Delete(dir);
 				}
+				catch (UnauthorizedAccessException) { }
+				catch (DirectoryNotFoundException) { }
 			}
+		}
+		catch (UnauthorizedAccessException) { }
+	}
 
-			// https://stackoverflow.com/a/1703799/8029915
-			// Attempt deletion.
+	/// <summary>
+	/// The %Documents% variable.
+	/// </summary>
+	public const string DocsVar = "%Documents%";
 
-			try
-			{
-				Directory.Delete(dir, false);
-			}
-			catch (IOException)
+	/// <summary>
+	/// Replaces the %Documents% variable in the path with the actual Documents folder path.
+	/// </summary>
+	/// <param name="path">The path containing the %Documents% variable.</param>
+	/// <returns>The fully qualified path with the Documents folder.</returns>
+	public static string ToFullPathIfNeed(this string path)
+	{
+		if (path is null)
+			throw new ArgumentNullException(nameof(path));
+
+		return path.ReplaceIgnoreCase(DocsVar, Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments));
+	}
+
+	/// <summary>
+	/// Deletes a directory in a blocking manner.
+	/// </summary>
+	/// <param name="dir">The directory to delete.</param>
+	/// <param name="isRecursive">Indicates whether to delete subdirectories recursively.</param>
+	/// <param name="iterCount">Number of iterations to attempt deletion.</param>
+	/// <param name="sleep">Sleep duration between attempts in milliseconds.</param>
+	/// <returns>True if the directory still exists after deletion attempts; otherwise, false.</returns>
+	public static bool BlockDeleteDir(string dir, bool isRecursive = false, int iterCount = 1000, int sleep = 0)
+	{
+		if (isRecursive)
+		{
+			// https://stackoverflow.com/a/329502/8029915
+			// Delete files and directories recursively.
+			var files = Directory.GetFiles(dir);
+			var dirs = Directory.GetDirectories(dir);
+
+			foreach (var file in files)
 			{
-				Directory.Delete(dir, false);
+				File.SetAttributes(file, FileAttributes.Normal);
+				File.Delete(file);
 			}
-			catch (UnauthorizedAccessException)
+
+			foreach (var sub in dirs)
 			{
-				Directory.Delete(dir, false);
+				BlockDeleteDir(sub, true, iterCount, sleep);
 			}
+		}
 
-			var limit = iterCount;
-
-			while (Directory.Exists(dir) && limit-- > 0)
-				Thread.Sleep(sleep);
+		// https://stackoverflow.com/a/1703799/8029915
+		// Attempt deletion.
 
-			return Directory.Exists(dir);
+		try
+		{
+			Directory.Delete(dir, false);
+		}
+		catch (IOException)
+		{
+			Directory.Delete(dir, false);
 		}
+		catch (UnauthorizedAccessException)
+		{
+			Directory.Delete(dir, false);
+		}
+
+		var limit = iterCount;
+
+		while (Directory.Exists(dir) && limit-- > 0)
+			Thread.Sleep(sleep);
 
-		/// <summary>
-		/// Opens the specified URL or file path using the default system launcher.
-		/// </summary>
-		/// <param name="url">The URL or file path to open.</param>
-		/// <param name="raiseError">Determines if an exception should be raised if opening fails.</param>
-		/// <returns>True if the operation is successful; otherwise, false.</returns>
-		public static bool OpenLink(this string url, bool raiseError)
+		return Directory.Exists(dir);
+	}
+
+	/// <summary>
+	/// Opens the specified URL or file path using the default system launcher.
+	/// </summary>
+	/// <param name="url">The URL or file path to open.</param>
+	/// <param name="raiseError">Determines if an exception should be raised if opening fails.</param>
+	/// <returns>True if the operation is successful; otherwise, false.</returns>
+	public static bool OpenLink(this string url, bool raiseError)
+	{
+		if (url.IsEmpty())
+			throw new ArgumentNullException(nameof(url));
+
+		// https://stackoverflow.com/a/21836079
+
+		try
 		{
-			if (url.IsEmpty())
-				throw new ArgumentNullException(nameof(url));
+			// https://github.com/dotnet/wpf/issues/2566
 
-			// https://stackoverflow.com/a/21836079
+			var procInfo = new ProcessStartInfo(url)
+			{
+				UseShellExecute = true,
+			};
 
+			Process.Start(procInfo);
+			return true;
+		}
+		catch (Win32Exception)
+		{
 			try
 			{
-				// https://github.com/dotnet/wpf/issues/2566
-
-				var procInfo = new ProcessStartInfo(url)
-				{
-					UseShellExecute = true,
-				};
-
-				Process.Start(procInfo);
+				var launcher = url.StartsWithIgnoreCase("http") ? "IExplore.exe" : "explorer.exe";
+				Process.Start(launcher, url);
 				return true;
 			}
-			catch (Win32Exception)
+			catch
 			{
-				try
-				{
-					var launcher = url.StartsWithIgnoreCase("http") ? "IExplore.exe" : "explorer.exe";
-					Process.Start(launcher, url);
-					return true;
-				}
-				catch
-				{
-					if (raiseError)
-						throw;
+				if (raiseError)
+					throw;
 
-					return false;
-				}
+				return false;
 			}
 		}
+	}
 
-		/// <summary>
-		/// Retrieves the directories within the specified path matching the search pattern.
-		/// </summary>
-		/// <param name="path">The root directory to search.</param>
-		/// <param name="searchPattern">The search pattern.</param>
-		/// <param name="searchOption">Search option to determine whether to search subdirectories.</param>
-		/// <returns>An enumerable of matching directory paths.</returns>
-		public static IEnumerable<string> GetDirectories(string path,
-			string searchPattern = "*",
-			SearchOption searchOption = SearchOption.TopDirectoryOnly)
-		{
-			return !Directory.Exists(path)
-				? []
-				: Directory.EnumerateDirectories(path, searchPattern, searchOption);
-		}
+	/// <summary>
+	/// Retrieves the directories within the specified path matching the search pattern.
+	/// </summary>
+	/// <param name="path">The root directory to search.</param>
+	/// <param name="searchPattern">The search pattern.</param>
+	/// <param name="searchOption">Search option to determine whether to search subdirectories.</param>
+	/// <returns>An enumerable of matching directory paths.</returns>
+	public static IEnumerable<string> GetDirectories(string path,
+		string searchPattern = "*",
+		SearchOption searchOption = SearchOption.TopDirectoryOnly)
+	{
+		return !Directory.Exists(path)
+			? []
+			: Directory.EnumerateDirectories(path, searchPattern, searchOption);
+	}
 
-		/// <summary>
-		/// Gets the timestamp of the specified assembly.
-		/// </summary>
-		/// <param name="assembly">The assembly.</param>
-		/// <returns>The timestamp when the assembly was built.</returns>
-		public static DateTime GetTimestamp(this Assembly assembly)
-		{
-			if (assembly is null)
-				throw new ArgumentNullException(nameof(assembly));
+	/// <summary>
+	/// Gets the timestamp of the specified assembly.
+	/// </summary>
+	/// <param name="assembly">The assembly.</param>
+	/// <returns>The timestamp when the assembly was built.</returns>
+	public static DateTime GetTimestamp(this Assembly assembly)
+	{
+		if (assembly is null)
+			throw new ArgumentNullException(nameof(assembly));
 
-			return GetTimestamp(assembly.Location);
-		}
+		return GetTimestamp(assembly.Location);
+	}
 
-		/// <summary>
-		/// Gets the timestamp of the specified file.
-		/// </summary>
-		/// <param name="filePath">The file path.</param>
-		/// <returns>The timestamp representing when the file was built.</returns>
-		public static DateTime GetTimestamp(string filePath)
-		{
-			var b = new byte[2048];
+	/// <summary>
+	/// Gets the timestamp of the specified file.
+	/// </summary>
+	/// <param name="filePath">The file path.</param>
+	/// <returns>The timestamp representing when the file was built.</returns>
+	public static DateTime GetTimestamp(string filePath)
+	{
+		var b = new byte[2048];
 
-			using (var s = new FileStream(filePath, FileMode.Open, FileAccess.Read))
-				s.Read(b, 0, b.Length);
+		using (var s = new FileStream(filePath, FileMode.Open, FileAccess.Read))
+			s.Read(b, 0, b.Length);
 
-			const int peHeaderOffset = 60;
-			const int linkerTimestampOffset = 8;
-			var i = BitConverter.ToInt32(b, peHeaderOffset);
-			var secondsSince1970 = (long)BitConverter.ToInt32(b, i + linkerTimestampOffset);
+		const int peHeaderOffset = 60;
+		const int linkerTimestampOffset = 8;
+		var i = BitConverter.ToInt32(b, peHeaderOffset);
+		var secondsSince1970 = (long)BitConverter.ToInt32(b, i + linkerTimestampOffset);
 
-			return secondsSince1970.FromUnix().ToLocalTime();
-		}
+		return secondsSince1970.FromUnix().ToLocalTime();
+	}
 
-		/// <summary>
-		/// Determines whether the specified path represents a directory.
-		/// </summary>
-		/// <param name="path">The file or directory path.</param>
-		/// <returns>True if the path is a directory; otherwise, false.</returns>
-		public static bool IsDirectory(this string path) => File.GetAttributes(path).HasFlag(FileAttributes.Directory);
-
-		/// <summary>
-		/// Writes the specified bytes to a stream.
-		/// </summary>
-		/// <param name="stream">The output stream.</param>
-		/// <param name="bytes">The byte array.</param>
-		/// <param name="len">The number of bytes to write.</param>
-		/// <param name="pos">The position in the array to start writing from.</param>
-		public static void WriteBytes(this Stream stream, byte[] bytes, int len, int pos = 0)
-		{
-			stream.Write(bytes, pos, len);
-		}
+	/// <summary>
+	/// Determines whether the specified path represents a directory.
+	/// </summary>
+	/// <param name="path">The file or directory path.</param>
+	/// <returns>True if the path is a directory; otherwise, false.</returns>
+	public static bool IsDirectory(this string path) => File.GetAttributes(path).HasFlag(FileAttributes.Directory);
 
-		/// <summary>
-		/// Reads a specified number of bytes from a stream.
-		/// </summary>
-		/// <param name="stream">The input stream.</param>
-		/// <param name="buffer">The buffer to fill.</param>
-		/// <param name="len">The number of bytes to read.</param>
-		/// <param name="pos">The position in the buffer to start filling.</param>
-		/// <returns>The buffer containing the read bytes.</returns>
-		public static byte[] ReadBytes(this Stream stream, byte[] buffer, int len, int pos = 0)
-		{
-			var left = len;
+	/// <summary>
+	/// Writes the specified bytes to a stream.
+	/// </summary>
+	/// <param name="stream">The output stream.</param>
+	/// <param name="bytes">The byte array.</param>
+	/// <param name="len">The number of bytes to write.</param>
+	/// <param name="pos">The position in the array to start writing from.</param>
+	public static void WriteBytes(this Stream stream, byte[] bytes, int len, int pos = 0)
+	{
+		stream.Write(bytes, pos, len);
+	}
 
-			while (left > 0)
-			{
-				var read = stream.Read(buffer, pos + (len - left), left);
+	/// <summary>
+	/// Reads a specified number of bytes from a stream.
+	/// </summary>
+	/// <param name="stream">The input stream.</param>
+	/// <param name="buffer">The buffer to fill.</param>
+	/// <param name="len">The number of bytes to read.</param>
+	/// <param name="pos">The position in the buffer to start filling.</param>
+	/// <returns>The buffer containing the read bytes.</returns>
+	public static byte[] ReadBytes(this Stream stream, byte[] buffer, int len, int pos = 0)
+	{
+		var left = len;
 
-				if (read <= 0)
-					throw new IOException($"Stream returned '{read}' bytes.");
+		while (left > 0)
+		{
+			var read = stream.Read(buffer, pos + (len - left), left);
 
-				left -= read;
-			}
+			if (read <= 0)
+				throw new IOException($"Stream returned '{read}' bytes.");
 
-			return buffer;
+			left -= read;
 		}
 
-		/// <summary>
-		/// Reads a single byte from a stream.
-		/// </summary>
-		/// <param name="stream">The input stream.</param>
-		/// <param name="buffer">The buffer used for reading.</param>
-		/// <returns>The byte read from the stream.</returns>
-		public static byte ReadByteEx(this Stream stream, byte[] buffer)
-		{
-			return stream.ReadBytes(buffer, 1)[0];
-		}
+		return buffer;
+	}
 
-		/// <summary>
-		/// Writes a single byte to a stream.
-		/// </summary>
-		/// <param name="stream">The output stream.</param>
-		/// <param name="buffer">The buffer used for writing.</param>
-		/// <param name="value">The byte value to write.</param>
-		public static void WriteByteEx(this Stream stream, byte[] buffer, byte value)
-		{
-			buffer[0] = value;
-			stream.Write(buffer, 0, 1);
-		}
+	/// <summary>
+	/// Reads a single byte from a stream.
+	/// </summary>
+	/// <param name="stream">The input stream.</param>
+	/// <param name="buffer">The buffer used for reading.</param>
+	/// <returns>The byte read from the stream.</returns>
+	public static byte ReadByteEx(this Stream stream, byte[] buffer)
+	{
+		return stream.ReadBytes(buffer, 1)[0];
+	}
 
-		/// <summary>
-		/// Writes a short value to a stream with specified endianness.
-		/// </summary>
-		/// <param name="stream">The output stream.</param>
-		/// <param name="buffer">The buffer used for writing.</param>
-		/// <param name="value">The short value to write.</param>
-		/// <param name="isLittleEndian">Indicates if the value is in little-endian format.</param>
-		public static unsafe void WriteShort(this Stream stream, byte[] buffer, short value, bool isLittleEndian)
-		{
-			fixed (byte* b = buffer)
-				*((short*)b) = value;
+	/// <summary>
+	/// Writes a single byte to a stream.
+	/// </summary>
+	/// <param name="stream">The output stream.</param>
+	/// <param name="buffer">The buffer used for writing.</param>
+	/// <param name="value">The byte value to write.</param>
+	public static void WriteByteEx(this Stream stream, byte[] buffer, byte value)
+	{
+		buffer[0] = value;
+		stream.Write(buffer, 0, 1);
+	}
 
-			stream.WriteBytes(buffer.ChangeOrder(2, isLittleEndian), 2);
-		}
+	/// <summary>
+	/// Writes a short value to a stream with specified endianness.
+	/// </summary>
+	/// <param name="stream">The output stream.</param>
+	/// <param name="buffer">The buffer used for writing.</param>
+	/// <param name="value">The short value to write.</param>
+	/// <param name="isLittleEndian">Indicates if the value is in little-endian format.</param>
+	public static unsafe void WriteShort(this Stream stream, byte[] buffer, short value, bool isLittleEndian)
+	{
+		fixed (byte* b = buffer)
+			*((short*)b) = value;
 
-		/// <summary>
-		/// Reads a short value from a stream with specified endianness.
-		/// </summary>
-		/// <param name="stream">The input stream.</param>
-		/// <param name="buffer">The buffer used for reading.</param>
-		/// <param name="isLittleEndian">Indicates if the value is in little-endian format.</param>
-		/// <returns>The short value read.</returns>
-		public static short ReadShort(this Stream stream, byte[] buffer, bool isLittleEndian)
-		{
-			return BitConverter.ToInt16(stream.ReadBytes(buffer, 2).ChangeOrder(2, isLittleEndian), 0);
-		}
+		stream.WriteBytes(buffer.ChangeOrder(2, isLittleEndian), 2);
+	}
 
-		/// <summary>
-		/// Writes an unsigned short value to a stream with specified endianness.
-		/// </summary>
-		/// <param name="stream">The output stream.</param>
-		/// <param name="buffer">The buffer used for writing.</param>
-		/// <param name="value">The unsigned short value to write.</param>
-		/// <param name="isLittleEndian">Indicates if the value is in little-endian format.</param>
-		[CLSCompliant(false)]
-		public static unsafe void WriteUShort(this Stream stream, byte[] buffer, ushort value, bool isLittleEndian)
-		{
-			fixed (byte* b = buffer)
-				*((ushort*)b) = value;
+	/// <summary>
+	/// Reads a short value from a stream with specified endianness.
+	/// </summary>
+	/// <param name="stream">The input stream.</param>
+	/// <param name="buffer">The buffer used for reading.</param>
+	/// <param name="isLittleEndian">Indicates if the value is in little-endian format.</param>
+	/// <returns>The short value read.</returns>
+	public static short ReadShort(this Stream stream, byte[] buffer, bool isLittleEndian)
+	{
+		return BitConverter.ToInt16(stream.ReadBytes(buffer, 2).ChangeOrder(2, isLittleEndian), 0);
+	}
 
-			stream.WriteBytes(buffer.ChangeOrder(2, isLittleEndian), 2);
-		}
+	/// <summary>
+	/// Writes an unsigned short value to a stream with specified endianness.
+	/// </summary>
+	/// <param name="stream">The output stream.</param>
+	/// <param name="buffer">The buffer used for writing.</param>
+	/// <param name="value">The unsigned short value to write.</param>
+	/// <param name="isLittleEndian">Indicates if the value is in little-endian format.</param>
+	[CLSCompliant(false)]
+	public static unsafe void WriteUShort(this Stream stream, byte[] buffer, ushort value, bool isLittleEndian)
+	{
+		fixed (byte* b = buffer)
+			*((ushort*)b) = value;
 
-		/// <summary>
-		/// Reads an unsigned short value from a stream with specified endianness.
-		/// </summary>
-		/// <param name="stream">The input stream.</param>
-		/// <param name="buffer">The buffer used for reading.</param>
-		/// <param name="isLittleEndian">Indicates if the value is in little-endian format.</param>
-		/// <returns>The unsigned short value read.</returns>
-		[CLSCompliant(false)]
-		public static ushort ReadUShort(this Stream stream, byte[] buffer, bool isLittleEndian)
-		{
-			return BitConverter.ToUInt16(stream.ReadBytes(buffer, 2).ChangeOrder(2, isLittleEndian), 0);
-		}
+		stream.WriteBytes(buffer.ChangeOrder(2, isLittleEndian), 2);
+	}
 
-		/// <summary>
-		/// Writes an integer value to a stream with specified endianness.
-		/// </summary>
-		/// <param name="stream">The output stream.</param>
-		/// <param name="buffer">The buffer used for writing.</param>
-		/// <param name="value">The integer value to write.</param>
-		/// <param name="isLittleEndian">Indicates if the value is in little-endian format.</param>
-		public static unsafe void WriteInt(this Stream stream, byte[] buffer, int value, bool isLittleEndian)
-		{
-			fixed (byte* b = buffer)
-				*((int*)b) = value;
+	/// <summary>
+	/// Reads an unsigned short value from a stream with specified endianness.
+	/// </summary>
+	/// <param name="stream">The input stream.</param>
+	/// <param name="buffer">The buffer used for reading.</param>
+	/// <param name="isLittleEndian">Indicates if the value is in little-endian format.</param>
+	/// <returns>The unsigned short value read.</returns>
+	[CLSCompliant(false)]
+	public static ushort ReadUShort(this Stream stream, byte[] buffer, bool isLittleEndian)
+	{
+		return BitConverter.ToUInt16(stream.ReadBytes(buffer, 2).ChangeOrder(2, isLittleEndian), 0);
+	}
 
-			stream.WriteBytes(buffer.ChangeOrder(4, isLittleEndian), 4);
-		}
+	/// <summary>
+	/// Writes an integer value to a stream with specified endianness.
+	/// </summary>
+	/// <param name="stream">The output stream.</param>
+	/// <param name="buffer">The buffer used for writing.</param>
+	/// <param name="value">The integer value to write.</param>
+	/// <param name="isLittleEndian">Indicates if the value is in little-endian format.</param>
+	public static unsafe void WriteInt(this Stream stream, byte[] buffer, int value, bool isLittleEndian)
+	{
+		fixed (byte* b = buffer)
+			*((int*)b) = value;
 
-		/// <summary>
-		/// Reads an integer value from a stream with specified endianness.
-		/// </summary>
-		/// <param name="stream">The input stream.</param>
-		/// <param name="buffer">The buffer used for reading.</param>
-		/// <param name="isLittleEndian">Indicates if the value is in little-endian format.</param>
-		/// <returns>The integer value read.</returns>
-		public static int ReadInt(this Stream stream, byte[] buffer, bool isLittleEndian)
-		{
-			return BitConverter.ToInt32(stream.ReadBytes(buffer, 4).ChangeOrder(4, isLittleEndian), 0);
-		}
+		stream.WriteBytes(buffer.ChangeOrder(4, isLittleEndian), 4);
+	}
 
-		/// <summary>
-		/// Writes an unsigned integer value to a stream with specified endianness.
-		/// </summary>
-		/// <param name="stream">The output stream.</param>
-		/// <param name="buffer">The buffer used for writing.</param>
-		/// <param name="value">The unsigned integer value to write.</param>
-		/// <param name="isLittleEndian">Indicates if the value is in little-endian format.</param>
-		[CLSCompliant(false)]
-		public static unsafe void WriteUInt(this Stream stream, byte[] buffer, uint value, bool isLittleEndian)
-		{
-			fixed (byte* b = buffer)
-				*((uint*)b) = value;
+	/// <summary>
+	/// Reads an integer value from a stream with specified endianness.
+	/// </summary>
+	/// <param name="stream">The input stream.</param>
+	/// <param name="buffer">The buffer used for reading.</param>
+	/// <param name="isLittleEndian">Indicates if the value is in little-endian format.</param>
+	/// <returns>The integer value read.</returns>
+	public static int ReadInt(this Stream stream, byte[] buffer, bool isLittleEndian)
+	{
+		return BitConverter.ToInt32(stream.ReadBytes(buffer, 4).ChangeOrder(4, isLittleEndian), 0);
+	}
 
-			stream.WriteBytes(buffer.ChangeOrder(4, isLittleEndian), 4);
-		}
+	/// <summary>
+	/// Writes an unsigned integer value to a stream with specified endianness.
+	/// </summary>
+	/// <param name="stream">The output stream.</param>
+	/// <param name="buffer">The buffer used for writing.</param>
+	/// <param name="value">The unsigned integer value to write.</param>
+	/// <param name="isLittleEndian">Indicates if the value is in little-endian format.</param>
+	[CLSCompliant(false)]
+	public static unsafe void WriteUInt(this Stream stream, byte[] buffer, uint value, bool isLittleEndian)
+	{
+		fixed (byte* b = buffer)
+			*((uint*)b) = value;
 
-		/// <summary>
-		/// Reads an unsigned integer value from a stream with specified endianness.
-		/// </summary>
-		/// <param name="stream">The input stream.</param>
-		/// <param name="buffer">The buffer used for reading.</param>
-		/// <param name="isLittleEndian">Indicates if the value is in little-endian format.</param>
-		/// <returns>The unsigned integer value read.</returns>
-		[CLSCompliant(false)]
-		public static uint ReadUInt(this Stream stream, byte[] buffer, bool isLittleEndian)
-		{
-			return BitConverter.ToUInt32(stream.ReadBytes(buffer, 4).ChangeOrder(4, isLittleEndian), 0);
-		}
+		stream.WriteBytes(buffer.ChangeOrder(4, isLittleEndian), 4);
+	}
 
-		/// <summary>
-		/// Writes a long value to a stream with specified endianness.
-		/// </summary>
-		/// <param name="stream">The output stream.</param>
-		/// <param name="buffer">The buffer used for writing.</param>
-		/// <param name="value">The long value to write.</param>
-		/// <param name="isLittleEndian">Indicates if the value is in little-endian format.</param>
-		/// <param name="len">The length in bytes to write (default is 8).</param>
-		public static unsafe void WriteLong(this Stream stream, byte[] buffer, long value, bool isLittleEndian, int len = 8)
-		{
-			fixed (byte* b = buffer)
-				*((long*)b) = value;
+	/// <summary>
+	/// Reads an unsigned integer value from a stream with specified endianness.
+	/// </summary>
+	/// <param name="stream">The input stream.</param>
+	/// <param name="buffer">The buffer used for reading.</param>
+	/// <param name="isLittleEndian">Indicates if the value is in little-endian format.</param>
+	/// <returns>The unsigned integer value read.</returns>
+	[CLSCompliant(false)]
+	public static uint ReadUInt(this Stream stream, byte[] buffer, bool isLittleEndian)
+	{
+		return BitConverter.ToUInt32(stream.ReadBytes(buffer, 4).ChangeOrder(4, isLittleEndian), 0);
+	}
 
-			stream.WriteBytes(buffer.ChangeOrder(len, isLittleEndian), 8);
-		}
+	/// <summary>
+	/// Writes a long value to a stream with specified endianness.
+	/// </summary>
+	/// <param name="stream">The output stream.</param>
+	/// <param name="buffer">The buffer used for writing.</param>
+	/// <param name="value">The long value to write.</param>
+	/// <param name="isLittleEndian">Indicates if the value is in little-endian format.</param>
+	/// <param name="len">The length in bytes to write (default is 8).</param>
+	public static unsafe void WriteLong(this Stream stream, byte[] buffer, long value, bool isLittleEndian, int len = 8)
+	{
+		fixed (byte* b = buffer)
+			*((long*)b) = value;
 
-		/// <summary>
-		/// Reads a long value from a stream with specified endianness.
-		/// </summary>
-		/// <param name="stream">The input stream.</param>
-		/// <param name="buffer">The buffer used for reading.</param>
-		/// <param name="isLittleEndian">Indicates if the value is in little-endian format.</param>
-		/// <param name="len">The length in bytes to read (default is 8).</param>
-		/// <returns>The long value read.</returns>
-		public static long ReadLong(this Stream stream, byte[] buffer, bool isLittleEndian, int len = 8)
-		{
-			return BitConverter.ToInt64(stream.ReadBytes(buffer, len).ChangeOrder(len, isLittleEndian), 0);
-		}
+		stream.WriteBytes(buffer.ChangeOrder(len, isLittleEndian), 8);
+	}
 
-		/// <summary>
-		/// Writes an unsigned long value to a stream with specified endianness.
-		/// </summary>
-		/// <param name="stream">The output stream.</param>
-		/// <param name="buffer">The buffer used for writing.</param>
-		/// <param name="value">The unsigned long value to write.</param>
-		/// <param name="isLittleEndian">Indicates if the value is in little-endian format.</param>
-		/// <param name="len">The length in bytes to write (default is 8).</param>
-		[CLSCompliant(false)]
-		public static unsafe void WriteULong(this Stream stream, byte[] buffer, ulong value, bool isLittleEndian, int len = 8)
-		{
-			fixed (byte* b = buffer)
-				*((ulong*)b) = value;
+	/// <summary>
+	/// Reads a long value from a stream with specified endianness.
+	/// </summary>
+	/// <param name="stream">The input stream.</param>
+	/// <param name="buffer">The buffer used for reading.</param>
+	/// <param name="isLittleEndian">Indicates if the value is in little-endian format.</param>
+	/// <param name="len">The length in bytes to read (default is 8).</param>
+	/// <returns>The long value read.</returns>
+	public static long ReadLong(this Stream stream, byte[] buffer, bool isLittleEndian, int len = 8)
+	{
+		return BitConverter.ToInt64(stream.ReadBytes(buffer, len).ChangeOrder(len, isLittleEndian), 0);
+	}
 
-			stream.WriteBytes(buffer.ChangeOrder(len, isLittleEndian), 8);
-		}
+	/// <summary>
+	/// Writes an unsigned long value to a stream with specified endianness.
+	/// </summary>
+	/// <param name="stream">The output stream.</param>
+	/// <param name="buffer">The buffer used for writing.</param>
+	/// <param name="value">The unsigned long value to write.</param>
+	/// <param name="isLittleEndian">Indicates if the value is in little-endian format.</param>
+	/// <param name="len">The length in bytes to write (default is 8).</param>
+	[CLSCompliant(false)]
+	public static unsafe void WriteULong(this Stream stream, byte[] buffer, ulong value, bool isLittleEndian, int len = 8)
+	{
+		fixed (byte* b = buffer)
+			*((ulong*)b) = value;
 
-		/// <summary>
-		/// Reads an unsigned long value from a stream with specified endianness.
-		/// </summary>
-		/// <param name="stream">The input stream.</param>
-		/// <param name="buffer">The buffer used for reading.</param>
-		/// <param name="isLittleEndian">Indicates if the value is in little-endian format.</param>
-		/// <param name="len">The length in bytes to read (default is 8).</param>
-		/// <returns>The unsigned long value read.</returns>
-		[CLSCompliant(false)]
-		public static ulong ReadULong(this Stream stream, byte[] buffer, bool isLittleEndian, int len = 8)
-		{
-			return BitConverter.ToUInt64(stream.ReadBytes(buffer, len).ChangeOrder(4, isLittleEndian), 0);
-		}
+		stream.WriteBytes(buffer.ChangeOrder(len, isLittleEndian), 8);
+	}
 
+	/// <summary>
+	/// Reads an unsigned long value from a stream with specified endianness.
+	/// </summary>
+	/// <param name="stream">The input stream.</param>
+	/// <param name="buffer">The buffer used for reading.</param>
+	/// <param name="isLittleEndian">Indicates if the value is in little-endian format.</param>
+	/// <param name="len">The length in bytes to read (default is 8).</param>
+	/// <returns>The unsigned long value read.</returns>
+	[CLSCompliant(false)]
+	public static ulong ReadULong(this Stream stream, byte[] buffer, bool isLittleEndian, int len = 8)
+	{
+		return BitConverter.ToUInt64(stream.ReadBytes(buffer, len).ChangeOrder(4, isLittleEndian), 0);
+	}
 
-		/// <summary>
-		/// Copies a specified number of bytes synchronously from the source stream to the destination stream.
-		/// </summary>
-		/// <param name="source">The source stream to copy from.</param>
-		/// <param name="destination">The destination stream to copy to.</param>
-		/// <param name="count">The number of bytes to copy.</param>
-		public static void CopySync(this Stream source, Stream destination, int count)
-		{
-			if (source is null)
-				throw new ArgumentNullException(nameof(source));
 
-			if (destination is null)
-				throw new ArgumentNullException(nameof(destination));
+	/// <summary>
+	/// Copies a specified number of bytes synchronously from the source stream to the destination stream.
+	/// </summary>
+	/// <param name="source">The source stream to copy from.</param>
+	/// <param name="destination">The destination stream to copy to.</param>
+	/// <param name="count">The number of bytes to copy.</param>
+	public static void CopySync(this Stream source, Stream destination, int count)
+	{
+		if (source is null)
+			throw new ArgumentNullException(nameof(source));
 
-			if (count < 0)
-				throw new ArgumentOutOfRangeException(nameof(count), count, "Invalid value.");
+		if (destination is null)
+			throw new ArgumentNullException(nameof(destination));
 
-			if (count == 0)
-				return;
+		if (count < 0)
+			throw new ArgumentOutOfRangeException(nameof(count), count, "Invalid value.");
 
-			var buffer = new byte[count.Min(short.MaxValue)];
-			int read;
+		if (count == 0)
+			return;
 
-			while (count > 0 && (read = source.Read(buffer, 0, buffer.Length.Min(count))) > 0)
-			{
-				destination.Write(buffer, 0, read);
-				count -= read;
-			}
-		}
+		var buffer = new byte[count.Min(short.MaxValue)];
+		int read;
 
-		/// <summary>
-		/// Reads exactly the specified number of bytes from the stream into a byte array.
-		/// </summary>
-		/// <param name="stream">The stream to read from.</param>
-		/// <param name="size">The number of bytes to read.</param>
-		/// <returns>A byte array containing the data read from the stream.</returns>
-		public static byte[] ReadBuffer(this Stream stream, int size)
+		while (count > 0 && (read = source.Read(buffer, 0, buffer.Length.Min(count))) > 0)
 		{
-			if (stream is null)
-				throw new ArgumentNullException(nameof(stream));
+			destination.Write(buffer, 0, read);
+			count -= read;
+		}
+	}
+
+	/// <summary>
+	/// Reads exactly the specified number of bytes from the stream into a byte array.
+	/// </summary>
+	/// <param name="stream">The stream to read from.</param>
+	/// <param name="size">The number of bytes to read.</param>
+	/// <returns>A byte array containing the data read from the stream.</returns>
+	public static byte[] ReadBuffer(this Stream stream, int size)
+	{
+		if (stream is null)
+			throw new ArgumentNullException(nameof(stream));
+
+		if (size < 0)
+			throw new ArgumentOutOfRangeException(nameof(size), $"Size has negative value '{size}'.");
 
-			if (size < 0)
-				throw new ArgumentOutOfRangeException(nameof(size), $"Size has negative value '{size}'.");
+		var buffer = new byte[size];
 
-			var buffer = new byte[size];
+		if (size == 1)
+		{
+			var b = stream.ReadByte();
+
+			if (b == -1)
+				throw new ArgumentException($"Insufficient stream size '{size}'.", nameof(stream));
 
-			if (size == 1)
+			buffer[0] = (byte)b;
+		}
+		else
+		{
+			var offset = 0;
+			do
 			{
-				var b = stream.ReadByte();
+				var readBytes = stream.Read(buffer, offset, size - offset);
 
-				if (b == -1)
+				if (readBytes == 0)
 					throw new ArgumentException($"Insufficient stream size '{size}'.", nameof(stream));
 
-				buffer[0] = (byte)b;
+				offset += readBytes;
 			}
-			else
-			{
-				var offset = 0;
-				do
-				{
-					var readBytes = stream.Read(buffer, offset, size - offset);
+			while (offset < size);
+		}
 
-					if (readBytes == 0)
-						throw new ArgumentException($"Insufficient stream size '{size}'.", nameof(stream));
+		return buffer;
+	}
 
-					offset += readBytes;
-				}
-				while (offset < size);
-			}
+	/// <summary>
+	/// Enumerates the lines in the stream using the specified encoding.
+	/// </summary>
+	/// <param name="stream">The stream to read lines from.</param>
+	/// <param name="encoding">The encoding to use when reading the stream. Defaults to UTF8 if null.</param>
+	/// <param name="leaveOpen">Indicates whether to leave the stream open after reading.</param>
+	/// <returns>An enumerable collection of strings, each representing a line from the stream.</returns>
+	public static IEnumerable<string> EnumerateLines(this Stream stream, Encoding encoding = null, bool leaveOpen = true)
+	{
+		if (stream is null)
+			throw new ArgumentNullException(nameof(stream));
 
-			return buffer;
-		}
+		using var sr = new StreamReader(stream, encoding ?? Encoding.UTF8, true, -1, leaveOpen);
 
-		/// <summary>
-		/// Enumerates the lines in the stream using the specified encoding.
-		/// </summary>
-		/// <param name="stream">The stream to read lines from.</param>
-		/// <param name="encoding">The encoding to use when reading the stream. Defaults to UTF8 if null.</param>
-		/// <param name="leaveOpen">Indicates whether to leave the stream open after reading.</param>
-		/// <returns>An enumerable collection of strings, each representing a line from the stream.</returns>
-		public static IEnumerable<string> EnumerateLines(this Stream stream, Encoding encoding = null, bool leaveOpen = true)
-		{
-			if (stream is null)
-				throw new ArgumentNullException(nameof(stream));
+		while (!sr.EndOfStream)
+			yield return sr.ReadLine();
+	}
 
-			using var sr = new StreamReader(stream, encoding ?? Encoding.UTF8, true, -1, leaveOpen);
+	/// <summary>
+	/// Writes an extended representation of the provided object to the stream, prefixing its length.
+	/// </summary>
+	/// <param name="stream">The stream to write to.</param>
+	/// <param name="value">The object to write.</param>
+	public static void WriteEx(this Stream stream, object value)
+	{
+		if (stream is null)
+			throw new ArgumentNullException(nameof(stream));
 
-			while (!sr.EndOfStream)
-				yield return sr.ReadLine();
-		}
+		if (value is null)
+			throw new ArgumentNullException(nameof(value));
 
-		/// <summary>
-		/// Writes an extended representation of the provided object to the stream, prefixing its length.
-		/// </summary>
-		/// <param name="stream">The stream to write to.</param>
-		/// <param name="value">The object to write.</param>
-		public static void WriteEx(this Stream stream, object value)
-		{
-			if (stream is null)
-				throw new ArgumentNullException(nameof(stream));
+		if (value is Stream s)
+			stream.WriteEx((int)s.Length);
+		else if (value is byte[] a1)
+			stream.WriteEx(a1.Length);
+		else if (value is string str)
+			stream.WriteEx(str.Length);
 
-			if (value is null)
-				throw new ArgumentNullException(nameof(value));
+		stream.WriteRaw(value);
+	}
 
-			if (value is Stream s)
-				stream.WriteEx((int)s.Length);
-			else if (value is byte[] a1)
-				stream.WriteEx(a1.Length);
-			else if (value is string str)
-				stream.WriteEx(str.Length);
+	/// <summary>
+	/// Writes the raw byte representation of the provided object to the stream.
+	/// </summary>
+	/// <param name="stream">The stream to write to.</param>
+	/// <param name="value">The object to write. Its byte representation will be determined.</param>
+	public static void WriteRaw(this Stream stream, object value)
+	{
+		stream.WriteRaw(value.To<byte[]>());
+	}
 
-			stream.WriteRaw(value);
-		}
+	/// <summary>
+	/// Writes a raw byte array to the stream.
+	/// </summary>
+	/// <param name="stream">The stream to write to.</param>
+	/// <param name="buffer">The byte array to write.</param>
+	public static void WriteRaw(this Stream stream, byte[] buffer)
+	{
+		if (stream is null)
+			throw new ArgumentNullException(nameof(stream));
 
-		/// <summary>
-		/// Writes the raw byte representation of the provided object to the stream.
-		/// </summary>
-		/// <param name="stream">The stream to write to.</param>
-		/// <param name="value">The object to write. Its byte representation will be determined.</param>
-		public static void WriteRaw(this Stream stream, object value)
-		{
-			stream.WriteRaw(value.To<byte[]>());
-		}
+		if (buffer is null)
+			throw new ArgumentNullException(nameof(buffer));
 
-		/// <summary>
-		/// Writes a raw byte array to the stream.
-		/// </summary>
-		/// <param name="stream">The stream to write to.</param>
-		/// <param name="buffer">The byte array to write.</param>
-		public static void WriteRaw(this Stream stream, byte[] buffer)
-		{
-			if (stream is null)
-				throw new ArgumentNullException(nameof(stream));
+		stream.Write(buffer, 0, buffer.Length);
+	}
 
-			if (buffer is null)
-				throw new ArgumentNullException(nameof(buffer));
+	#region Read
 
-			stream.Write(buffer, 0, buffer.Length);
-		}
+	/// <summary>
+	/// Reads an object of type T from the stream.
+	/// </summary>
+	/// <typeparam name="T">The type of object to read.</typeparam>
+	/// <param name="stream">The stream to read from.</param>
+	/// <returns>The object read from the stream.</returns>
+	public static T Read<T>(this Stream stream)
+	{
+		return (T)stream.Read(typeof(T));
+	}
 
-		#region Read
+	/// <summary>
+	/// Reads an object of the specified type from the stream.
+	/// </summary>
+	/// <param name="stream">The stream to read from.</param>
+	/// <param name="type">The type of object to read.</param>
+	/// <returns>The object read from the stream.</returns>
+	public static object Read(this Stream stream, Type type)
+	{
+		int size;
 
-		/// <summary>
-		/// Reads an object of type T from the stream.
-		/// </summary>
-		/// <typeparam name="T">The type of object to read.</typeparam>
-		/// <param name="stream">The stream to read from.</param>
-		/// <returns>The object read from the stream.</returns>
-		public static T Read<T>(this Stream stream)
-		{
-			return (T)stream.Read(typeof(T));
-		}
+		if (type == typeof(byte[]) || type == typeof(string) || type == typeof(Stream))
+			size = stream.Read<int>();
+		else
+			size = type.SizeOf();
 
-		/// <summary>
-		/// Reads an object of the specified type from the stream.
-		/// </summary>
-		/// <param name="stream">The stream to read from.</param>
-		/// <param name="type">The type of object to read.</param>
-		/// <returns>The object read from the stream.</returns>
-		public static object Read(this Stream stream, Type type)
-		{
-			int size;
+		return stream.Read(type, size);
+	}
 
-			if (type == typeof(byte[]) || type == typeof(string) || type == typeof(Stream))
-				size = stream.Read<int>();
-			else
-				size = type.SizeOf();
+	/// <summary>
+	/// Reads an object of the specified type from the stream using the provided size.
+	/// </summary>
+	/// <param name="stream">The stream to read from.</param>
+	/// <param name="type">The type of object to read.</param>
+	/// <param name="size">The size in bytes to read.</param>
+	/// <returns>The object read from the stream.</returns>
+	public static object Read(this Stream stream, Type type, int size)
+	{
+		if (stream is null)
+			throw new ArgumentNullException(nameof(stream));
 
-			return stream.Read(type, size);
-		}
+		if (type is null)
+			throw new ArgumentNullException(nameof(type));
 
-		/// <summary>
-		/// Reads an object of the specified type from the stream using the provided size.
-		/// </summary>
-		/// <param name="stream">The stream to read from.</param>
-		/// <param name="type">The type of object to read.</param>
-		/// <param name="size">The size in bytes to read.</param>
-		/// <returns>The object read from the stream.</returns>
-		public static object Read(this Stream stream, Type type, int size)
-		{
-			if (stream is null)
-				throw new ArgumentNullException(nameof(stream));
+		if (size < 0)
+			throw new ArgumentOutOfRangeException(nameof(size), $"Size has negative value '{size}'.");
 
-			if (type is null)
-				throw new ArgumentNullException(nameof(type));
+		if (size == 0 && !(type == typeof(string) || type == typeof(byte[]) || type == typeof(Stream)))
+			throw new ArgumentOutOfRangeException(nameof(size), "Size has zero value.");
 
-			if (size < 0)
-				throw new ArgumentOutOfRangeException(nameof(size), $"Size has negative value '{size}'.");
+		if (type == typeof(string))
+			size *= 2;
 
-			if (size == 0 && !(type == typeof(string) || type == typeof(byte[]) || type == typeof(Stream)))
-				throw new ArgumentOutOfRangeException(nameof(size), "Size has zero value.");
+		if (size > int.MaxValue / 10)
+			throw new ArgumentOutOfRangeException(nameof(size), $"Size has too big value {size}.");
 
-			if (type == typeof(string))
-				size *= 2;
+		var buffer = size > 0 ? stream.ReadBuffer(size) : [];
 
-			if (size > int.MaxValue / 10)
-				throw new ArgumentOutOfRangeException(nameof(size), $"Size has too big value {size}.");
+		if (type == typeof(byte[]))
+			return buffer;
+		else
+			return buffer.To(type);
+	}
 
-			var buffer = size > 0 ? stream.ReadBuffer(size) : [];
+	#endregion
 
-			if (type == typeof(byte[]))
-				return buffer;
-			else
-				return buffer.To(type);
-		}
+	/// <summary>
+	/// Returns the size in bytes of an unmanaged type T.
+	/// </summary>
+	/// <typeparam name="T">The unmanaged type.</typeparam>
+	/// <returns>The size in bytes of the specified type.</returns>
+	public static int SizeOf<T>()
+	{
+		return SizeOf(typeof(T));
+	}
 
-		#endregion
+	/// <summary>
+	/// Returns the size in bytes of the specified unmanaged type.
+	/// </summary>
+	/// <param name="type">The type whose size is to be computed.</param>
+	/// <returns>The size in bytes of the specified type.</returns>
+	public static int SizeOf(this Type type)
+	{
+		if (type.IsDateTime())
+			type = typeof(long);
+		else if (type == typeof(TimeSpan))
+			type = typeof(long);
+		else if (type.IsEnum())
+			type = type.GetEnumBaseType();
+		else if (type == typeof(bool))
+			type = typeof(byte);
+		else if (type == typeof(char))
+			type = typeof(short);
+
+		return Marshal.SizeOf(type);
+	}
 
-		/// <summary>
-		/// Returns the size in bytes of an unmanaged type T.
-		/// </summary>
-		/// <typeparam name="T">The unmanaged type.</typeparam>
-		/// <returns>The size in bytes of the specified type.</returns>
-		public static int SizeOf<T>()
-		{
-			return SizeOf(typeof(T));
-		}
+	/// <summary>
+	/// Saves the content of the stream to a file specified by fileName.
+	/// </summary>
+	/// <param name="stream">The stream whose contents to save.</param>
+	/// <param name="fileName">The file path to save the stream's contents to.</param>
+	/// <returns>The original stream.</returns>
+	public static Stream Save(this Stream stream, string fileName)
+	{
+		var pos = stream.CanSeek ? stream.Position : 0;
 
-		/// <summary>
-		/// Returns the size in bytes of the specified unmanaged type.
-		/// </summary>
-		/// <param name="type">The type whose size is to be computed.</param>
-		/// <returns>The size in bytes of the specified type.</returns>
-		public static int SizeOf(this Type type)
-		{
-			if (type.IsDateTime())
-				type = typeof(long);
-			else if (type == typeof(TimeSpan))
-				type = typeof(long);
-			else if (type.IsEnum())
-				type = type.GetEnumBaseType();
-			else if (type == typeof(bool))
-				type = typeof(byte);
-			else if (type == typeof(char))
-				type = typeof(short);
-
-			return Marshal.SizeOf(type);
-		}
+		using (var file = File.Create(fileName))
+			stream.CopyTo(file);
 
-		/// <summary>
-		/// Saves the content of the stream to a file specified by fileName.
-		/// </summary>
-		/// <param name="stream">The stream whose contents to save.</param>
-		/// <param name="fileName">The file path to save the stream's contents to.</param>
-		/// <returns>The original stream.</returns>
-		public static Stream Save(this Stream stream, string fileName)
-		{
-			var pos = stream.CanSeek ? stream.Position : 0;
+		if (stream.CanSeek)
+			stream.Position = pos;
 
-			using (var file = File.Create(fileName))
-				stream.CopyTo(file);
+		return stream;
+	}
 
-			if (stream.CanSeek)
-				stream.Position = pos;
+	/// <summary>
+	/// Saves the byte array to a file specified by fileName.
+	/// </summary>
+	/// <param name="data">The byte array to save.</param>
+	/// <param name="fileName">The file path to save the data to.</param>
+	/// <returns>The original byte array.</returns>
+	public static byte[] Save(this byte[] data, string fileName)
+	{
+		data.To<Stream>().Save(fileName);
+		return data;
+	}
 
-			return stream;
-		}
+	/// <summary>
+	/// Attempts to save the byte array to a file and handles any exceptions using the provided errorHandler.
+	/// </summary>
+	/// <param name="data">The byte array to save.</param>
+	/// <param name="fileName">The file path to save the data to.</param>
+	/// <param name="errorHandler">The action to handle exceptions.</param>
+	/// <returns>True if the save operation was successful; otherwise, false.</returns>
+	public static bool TrySave(this byte[] data, string fileName, Action<Exception> errorHandler)
+	{
+		if (errorHandler is null)
+			throw new ArgumentNullException(nameof(errorHandler));
 
-		/// <summary>
-		/// Saves the byte array to a file specified by fileName.
-		/// </summary>
-		/// <param name="data">The byte array to save.</param>
-		/// <param name="fileName">The file path to save the data to.</param>
-		/// <returns>The original byte array.</returns>
-		public static byte[] Save(this byte[] data, string fileName)
+		try
 		{
 			data.To<Stream>().Save(fileName);
-			return data;
-		}
-
-		/// <summary>
-		/// Attempts to save the byte array to a file and handles any exceptions using the provided errorHandler.
-		/// </summary>
-		/// <param name="data">The byte array to save.</param>
-		/// <param name="fileName">The file path to save the data to.</param>
-		/// <param name="errorHandler">The action to handle exceptions.</param>
-		/// <returns>True if the save operation was successful; otherwise, false.</returns>
-		public static bool TrySave(this byte[] data, string fileName, Action<Exception> errorHandler)
-		{
-			if (errorHandler is null)
-				throw new ArgumentNullException(nameof(errorHandler));
-
-			try
-			{
-				data.To<Stream>().Save(fileName);
-				return true;
-			}
-			catch (Exception e)
-			{
-				errorHandler(e);
-				return false;
-			}
+			return true;
 		}
-
-		/// <summary>
-		/// Truncates the underlying stream used by the StreamWriter by clearing its content.
-		/// </summary>
-		/// <param name="writer">The StreamWriter whose stream is to be truncated.</param>
-		public static void Truncate(this StreamWriter writer)
+		catch (Exception e)
 		{
-			if (writer is null)
-				throw new ArgumentNullException(nameof(writer));
-
-			writer.Flush();
-			writer.BaseStream.SetLength(0);
+			errorHandler(e);
+			return false;
 		}
+	}
 
-		/// <summary>
-		/// Gets the actual buffer of the MemoryStream that contains the written data.
-		/// </summary>
-		/// <param name="stream">The MemoryStream to retrieve the buffer from.</param>
-		/// <returns>An ArraySegment containing the actual data from the MemoryStream.</returns>
-		public static ArraySegment<byte> GetActualBuffer(this MemoryStream stream)
-		{
-			if (stream is null)
-				throw new ArgumentNullException(nameof(stream));
+	/// <summary>
+	/// Truncates the underlying stream used by the StreamWriter by clearing its content.
+	/// </summary>
+	/// <param name="writer">The StreamWriter whose stream is to be truncated.</param>
+	public static void Truncate(this StreamWriter writer)
+	{
+		if (writer is null)
+			throw new ArgumentNullException(nameof(writer));
 
-			return new(stream.GetBuffer(), 0, (int)stream.Position);
-		}
+		writer.Flush();
+		writer.BaseStream.SetLength(0);
+	}
 
-		/// <summary>
-		/// Checks whether the directory contains files or subdirectories that contain files.
-		/// </summary>
-		/// <param name="path">The directory path to check.</param>
-		/// <returns>True if the directory contains any files; otherwise, false.</returns>
-		public static bool CheckDirContainFiles(string path)
-		{
-			return
-				Directory.Exists(path) &&
-				(Directory.GetFiles(path).Any() || Directory.GetDirectories(path).Any(CheckDirContainFiles));
-		}
+	/// <summary>
+	/// Gets the actual buffer of the MemoryStream that contains the written data.
+	/// </summary>
+	/// <param name="stream">The MemoryStream to retrieve the buffer from.</param>
+	/// <returns>An ArraySegment containing the actual data from the MemoryStream.</returns>
+	public static ArraySegment<byte> GetActualBuffer(this MemoryStream stream)
+	{
+		if (stream is null)
+			throw new ArgumentNullException(nameof(stream));
 
-		/// <summary>
-		/// Checks whether the directory contains any files or subdirectories.
-		/// </summary>
-		/// <param name="path">The directory path to check.</param>
-		/// <returns>True if the directory contains any entries; otherwise, false.</returns>
-		public static bool CheckDirContainsAnything(string path)
-		{
-			if (!Directory.Exists(path))
-				return false;
+		return new(stream.GetBuffer(), 0, (int)stream.Position);
+	}
 
-			return Directory.EnumerateFileSystemEntries(path).Any();
-		}
+	/// <summary>
+	/// Checks whether the directory contains files or subdirectories that contain files.
+	/// </summary>
+	/// <param name="path">The directory path to check.</param>
+	/// <returns>True if the directory contains any files; otherwise, false.</returns>
+	public static bool CheckDirContainFiles(string path)
+	{
+		return
+			Directory.Exists(path) &&
+			(Directory.GetFiles(path).Any() || Directory.GetDirectories(path).Any(CheckDirContainFiles));
+	}
 
-		/// <summary>
-		/// Determines whether the file specified by the path is locked by another process.
-		/// </summary>
-		/// <param name="path">The path to the file to check.</param>
-		/// <returns>True if the file is locked; otherwise, false.</returns>
-		public static bool IsFileLocked(string path)
-		{
-			var info = new FileInfo(path);
+	/// <summary>
+	/// Checks whether the directory contains any files or subdirectories.
+	/// </summary>
+	/// <param name="path">The directory path to check.</param>
+	/// <returns>True if the directory contains any entries; otherwise, false.</returns>
+	public static bool CheckDirContainsAnything(string path)
+	{
+		if (!Directory.Exists(path))
+			return false;
 
-			if (!info.Exists)
-				return false;
+		return Directory.EnumerateFileSystemEntries(path).Any();
+	}
 
-			try
-			{
-				using var stream = info.Open(FileMode.Open, FileAccess.Read, FileShare.None);
-			}
-			catch (IOException)
-			{
-				return true;
-			}
+	/// <summary>
+	/// Determines whether the file specified by the path is locked by another process.
+	/// </summary>
+	/// <param name="path">The path to the file to check.</param>
+	/// <returns>True if the file is locked; otherwise, false.</returns>
+	public static bool IsFileLocked(string path)
+	{
+		var info = new FileInfo(path);
 
+		if (!info.Exists)
 			return false;
-		}
 
-		/// <summary>
-		/// Determines if the specified path refers to a directory.
-		/// </summary>
-		/// <param name="path">The path to check.</param>
-		/// <returns>True if the path is a directory; otherwise, false.</returns>
-		public static bool IsPathIsDir(this string path)
-			=> File.GetAttributes(path).HasFlag(FileAttributes.Directory);
-
-		/// <summary>
-		/// Normalizes the provided file path for comparison purposes without converting to lowercase.
-		/// </summary>
-		/// <param name="path">The file path to normalize.</param>
-		/// <returns>The normalized file path, or null if the input is empty or whitespace.</returns>
-		public static string NormalizePathNoLowercase(this string path)
+		try
 		{
-			if (path.IsEmptyOrWhiteSpace())
-				return null;
-
-			path = Path.GetFullPath(path);
-
-			return Path.GetFullPath(new Uri(path).LocalPath)
-						.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar)
-						.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
+			using var stream = info.Open(FileMode.Open, FileAccess.Read, FileShare.None);
 		}
-
-		/// <summary>
-		/// Normalizes the provided file path for comparison purposes and converts it to lowercase based on the specified culture.
-		/// </summary>
-		/// <param name="path">The file path to normalize.</param>
-		/// <param name="culture">The culture info to use for lowercasing. Defaults to InstalledUICulture if null.</param>
-		/// <returns>The normalized and lowercased file path.</returns>
-		public static string NormalizePath(this string path, CultureInfo culture = null)
+		catch (IOException)
 		{
-			return path.NormalizePathNoLowercase()?.ToLower(culture ?? CultureInfo.InstalledUICulture);
+			return true;
 		}
 
-		/// <summary>
-		/// Compares two file paths for equality after normalization.
-		/// </summary>
-		/// <param name="path1">The first file path to compare.</param>
-		/// <param name="path2">The second file path to compare.</param>
-		/// <returns>True if both paths are equal; otherwise, false.</returns>
-		public static bool IsPathsEqual(string path1, string path2) => path1.NormalizePath() == path2.NormalizePath();
+		return false;
+	}
+
+	/// <summary>
+	/// Determines if the specified path refers to a directory.
+	/// </summary>
+	/// <param name="path">The path to check.</param>
+	/// <returns>True if the path is a directory; otherwise, false.</returns>
+	public static bool IsPathIsDir(this string path)
+		=> File.GetAttributes(path).HasFlag(FileAttributes.Directory);
+
+	/// <summary>
+	/// Normalizes the provided file path for comparison purposes without converting to lowercase.
+	/// </summary>
+	/// <param name="path">The file path to normalize.</param>
+	/// <returns>The normalized file path, or null if the input is empty or whitespace.</returns>
+	public static string NormalizePathNoLowercase(this string path)
+	{
+		if (path.IsEmptyOrWhiteSpace())
+			return null;
+
+		path = Path.GetFullPath(path);
 
+		return Path.GetFullPath(new Uri(path).LocalPath)
+					.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar)
+					.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
 	}
+
+	/// <summary>
+	/// Normalizes the provided file path for comparison purposes and converts it to lowercase based on the specified culture.
+	/// </summary>
+	/// <param name="path">The file path to normalize.</param>
+	/// <param name="culture">The culture info to use for lowercasing. Defaults to InstalledUICulture if null.</param>
+	/// <returns>The normalized and lowercased file path.</returns>
+	public static string NormalizePath(this string path, CultureInfo culture = null)
+	{
+		return path.NormalizePathNoLowercase()?.ToLower(culture ?? CultureInfo.InstalledUICulture);
+	}
+
+	/// <summary>
+	/// Compares two file paths for equality after normalization.
+	/// </summary>
+	/// <param name="path1">The first file path to compare.</param>
+	/// <param name="path2">The second file path to compare.</param>
+	/// <returns>True if both paths are equal; otherwise, false.</returns>
+	public static bool IsPathsEqual(string path1, string path2) => path1.NormalizePath() == path2.NormalizePath();
+
 }
\ No newline at end of file
diff --git a/Common/IOperable.cs b/Common/IOperable.cs
index bc839cb6..55f599fa 100644
--- a/Common/IOperable.cs
+++ b/Common/IOperable.cs
@@ -1,39 +1,38 @@
-namespace Ecng.Common
-{
-	using System;
+namespace Ecng.Common;
+
+using System;
 
+/// <summary>
+/// Provides operations for performing arithmetic calculations on objects of type T.
+/// </summary>
+/// <typeparam name="T">The type on which arithmetic operations are performed.</typeparam>
+public interface IOperable<T> : IComparable<T>
+{
 	/// <summary>
-	/// Provides operations for performing arithmetic calculations on objects of type T.
+	/// Adds the specified object to the current object.
 	/// </summary>
-	/// <typeparam name="T">The type on which arithmetic operations are performed.</typeparam>
-	public interface IOperable<T> : IComparable<T>
-	{
-		/// <summary>
-		/// Adds the specified object to the current object.
-		/// </summary>
-		/// <param name="other">The object to add.</param>
-		/// <returns>The result of the addition operation.</returns>
-		T Add(T other);
+	/// <param name="other">The object to add.</param>
+	/// <returns>The result of the addition operation.</returns>
+	T Add(T other);
 
-		/// <summary>
-		/// Subtracts the specified object from the current object.
-		/// </summary>
-		/// <param name="other">The object to subtract.</param>
-		/// <returns>The result of the subtraction operation.</returns>
-		T Subtract(T other);
+	/// <summary>
+	/// Subtracts the specified object from the current object.
+	/// </summary>
+	/// <param name="other">The object to subtract.</param>
+	/// <returns>The result of the subtraction operation.</returns>
+	T Subtract(T other);
 
-		/// <summary>
-		/// Multiplies the current object by the specified object.
-		/// </summary>
-		/// <param name="other">The object to multiply with.</param>
-		/// <returns>The result of the multiplication operation.</returns>
-		T Multiply(T other);
+	/// <summary>
+	/// Multiplies the current object by the specified object.
+	/// </summary>
+	/// <param name="other">The object to multiply with.</param>
+	/// <returns>The result of the multiplication operation.</returns>
+	T Multiply(T other);
 
-		/// <summary>
-		/// Divides the current object by the specified object.
-		/// </summary>
-		/// <param name="other">The object to divide by.</param>
-		/// <returns>The result of the division operation.</returns>
-		T Divide(T other);
-	}
+	/// <summary>
+	/// Divides the current object by the specified object.
+	/// </summary>
+	/// <param name="other">The object to divide by.</param>
+	/// <returns>The result of the division operation.</returns>
+	T Divide(T other);
 }
\ No newline at end of file
diff --git a/Common/IOperator.cs b/Common/IOperator.cs
index b943b258..7895202b 100644
--- a/Common/IOperator.cs
+++ b/Common/IOperator.cs
@@ -1,833 +1,832 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+/// <summary>
+/// Provides basic arithmetic operations and comparison functionality.
+/// </summary>
+public interface IOperator : IComparer
+{
+	/// <summary>
+	/// Adds two objects.
+	/// </summary>
+	/// <param name="first">The first object.</param>
+	/// <param name="second">The second object.</param>
+	/// <returns>The result of addition.</returns>
+	object Add(object first, object second);
+
+	/// <summary>
+	/// Subtracts the second object from the first.
+	/// </summary>
+	/// <param name="first">The first object.</param>
+	/// <param name="second">The second object.</param>
+	/// <returns>The result of subtraction.</returns>
+	object Subtract(object first, object second);
+
+	/// <summary>
+	/// Multiplies two objects.
+	/// </summary>
+	/// <param name="first">The first object.</param>
+	/// <param name="second">The second object.</param>
+	/// <returns>The result of multiplication.</returns>
+	object Multiply(object first, object second);
+
+	/// <summary>
+	/// Divides the first object by the second.
+	/// </summary>
+	/// <param name="first">The first object.</param>
+	/// <param name="second">The second object.</param>
+	/// <returns>The result of division.</returns>
+	object Divide(object first, object second);
+}
+
+/// <summary>
+/// Provides strongly-typed arithmetic operations and comparison functionality.
+/// </summary>
+/// <typeparam name="T">The type to operate on.</typeparam>
+public interface IOperator<T> : IComparer<T>, IOperator
+{
+	/// <summary>
+	/// Adds two values of type T.
+	/// </summary>
+	/// <param name="first">The first value.</param>
+	/// <param name="second">The second value.</param>
+	/// <returns>The result of addition.</returns>
+	T Add(T first, T second);
+
+	/// <summary>
+	/// Subtracts the second value from the first.
+	/// </summary>
+	/// <param name="first">The first value.</param>
+	/// <param name="second">The second value.</param>
+	/// <returns>The result of subtraction.</returns>
+	T Subtract(T first, T second);
+
+	/// <summary>
+	/// Multiplies two values of type T.
+	/// </summary>
+	/// <param name="first">The first value.</param>
+	/// <param name="second">The second value.</param>
+	/// <returns>The result of multiplication.</returns>
+	T Multiply(T first, T second);
+
+	/// <summary>
+	/// Divides the first value by the second.
+	/// </summary>
+	/// <param name="first">The first value.</param>
+	/// <param name="second">The second value.</param>
+	/// <returns>The result of division.</returns>
+	T Divide(T first, T second);
+}
+
+/// <summary>
+/// Provides a base implementation for arithmetic operators.
+/// </summary>
+/// <typeparam name="T">The type to operate on.</typeparam>
+public abstract class BaseOperator<T> : IOperator<T>
+{
+	/// <summary>
+	/// Compares two values.
+	/// </summary>
+	/// <param name="x">The first value.</param>
+	/// <param name="y">The second value.</param>
+	/// <returns>A value indicating the relative order.</returns>
+	public abstract int Compare(T x, T y);
+
+	/// <summary>
+	/// Compares two objects.
+	/// </summary>
+	/// <param name="x">The first object.</param>
+	/// <param name="y">The second object.</param>
+	/// <returns>A value indicating the relative order.</returns>
+	int IComparer.Compare(object x, object y)
+	{
+		return Compare((T)x, (T)y);
+	}
+
+	/// <summary>
+	/// Adds two objects.
+	/// </summary>
+	/// <param name="first">The first object.</param>
+	/// <param name="second">The second object.</param>
+	/// <returns>The result of addition.</returns>
+	object IOperator.Add(object first, object second)
+	{
+		return Add((T)first, (T)second);
+	}
+
+	/// <summary>
+	/// Subtracts the second object from the first.
+	/// </summary>
+	/// <param name="first">The first object.</param>
+	/// <param name="second">The second object.</param>
+	/// <returns>The result of subtraction.</returns>
+	object IOperator.Subtract(object first, object second)
+	{
+		return Subtract((T)first, (T)second);
+	}
+
+	/// <summary>
+	/// Multiplies two objects.
+	/// </summary>
+	/// <param name="first">The first object.</param>
+	/// <param name="second">The second object.</param>
+	/// <returns>The result of multiplication.</returns>
+	object IOperator.Multiply(object first, object second)
+	{
+		return Multiply((T)first, (T)second);
+	}
+
+	/// <summary>
+	/// Divides the first object by the second.
+	/// </summary>
+	/// <param name="first">The first object.</param>
+	/// <param name="second">The second object.</param>
+	/// <returns>The result of division.</returns>
+	object IOperator.Divide(object first, object second)
+	{
+		return Divide((T)first, (T)second);
+	}
+
+	/// <summary>
+	/// Adds two values.
+	/// </summary>
+	/// <param name="first">The first value.</param>
+	/// <param name="second">The second value.</param>
+	/// <returns>The result of addition.</returns>
+	public abstract T Add(T first, T second);
+
+	/// <summary>
+	/// Subtracts the second value from the first.
+	/// </summary>
+	/// <param name="first">The first value.</param>
+	/// <param name="second">The second value.</param>
+	/// <returns>The result of subtraction.</returns>
+	public abstract T Subtract(T first, T second);
+
+	/// <summary>
+	/// Multiplies two values.
+	/// </summary>
+	/// <param name="first">The first value.</param>
+	/// <param name="second">The second value.</param>
+	/// <returns>The result of multiplication.</returns>
+	public abstract T Multiply(T first, T second);
+
+	/// <summary>
+	/// Divides the first value by the second.
+	/// </summary>
+	/// <param name="first">The first value.</param>
+	/// <param name="second">The second value.</param>
+	/// <returns>The result of division.</returns>
+	public abstract T Divide(T first, T second);
+}
+
+/// <summary>
+/// Implements arithmetic operations for integers.
+/// </summary>
+public class IntOperator : BaseOperator<int>
+{
+	/// <summary>
+	/// Adds two integers.
+	/// </summary>
+	public override int Add(int first, int second)
+	{
+		return first + second;
+	}
+
+	/// <summary>
+	/// Subtracts the second integer from the first.
+	/// </summary>
+	public override int Subtract(int first, int second)
+	{
+		return first - second;
+	}
+
+	/// <summary>
+	/// Multiplies two integers.
+	/// </summary>
+	public override int Multiply(int first, int second)
+	{
+		return first * second;
+	}
+
+	/// <summary>
+	/// Divides the first integer by the second.
+	/// </summary>
+	public override int Divide(int first, int second)
+	{
+		return first / second;
+	}
+
+	/// <summary>
+	/// Compares two integers.
+	/// </summary>
+	public override int Compare(int first, int second)
+	{
+		return first.CompareTo(second);
+	}
+}
+
+/// <summary>
+/// Implements arithmetic operations for unsigned integers.
+/// </summary>
+[CLSCompliant(false)]
+public class UIntOperator : BaseOperator<uint>
+{
+	/// <summary>
+	/// Adds two unsigned integers.
+	/// </summary>
+	public override uint Add(uint first, uint second)
+	{
+		return first + second;
+	}
+
+	/// <summary>
+	/// Subtracts the second unsigned integer from the first.
+	/// </summary>
+	public override uint Subtract(uint first, uint second)
+	{
+		return first - second;
+	}
+
+	/// <summary>
+	/// Multiplies two unsigned integers.
+	/// </summary>
+	public override uint Multiply(uint first, uint second)
+	{
+		return first * second;
+	}
+
+	/// <summary>
+	/// Divides the first unsigned integer by the second.
+	/// </summary>
+	public override uint Divide(uint first, uint second)
+	{
+		return first / second;
+	}
+
+	/// <summary>
+	/// Compares two unsigned integers.
+	/// </summary>
+	public override int Compare(uint first, uint second)
+	{
+		return first.CompareTo(second);
+	}
+}
+
+/// <summary>
+/// Implements arithmetic operations for short integers.
+/// </summary>
+public class ShortOperator : BaseOperator<short>
+{
+	/// <summary>
+	/// Adds two short integers.
+	/// </summary>
+	public override short Add(short first, short second)
+	{
+		return (short)(first + second);
+	}
+
+	/// <summary>
+	/// Subtracts the second short integer from the first.
+	/// </summary>
+	public override short Subtract(short first, short second)
+	{
+		return (short)(first - second);
+	}
+
+	/// <summary>
+	/// Multiplies two short integers.
+	/// </summary>
+	public override short Multiply(short first, short second)
+	{
+		return (short)(first * second);
+	}
+
+	/// <summary>
+	/// Divides the first short integer by the second.
+	/// </summary>
+	public override short Divide(short first, short second)
+	{
+		return (short)(first / second);
+	}
+
+	/// <summary>
+	/// Compares two short integers.
+	/// </summary>
+	public override int Compare(short first, short second)
+	{
+		return first.CompareTo(second);
+	}
+}
+
+/// <summary>
+/// Implements arithmetic operations for unsigned short integers.
+/// </summary>
+[CLSCompliant(false)]
+public class UShortOperator : BaseOperator<ushort>
 {
-	using System;
-	using System.Collections;
-	using System.Collections.Generic;
-
-	/// <summary>
-	/// Provides basic arithmetic operations and comparison functionality.
-	/// </summary>
-	public interface IOperator : IComparer
-	{
-		/// <summary>
-		/// Adds two objects.
-		/// </summary>
-		/// <param name="first">The first object.</param>
-		/// <param name="second">The second object.</param>
-		/// <returns>The result of addition.</returns>
-		object Add(object first, object second);
-
-		/// <summary>
-		/// Subtracts the second object from the first.
-		/// </summary>
-		/// <param name="first">The first object.</param>
-		/// <param name="second">The second object.</param>
-		/// <returns>The result of subtraction.</returns>
-		object Subtract(object first, object second);
-
-		/// <summary>
-		/// Multiplies two objects.
-		/// </summary>
-		/// <param name="first">The first object.</param>
-		/// <param name="second">The second object.</param>
-		/// <returns>The result of multiplication.</returns>
-		object Multiply(object first, object second);
-
-		/// <summary>
-		/// Divides the first object by the second.
-		/// </summary>
-		/// <param name="first">The first object.</param>
-		/// <param name="second">The second object.</param>
-		/// <returns>The result of division.</returns>
-		object Divide(object first, object second);
-	}
-
-	/// <summary>
-	/// Provides strongly-typed arithmetic operations and comparison functionality.
-	/// </summary>
-	/// <typeparam name="T">The type to operate on.</typeparam>
-	public interface IOperator<T> : IComparer<T>, IOperator
-	{
-		/// <summary>
-		/// Adds two values of type T.
-		/// </summary>
-		/// <param name="first">The first value.</param>
-		/// <param name="second">The second value.</param>
-		/// <returns>The result of addition.</returns>
-		T Add(T first, T second);
-
-		/// <summary>
-		/// Subtracts the second value from the first.
-		/// </summary>
-		/// <param name="first">The first value.</param>
-		/// <param name="second">The second value.</param>
-		/// <returns>The result of subtraction.</returns>
-		T Subtract(T first, T second);
-
-		/// <summary>
-		/// Multiplies two values of type T.
-		/// </summary>
-		/// <param name="first">The first value.</param>
-		/// <param name="second">The second value.</param>
-		/// <returns>The result of multiplication.</returns>
-		T Multiply(T first, T second);
-
-		/// <summary>
-		/// Divides the first value by the second.
-		/// </summary>
-		/// <param name="first">The first value.</param>
-		/// <param name="second">The second value.</param>
-		/// <returns>The result of division.</returns>
-		T Divide(T first, T second);
-	}
-
-	/// <summary>
-	/// Provides a base implementation for arithmetic operators.
-	/// </summary>
-	/// <typeparam name="T">The type to operate on.</typeparam>
-	public abstract class BaseOperator<T> : IOperator<T>
-	{
-		/// <summary>
-		/// Compares two values.
-		/// </summary>
-		/// <param name="x">The first value.</param>
-		/// <param name="y">The second value.</param>
-		/// <returns>A value indicating the relative order.</returns>
-		public abstract int Compare(T x, T y);
-
-		/// <summary>
-		/// Compares two objects.
-		/// </summary>
-		/// <param name="x">The first object.</param>
-		/// <param name="y">The second object.</param>
-		/// <returns>A value indicating the relative order.</returns>
-		int IComparer.Compare(object x, object y)
-		{
-			return Compare((T)x, (T)y);
-		}
-
-		/// <summary>
-		/// Adds two objects.
-		/// </summary>
-		/// <param name="first">The first object.</param>
-		/// <param name="second">The second object.</param>
-		/// <returns>The result of addition.</returns>
-		object IOperator.Add(object first, object second)
-		{
-			return Add((T)first, (T)second);
-		}
-
-		/// <summary>
-		/// Subtracts the second object from the first.
-		/// </summary>
-		/// <param name="first">The first object.</param>
-		/// <param name="second">The second object.</param>
-		/// <returns>The result of subtraction.</returns>
-		object IOperator.Subtract(object first, object second)
-		{
-			return Subtract((T)first, (T)second);
-		}
-
-		/// <summary>
-		/// Multiplies two objects.
-		/// </summary>
-		/// <param name="first">The first object.</param>
-		/// <param name="second">The second object.</param>
-		/// <returns>The result of multiplication.</returns>
-		object IOperator.Multiply(object first, object second)
-		{
-			return Multiply((T)first, (T)second);
-		}
-
-		/// <summary>
-		/// Divides the first object by the second.
-		/// </summary>
-		/// <param name="first">The first object.</param>
-		/// <param name="second">The second object.</param>
-		/// <returns>The result of division.</returns>
-		object IOperator.Divide(object first, object second)
-		{
-			return Divide((T)first, (T)second);
-		}
-
-		/// <summary>
-		/// Adds two values.
-		/// </summary>
-		/// <param name="first">The first value.</param>
-		/// <param name="second">The second value.</param>
-		/// <returns>The result of addition.</returns>
-		public abstract T Add(T first, T second);
-
-		/// <summary>
-		/// Subtracts the second value from the first.
-		/// </summary>
-		/// <param name="first">The first value.</param>
-		/// <param name="second">The second value.</param>
-		/// <returns>The result of subtraction.</returns>
-		public abstract T Subtract(T first, T second);
-
-		/// <summary>
-		/// Multiplies two values.
-		/// </summary>
-		/// <param name="first">The first value.</param>
-		/// <param name="second">The second value.</param>
-		/// <returns>The result of multiplication.</returns>
-		public abstract T Multiply(T first, T second);
-
-		/// <summary>
-		/// Divides the first value by the second.
-		/// </summary>
-		/// <param name="first">The first value.</param>
-		/// <param name="second">The second value.</param>
-		/// <returns>The result of division.</returns>
-		public abstract T Divide(T first, T second);
-	}
-
-	/// <summary>
-	/// Implements arithmetic operations for integers.
-	/// </summary>
-	public class IntOperator : BaseOperator<int>
-	{
-		/// <summary>
-		/// Adds two integers.
-		/// </summary>
-		public override int Add(int first, int second)
-		{
-			return first + second;
-		}
-
-		/// <summary>
-		/// Subtracts the second integer from the first.
-		/// </summary>
-		public override int Subtract(int first, int second)
-		{
-			return first - second;
-		}
-
-		/// <summary>
-		/// Multiplies two integers.
-		/// </summary>
-		public override int Multiply(int first, int second)
-		{
-			return first * second;
-		}
-
-		/// <summary>
-		/// Divides the first integer by the second.
-		/// </summary>
-		public override int Divide(int first, int second)
-		{
-			return first / second;
-		}
-
-		/// <summary>
-		/// Compares two integers.
-		/// </summary>
-		public override int Compare(int first, int second)
-		{
-			return first.CompareTo(second);
-		}
-	}
-
-	/// <summary>
-	/// Implements arithmetic operations for unsigned integers.
-	/// </summary>
-	[CLSCompliant(false)]
-	public class UIntOperator : BaseOperator<uint>
-	{
-		/// <summary>
-		/// Adds two unsigned integers.
-		/// </summary>
-		public override uint Add(uint first, uint second)
-		{
-			return first + second;
-		}
-
-		/// <summary>
-		/// Subtracts the second unsigned integer from the first.
-		/// </summary>
-		public override uint Subtract(uint first, uint second)
-		{
-			return first - second;
-		}
-
-		/// <summary>
-		/// Multiplies two unsigned integers.
-		/// </summary>
-		public override uint Multiply(uint first, uint second)
-		{
-			return first * second;
-		}
-
-		/// <summary>
-		/// Divides the first unsigned integer by the second.
-		/// </summary>
-		public override uint Divide(uint first, uint second)
-		{
-			return first / second;
-		}
-
-		/// <summary>
-		/// Compares two unsigned integers.
-		/// </summary>
-		public override int Compare(uint first, uint second)
-		{
-			return first.CompareTo(second);
-		}
-	}
-
-	/// <summary>
-	/// Implements arithmetic operations for short integers.
-	/// </summary>
-	public class ShortOperator : BaseOperator<short>
-	{
-		/// <summary>
-		/// Adds two short integers.
-		/// </summary>
-		public override short Add(short first, short second)
-		{
-			return (short)(first + second);
-		}
-
-		/// <summary>
-		/// Subtracts the second short integer from the first.
-		/// </summary>
-		public override short Subtract(short first, short second)
-		{
-			return (short)(first - second);
-		}
-
-		/// <summary>
-		/// Multiplies two short integers.
-		/// </summary>
-		public override short Multiply(short first, short second)
-		{
-			return (short)(first * second);
-		}
-
-		/// <summary>
-		/// Divides the first short integer by the second.
-		/// </summary>
-		public override short Divide(short first, short second)
-		{
-			return (short)(first / second);
-		}
-
-		/// <summary>
-		/// Compares two short integers.
-		/// </summary>
-		public override int Compare(short first, short second)
-		{
-			return first.CompareTo(second);
-		}
-	}
-
-	/// <summary>
-	/// Implements arithmetic operations for unsigned short integers.
-	/// </summary>
-	[CLSCompliant(false)]
-	public class UShortOperator : BaseOperator<ushort>
-	{
-		/// <summary>
-		/// Adds two unsigned short integers.
-		/// </summary>
-		public override ushort Add(ushort first, ushort second)
-		{
-			return (ushort)(first + second);
-		}
-
-		/// <summary>
-		/// Subtracts the second unsigned short integer from the first.
-		/// </summary>
-		public override ushort Subtract(ushort first, ushort second)
-		{
-			return (ushort)(first - second);
-		}
-
-		/// <summary>
-		/// Multiplies two unsigned short integers.
-		/// </summary>
-		public override ushort Multiply(ushort first, ushort second)
-		{
-			return (ushort)(first * second);
-		}
-
-		/// <summary>
-		/// Divides the first unsigned short integer by the second.
-		/// </summary>
-		public override ushort Divide(ushort first, ushort second)
-		{
-			return (ushort)(first / second);
-		}
-
-		/// <summary>
-		/// Compares two unsigned short integers.
-		/// </summary>
-		public override int Compare(ushort first, ushort second)
-		{
-			return first.CompareTo(second);
-		}
-	}
-
-	/// <summary>
-	/// Implements arithmetic operations for long integers.
-	/// </summary>
-	public class LongOperator : BaseOperator<long>
-	{
-		/// <summary>
-		/// Adds two long integers.
-		/// </summary>
-		public override long Add(long first, long second)
-		{
-			return first + second;
-		}
-
-		/// <summary>
-		/// Subtracts the second long integer from the first.
-		/// </summary>
-		public override long Subtract(long first, long second)
-		{
-			return first - second;
-		}
-
-		/// <summary>
-		/// Multiplies two long integers.
-		/// </summary>
-		public override long Multiply(long first, long second)
-		{
-			return first * second;
-		}
-
-		/// <summary>
-		/// Divides the first long integer by the second.
-		/// </summary>
-		public override long Divide(long first, long second)
-		{
-			return first / second;
-		}
-
-		/// <summary>
-		/// Compares two long integers.
-		/// </summary>
-		public override int Compare(long first, long second)
-		{
-			return first.CompareTo(second);
-		}
-	}
-
-	/// <summary>
-	/// Implements arithmetic operations for unsigned long integers.
-	/// </summary>
-	[CLSCompliant(false)]
-	public class ULongOperator : BaseOperator<ulong>
-	{
-		/// <summary>
-		/// Adds two unsigned long integers.
-		/// </summary>
-		public override ulong Add(ulong first, ulong second)
-		{
-			return first + second;
-		}
-
-		/// <summary>
-		/// Subtracts the second unsigned long integer from the first.
-		/// </summary>
-		public override ulong Subtract(ulong first, ulong second)
-		{
-			return first - second;
-		}
-
-		/// <summary>
-		/// Multiplies two unsigned long integers.
-		/// </summary>
-		public override ulong Multiply(ulong first, ulong second)
-		{
-			return first * second;
-		}
-
-		/// <summary>
-		/// Divides the first unsigned long integer by the second.
-		/// </summary>
-		public override ulong Divide(ulong first, ulong second)
-		{
-			return first / second;
-		}
-
-		/// <summary>
-		/// Compares two unsigned long integers.
-		/// </summary>
-		public override int Compare(ulong first, ulong second)
-		{
-			return first.CompareTo(second);
-		}
-	}
-
-	/// <summary>
-	/// Implements arithmetic operations for floating-point numbers.
-	/// </summary>
-	public class FloatOperator : BaseOperator<float>
-	{
-		/// <summary>
-		/// Adds two float values.
-		/// </summary>
-		public override float Add(float first, float second)
-		{
-			return first + second;
-		}
-
-		/// <summary>
-		/// Subtracts the second float value from the first.
-		/// </summary>
-		public override float Subtract(float first, float second)
-		{
-			return first - second;
-		}
-
-		/// <summary>
-		/// Multiplies two float values.
-		/// </summary>
-		public override float Multiply(float first, float second)
-		{
-			return first * second;
-		}
-
-		/// <summary>
-		/// Divides the first float value by the second.
-		/// </summary>
-		public override float Divide(float first, float second)
-		{
-			return first / second;
-		}
-
-		/// <summary>
-		/// Compares two float values.
-		/// </summary>
-		public override int Compare(float first, float second)
-		{
-			return first.CompareTo(second);
-		}
-	}
-
-	/// <summary>
-	/// Implements arithmetic operations for double-precision floating-point numbers.
-	/// </summary>
-	public class DoubleOperator : BaseOperator<double>
-	{
-		/// <summary>
-		/// Adds two double values.
-		/// </summary>
-		public override double Add(double first, double second)
-		{
-			return first + second;
-		}
-
-		/// <summary>
-		/// Subtracts the second double value from the first.
-		/// </summary>
-		public override double Subtract(double first, double second)
-		{
-			return first - second;
-		}
-
-		/// <summary>
-		/// Multiplies two double values.
-		/// </summary>
-		public override double Multiply(double first, double second)
-		{
-			return first * second;
-		}
-
-		/// <summary>
-		/// Divides the first double value by the second.
-		/// </summary>
-		public override double Divide(double first, double second)
-		{
-			return first / second;
-		}
-
-		/// <summary>
-		/// Compares two double values.
-		/// </summary>
-		public override int Compare(double first, double second)
-		{
-			return first.CompareTo(second);
-		}
-	}
-
-	/// <summary>
-	/// Implements arithmetic operations for byte values.
-	/// </summary>
-	public class ByteOperator : BaseOperator<byte>
-	{
-		/// <summary>
-		/// Adds two byte values.
-		/// </summary>
-		public override byte Add(byte first, byte second)
-		{
-			return (byte)(first + second);
-		}
-
-		/// <summary>
-		/// Subtracts the second byte value from the first.
-		/// </summary>
-		public override byte Subtract(byte first, byte second)
-		{
-			return (byte)(first - second);
-		}
-
-		/// <summary>
-		/// Multiplies two byte values.
-		/// </summary>
-		public override byte Multiply(byte first, byte second)
-		{
-			return (byte)(first * second);
-		}
-
-		/// <summary>
-		/// Divides the first byte value by the second.
-		/// </summary>
-		public override byte Divide(byte first, byte second)
-		{
-			return (byte)(first / second);
-		}
-
-		/// <summary>
-		/// Compares two byte values.
-		/// </summary>
-		public override int Compare(byte first, byte second)
-		{
-			return first.CompareTo(second);
-		}
-	}
-
-	/// <summary>
-	/// Implements arithmetic operations for signed byte values.
-	/// </summary>
-	[CLSCompliant(false)]
-	public class SByteOperator : BaseOperator<sbyte>
-	{
-		/// <summary>
-		/// Adds two sbyte values.
-		/// </summary>
-		public override sbyte Add(sbyte first, sbyte second)
-		{
-			return (sbyte)(first + second);
-		}
-
-		/// <summary>
-		/// Subtracts the second sbyte value from the first.
-		/// </summary>
-		public override sbyte Subtract(sbyte first, sbyte second)
-		{
-			return (sbyte)(first - second);
-		}
-
-		/// <summary>
-		/// Multiplies two sbyte values.
-		/// </summary>
-		public override sbyte Multiply(sbyte first, sbyte second)
-		{
-			return (sbyte)(first * second);
-		}
-
-		/// <summary>
-		/// Divides the first sbyte value by the second.
-		/// </summary>
-		public override sbyte Divide(sbyte first, sbyte second)
-		{
-			return (sbyte)(first / second);
-		}
-
-		/// <summary>
-		/// Compares two sbyte values.
-		/// </summary>
-		public override int Compare(sbyte first, sbyte second)
-		{
-			return first.CompareTo(second);
-		}
-	}
-
-	/// <summary>
-	/// Implements arithmetic operations for decimal numbers.
-	/// </summary>
-	public class DecimalOperator : BaseOperator<decimal>
-	{
-		/// <summary>
-		/// Adds two decimals.
-		/// </summary>
-		public override decimal Add(decimal first, decimal second)
-		{
-			return first + second;
-		}
-
-		/// <summary>
-		/// Subtracts the second decimal from the first.
-		/// </summary>
-		public override decimal Subtract(decimal first, decimal second)
-		{
-			return first - second;
-		}
-
-		/// <summary>
-		/// Multiplies two decimals.
-		/// </summary>
-		public override decimal Multiply(decimal first, decimal second)
-		{
-			return first * second;
-		}
-
-		/// <summary>
-		/// Divides the first decimal by the second.
-		/// </summary>
-		public override decimal Divide(decimal first, decimal second)
-		{
-			return first / second;
-		}
-
-		/// <summary>
-		/// Compares two decimals.
-		/// </summary>
-		public override int Compare(decimal first, decimal second)
-		{
-			return first.CompareTo(second);
-		}
-	}
-
-	/// <summary>
-	/// Implements arithmetic operations for TimeSpan values.
-	/// </summary>
-	public class TimeSpanOperator : BaseOperator<TimeSpan>
-	{
-		/// <summary>
-		/// Adds two TimeSpan values.
-		/// </summary>
-		public override TimeSpan Add(TimeSpan first, TimeSpan second)
-		{
-			return first + second;
-		}
-
-		/// <summary>
-		/// Subtracts the second TimeSpan from the first.
-		/// </summary>
-		public override TimeSpan Subtract(TimeSpan first, TimeSpan second)
-		{
-			return first - second;
-		}
-
-		/// <summary>
-		/// Multiplies two TimeSpan values by multiplying their ticks.
-		/// </summary>
-		public override TimeSpan Multiply(TimeSpan first, TimeSpan second)
-		{
-			return new TimeSpan(first.Ticks * second.Ticks);
-		}
-
-		/// <summary>
-		/// Divides two TimeSpan values by dividing their ticks.
-		/// </summary>
-		public override TimeSpan Divide(TimeSpan first, TimeSpan second)
-		{
-			return new TimeSpan(first.Ticks / second.Ticks);
-		}
-
-		/// <summary>
-		/// Compares two TimeSpan values.
-		/// </summary>
-		public override int Compare(TimeSpan first, TimeSpan second)
-		{
-			return first.CompareTo(second);
-		}
-	}
-
-	/// <summary>
-	/// Implements arithmetic operations for DateTime values.
-	/// </summary>
-	public class DateTimeOperator : BaseOperator<DateTime>
-	{
-		/// <summary>
-		/// Adds two DateTime values by adding their ticks.
-		/// </summary>
-		public override DateTime Add(DateTime first, DateTime second)
-		{
-			return new DateTime(first.Ticks + second.Ticks);
-		}
-
-		/// <summary>
-		/// Subtracts the tick values of the second DateTime from the first.
-		/// </summary>
-		public override DateTime Subtract(DateTime first, DateTime second)
-		{
-			return new DateTime(first.Ticks - second.Ticks);
-		}
-
-		/// <summary>
-		/// Multiplies two DateTime values by multiplying their ticks.
-		/// </summary>
-		public override DateTime Multiply(DateTime first, DateTime second)
-		{
-			return new DateTime(first.Ticks * second.Ticks);
-		}
-
-		/// <summary>
-		/// Divides two DateTime values by dividing their ticks.
-		/// </summary>
-		public override DateTime Divide(DateTime first, DateTime second)
-		{
-			return new DateTime(first.Ticks / second.Ticks);
-		}
-
-		/// <summary>
-		/// Compares two DateTime values.
-		/// </summary>
-		public override int Compare(DateTime first, DateTime second)
-		{
-			return first.CompareTo(second);
-		}
-	}
-
-	/// <summary>
-	/// Implements arithmetic operations for DateTimeOffset values.
-	/// </summary>
-	public class DateTimeOffsetOperator : BaseOperator<DateTimeOffset>
-	{
-		/// <summary>
-		/// Adds two DateTimeOffset values by adding their UTC ticks.
-		/// </summary>
-		public override DateTimeOffset Add(DateTimeOffset first, DateTimeOffset second)
-		{
-			return new DateTimeOffset(first.UtcTicks + second.UtcTicks, first.Offset);
-		}
-
-		/// <summary>
-		/// Subtracts the UTC ticks of the second DateTimeOffset from the first.
-		/// </summary>
-		public override DateTimeOffset Subtract(DateTimeOffset first, DateTimeOffset second)
-		{
-			return new DateTimeOffset(first.UtcTicks - second.UtcTicks, first.Offset);
-		}
-
-		/// <summary>
-		/// Multiplies two DateTimeOffset values by multiplying their UTC ticks.
-		/// </summary>
-		public override DateTimeOffset Multiply(DateTimeOffset first, DateTimeOffset second)
-		{
-			return new DateTimeOffset(first.UtcTicks * second.UtcTicks, first.Offset);
-		}
-
-		/// <summary>
-		/// Divides two DateTimeOffset values by dividing their UTC ticks.
-		/// </summary>
-		public override DateTimeOffset Divide(DateTimeOffset first, DateTimeOffset second)
-		{
-			return new DateTimeOffset(first.UtcTicks / second.UtcTicks, first.Offset);
-		}
-
-		/// <summary>
-		/// Compares two DateTimeOffset values.
-		/// </summary>
-		public override int Compare(DateTimeOffset first, DateTimeOffset second)
-		{
-			return first.CompareTo(second);
-		}
+	/// <summary>
+	/// Adds two unsigned short integers.
+	/// </summary>
+	public override ushort Add(ushort first, ushort second)
+	{
+		return (ushort)(first + second);
+	}
+
+	/// <summary>
+	/// Subtracts the second unsigned short integer from the first.
+	/// </summary>
+	public override ushort Subtract(ushort first, ushort second)
+	{
+		return (ushort)(first - second);
+	}
+
+	/// <summary>
+	/// Multiplies two unsigned short integers.
+	/// </summary>
+	public override ushort Multiply(ushort first, ushort second)
+	{
+		return (ushort)(first * second);
+	}
+
+	/// <summary>
+	/// Divides the first unsigned short integer by the second.
+	/// </summary>
+	public override ushort Divide(ushort first, ushort second)
+	{
+		return (ushort)(first / second);
+	}
+
+	/// <summary>
+	/// Compares two unsigned short integers.
+	/// </summary>
+	public override int Compare(ushort first, ushort second)
+	{
+		return first.CompareTo(second);
+	}
+}
+
+/// <summary>
+/// Implements arithmetic operations for long integers.
+/// </summary>
+public class LongOperator : BaseOperator<long>
+{
+	/// <summary>
+	/// Adds two long integers.
+	/// </summary>
+	public override long Add(long first, long second)
+	{
+		return first + second;
+	}
+
+	/// <summary>
+	/// Subtracts the second long integer from the first.
+	/// </summary>
+	public override long Subtract(long first, long second)
+	{
+		return first - second;
+	}
+
+	/// <summary>
+	/// Multiplies two long integers.
+	/// </summary>
+	public override long Multiply(long first, long second)
+	{
+		return first * second;
+	}
+
+	/// <summary>
+	/// Divides the first long integer by the second.
+	/// </summary>
+	public override long Divide(long first, long second)
+	{
+		return first / second;
+	}
+
+	/// <summary>
+	/// Compares two long integers.
+	/// </summary>
+	public override int Compare(long first, long second)
+	{
+		return first.CompareTo(second);
+	}
+}
+
+/// <summary>
+/// Implements arithmetic operations for unsigned long integers.
+/// </summary>
+[CLSCompliant(false)]
+public class ULongOperator : BaseOperator<ulong>
+{
+	/// <summary>
+	/// Adds two unsigned long integers.
+	/// </summary>
+	public override ulong Add(ulong first, ulong second)
+	{
+		return first + second;
+	}
+
+	/// <summary>
+	/// Subtracts the second unsigned long integer from the first.
+	/// </summary>
+	public override ulong Subtract(ulong first, ulong second)
+	{
+		return first - second;
+	}
+
+	/// <summary>
+	/// Multiplies two unsigned long integers.
+	/// </summary>
+	public override ulong Multiply(ulong first, ulong second)
+	{
+		return first * second;
+	}
+
+	/// <summary>
+	/// Divides the first unsigned long integer by the second.
+	/// </summary>
+	public override ulong Divide(ulong first, ulong second)
+	{
+		return first / second;
+	}
+
+	/// <summary>
+	/// Compares two unsigned long integers.
+	/// </summary>
+	public override int Compare(ulong first, ulong second)
+	{
+		return first.CompareTo(second);
+	}
+}
+
+/// <summary>
+/// Implements arithmetic operations for floating-point numbers.
+/// </summary>
+public class FloatOperator : BaseOperator<float>
+{
+	/// <summary>
+	/// Adds two float values.
+	/// </summary>
+	public override float Add(float first, float second)
+	{
+		return first + second;
+	}
+
+	/// <summary>
+	/// Subtracts the second float value from the first.
+	/// </summary>
+	public override float Subtract(float first, float second)
+	{
+		return first - second;
+	}
+
+	/// <summary>
+	/// Multiplies two float values.
+	/// </summary>
+	public override float Multiply(float first, float second)
+	{
+		return first * second;
+	}
+
+	/// <summary>
+	/// Divides the first float value by the second.
+	/// </summary>
+	public override float Divide(float first, float second)
+	{
+		return first / second;
+	}
+
+	/// <summary>
+	/// Compares two float values.
+	/// </summary>
+	public override int Compare(float first, float second)
+	{
+		return first.CompareTo(second);
+	}
+}
+
+/// <summary>
+/// Implements arithmetic operations for double-precision floating-point numbers.
+/// </summary>
+public class DoubleOperator : BaseOperator<double>
+{
+	/// <summary>
+	/// Adds two double values.
+	/// </summary>
+	public override double Add(double first, double second)
+	{
+		return first + second;
+	}
+
+	/// <summary>
+	/// Subtracts the second double value from the first.
+	/// </summary>
+	public override double Subtract(double first, double second)
+	{
+		return first - second;
+	}
+
+	/// <summary>
+	/// Multiplies two double values.
+	/// </summary>
+	public override double Multiply(double first, double second)
+	{
+		return first * second;
+	}
+
+	/// <summary>
+	/// Divides the first double value by the second.
+	/// </summary>
+	public override double Divide(double first, double second)
+	{
+		return first / second;
+	}
+
+	/// <summary>
+	/// Compares two double values.
+	/// </summary>
+	public override int Compare(double first, double second)
+	{
+		return first.CompareTo(second);
+	}
+}
+
+/// <summary>
+/// Implements arithmetic operations for byte values.
+/// </summary>
+public class ByteOperator : BaseOperator<byte>
+{
+	/// <summary>
+	/// Adds two byte values.
+	/// </summary>
+	public override byte Add(byte first, byte second)
+	{
+		return (byte)(first + second);
+	}
+
+	/// <summary>
+	/// Subtracts the second byte value from the first.
+	/// </summary>
+	public override byte Subtract(byte first, byte second)
+	{
+		return (byte)(first - second);
+	}
+
+	/// <summary>
+	/// Multiplies two byte values.
+	/// </summary>
+	public override byte Multiply(byte first, byte second)
+	{
+		return (byte)(first * second);
+	}
+
+	/// <summary>
+	/// Divides the first byte value by the second.
+	/// </summary>
+	public override byte Divide(byte first, byte second)
+	{
+		return (byte)(first / second);
+	}
+
+	/// <summary>
+	/// Compares two byte values.
+	/// </summary>
+	public override int Compare(byte first, byte second)
+	{
+		return first.CompareTo(second);
+	}
+}
+
+/// <summary>
+/// Implements arithmetic operations for signed byte values.
+/// </summary>
+[CLSCompliant(false)]
+public class SByteOperator : BaseOperator<sbyte>
+{
+	/// <summary>
+	/// Adds two sbyte values.
+	/// </summary>
+	public override sbyte Add(sbyte first, sbyte second)
+	{
+		return (sbyte)(first + second);
+	}
+
+	/// <summary>
+	/// Subtracts the second sbyte value from the first.
+	/// </summary>
+	public override sbyte Subtract(sbyte first, sbyte second)
+	{
+		return (sbyte)(first - second);
+	}
+
+	/// <summary>
+	/// Multiplies two sbyte values.
+	/// </summary>
+	public override sbyte Multiply(sbyte first, sbyte second)
+	{
+		return (sbyte)(first * second);
+	}
+
+	/// <summary>
+	/// Divides the first sbyte value by the second.
+	/// </summary>
+	public override sbyte Divide(sbyte first, sbyte second)
+	{
+		return (sbyte)(first / second);
+	}
+
+	/// <summary>
+	/// Compares two sbyte values.
+	/// </summary>
+	public override int Compare(sbyte first, sbyte second)
+	{
+		return first.CompareTo(second);
+	}
+}
+
+/// <summary>
+/// Implements arithmetic operations for decimal numbers.
+/// </summary>
+public class DecimalOperator : BaseOperator<decimal>
+{
+	/// <summary>
+	/// Adds two decimals.
+	/// </summary>
+	public override decimal Add(decimal first, decimal second)
+	{
+		return first + second;
+	}
+
+	/// <summary>
+	/// Subtracts the second decimal from the first.
+	/// </summary>
+	public override decimal Subtract(decimal first, decimal second)
+	{
+		return first - second;
+	}
+
+	/// <summary>
+	/// Multiplies two decimals.
+	/// </summary>
+	public override decimal Multiply(decimal first, decimal second)
+	{
+		return first * second;
+	}
+
+	/// <summary>
+	/// Divides the first decimal by the second.
+	/// </summary>
+	public override decimal Divide(decimal first, decimal second)
+	{
+		return first / second;
+	}
+
+	/// <summary>
+	/// Compares two decimals.
+	/// </summary>
+	public override int Compare(decimal first, decimal second)
+	{
+		return first.CompareTo(second);
+	}
+}
+
+/// <summary>
+/// Implements arithmetic operations for TimeSpan values.
+/// </summary>
+public class TimeSpanOperator : BaseOperator<TimeSpan>
+{
+	/// <summary>
+	/// Adds two TimeSpan values.
+	/// </summary>
+	public override TimeSpan Add(TimeSpan first, TimeSpan second)
+	{
+		return first + second;
+	}
+
+	/// <summary>
+	/// Subtracts the second TimeSpan from the first.
+	/// </summary>
+	public override TimeSpan Subtract(TimeSpan first, TimeSpan second)
+	{
+		return first - second;
+	}
+
+	/// <summary>
+	/// Multiplies two TimeSpan values by multiplying their ticks.
+	/// </summary>
+	public override TimeSpan Multiply(TimeSpan first, TimeSpan second)
+	{
+		return new TimeSpan(first.Ticks * second.Ticks);
+	}
+
+	/// <summary>
+	/// Divides two TimeSpan values by dividing their ticks.
+	/// </summary>
+	public override TimeSpan Divide(TimeSpan first, TimeSpan second)
+	{
+		return new TimeSpan(first.Ticks / second.Ticks);
+	}
+
+	/// <summary>
+	/// Compares two TimeSpan values.
+	/// </summary>
+	public override int Compare(TimeSpan first, TimeSpan second)
+	{
+		return first.CompareTo(second);
+	}
+}
+
+/// <summary>
+/// Implements arithmetic operations for DateTime values.
+/// </summary>
+public class DateTimeOperator : BaseOperator<DateTime>
+{
+	/// <summary>
+	/// Adds two DateTime values by adding their ticks.
+	/// </summary>
+	public override DateTime Add(DateTime first, DateTime second)
+	{
+		return new DateTime(first.Ticks + second.Ticks);
+	}
+
+	/// <summary>
+	/// Subtracts the tick values of the second DateTime from the first.
+	/// </summary>
+	public override DateTime Subtract(DateTime first, DateTime second)
+	{
+		return new DateTime(first.Ticks - second.Ticks);
+	}
+
+	/// <summary>
+	/// Multiplies two DateTime values by multiplying their ticks.
+	/// </summary>
+	public override DateTime Multiply(DateTime first, DateTime second)
+	{
+		return new DateTime(first.Ticks * second.Ticks);
+	}
+
+	/// <summary>
+	/// Divides two DateTime values by dividing their ticks.
+	/// </summary>
+	public override DateTime Divide(DateTime first, DateTime second)
+	{
+		return new DateTime(first.Ticks / second.Ticks);
+	}
+
+	/// <summary>
+	/// Compares two DateTime values.
+	/// </summary>
+	public override int Compare(DateTime first, DateTime second)
+	{
+		return first.CompareTo(second);
+	}
+}
+
+/// <summary>
+/// Implements arithmetic operations for DateTimeOffset values.
+/// </summary>
+public class DateTimeOffsetOperator : BaseOperator<DateTimeOffset>
+{
+	/// <summary>
+	/// Adds two DateTimeOffset values by adding their UTC ticks.
+	/// </summary>
+	public override DateTimeOffset Add(DateTimeOffset first, DateTimeOffset second)
+	{
+		return new DateTimeOffset(first.UtcTicks + second.UtcTicks, first.Offset);
+	}
+
+	/// <summary>
+	/// Subtracts the UTC ticks of the second DateTimeOffset from the first.
+	/// </summary>
+	public override DateTimeOffset Subtract(DateTimeOffset first, DateTimeOffset second)
+	{
+		return new DateTimeOffset(first.UtcTicks - second.UtcTicks, first.Offset);
+	}
+
+	/// <summary>
+	/// Multiplies two DateTimeOffset values by multiplying their UTC ticks.
+	/// </summary>
+	public override DateTimeOffset Multiply(DateTimeOffset first, DateTimeOffset second)
+	{
+		return new DateTimeOffset(first.UtcTicks * second.UtcTicks, first.Offset);
+	}
+
+	/// <summary>
+	/// Divides two DateTimeOffset values by dividing their UTC ticks.
+	/// </summary>
+	public override DateTimeOffset Divide(DateTimeOffset first, DateTimeOffset second)
+	{
+		return new DateTimeOffset(first.UtcTicks / second.UtcTicks, first.Offset);
+	}
+
+	/// <summary>
+	/// Compares two DateTimeOffset values.
+	/// </summary>
+	public override int Compare(DateTimeOffset first, DateTimeOffset second)
+	{
+		return first.CompareTo(second);
 	}
 }
\ No newline at end of file
diff --git a/Common/ISmartPointer.cs b/Common/ISmartPointer.cs
index c488bf56..85e3592f 100644
--- a/Common/ISmartPointer.cs
+++ b/Common/ISmartPointer.cs
@@ -1,25 +1,24 @@
-namespace Ecng.Common
-{
-	using System;
+namespace Ecng.Common;
+
+using System;
 
+/// <summary>
+/// Represents a smart pointer that uses reference counting to manage resource lifetimes.
+/// </summary>
+public interface ISmartPointer : IDisposable
+{
 	/// <summary>
-	/// Represents a smart pointer that uses reference counting to manage resource lifetimes.
+	/// Gets the current reference counter.
 	/// </summary>
-	public interface ISmartPointer : IDisposable
-	{
-		/// <summary>
-		/// Gets the current reference counter.
-		/// </summary>
-		int Counter { get; }
+	int Counter { get; }
 
-		/// <summary>
-		/// Increments the reference counter.
-		/// </summary>
-		void IncRef();
+	/// <summary>
+	/// Increments the reference counter.
+	/// </summary>
+	void IncRef();
 
-		/// <summary>
-		/// Decrements the reference counter.
-		/// </summary>
-		void DecRef();
-	}
+	/// <summary>
+	/// Decrements the reference counter.
+	/// </summary>
+	void DecRef();
 }
\ No newline at end of file
diff --git a/Common/IdGenerator.cs b/Common/IdGenerator.cs
index 203e73f6..d629e15e 100644
--- a/Common/IdGenerator.cs
+++ b/Common/IdGenerator.cs
@@ -1,186 +1,185 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+using System;
+using System.Threading;
+
+/// <summary>
+/// Base identifier generator.
+/// </summary>
+public abstract class IdGenerator
 {
-	using System;
-	using System.Threading;
+	/// <summary>
+	/// Initializes a new instance of the <see cref="IdGenerator"/> class.
+	/// </summary>
+	protected IdGenerator()
+	{
+	}
 
 	/// <summary>
-	/// Base identifier generator.
+	/// Gets the next identifier.
 	/// </summary>
-	public abstract class IdGenerator
+	/// <returns>The next identifier.</returns>
+	public abstract long GetNextId();
+}
+
+/// <summary>
+/// Identifier generator that automatically increments the identifier by 1.
+/// </summary>
+public class IncrementalIdGenerator : IdGenerator
+{
+	/// <summary>
+	/// Initializes a new instance of the <see cref="IncrementalIdGenerator"/> class.
+	/// </summary>
+	public IncrementalIdGenerator()
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="IdGenerator"/> class.
-		/// </summary>
-		protected IdGenerator()
-		{
-		}
-
-		/// <summary>
-		/// Gets the next identifier.
-		/// </summary>
-		/// <returns>The next identifier.</returns>
-		public abstract long GetNextId();
 	}
 
+	private long _current;
+
 	/// <summary>
-	/// Identifier generator that automatically increments the identifier by 1.
+	/// Gets or sets the current identifier.
 	/// </summary>
-	public class IncrementalIdGenerator : IdGenerator
+	public long Current
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="IncrementalIdGenerator"/> class.
-		/// </summary>
-		public IncrementalIdGenerator()
-		{
-		}
-
-		private long _current;
-
-		/// <summary>
-		/// Gets or sets the current identifier.
-		/// </summary>
-		public long Current
-		{
-			get => _current;
-			set => _current = value;
-		}
-
-		/// <summary>
-		/// Gets the next identifier by incrementing the current value.
-		/// </summary>
-		/// <returns>The next identifier.</returns>
-		public override long GetNextId()
-		{
-			return Interlocked.Increment(ref _current);
-		}
+		get => _current;
+		set => _current = value;
 	}
 
 	/// <summary>
-	/// Identifier generator based on automatic incrementation where the initial value is the number of milliseconds
-	/// elapsed since the start of the day.
+	/// Gets the next identifier by incrementing the current value.
 	/// </summary>
-	public class MillisecondIncrementalIdGenerator : IncrementalIdGenerator
+	/// <returns>The next identifier.</returns>
+	public override long GetNextId()
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="MillisecondIncrementalIdGenerator"/> class.
-		/// </summary>
-		public MillisecondIncrementalIdGenerator()
-		{
-			Current = (long)(DateTime.Now - DateTime.Today).TotalMilliseconds;
-		}
+		return Interlocked.Increment(ref _current);
 	}
+}
 
+/// <summary>
+/// Identifier generator based on automatic incrementation where the initial value is the number of milliseconds
+/// elapsed since the start of the day.
+/// </summary>
+public class MillisecondIncrementalIdGenerator : IncrementalIdGenerator
+{
 	/// <summary>
-	/// Identifier generator based on automatic incrementation starting from the current Unix time in seconds (UTC).
+	/// Initializes a new instance of the <see cref="MillisecondIncrementalIdGenerator"/> class.
 	/// </summary>
-	public class UTCIncrementalIdGenerator : IncrementalIdGenerator
+	public MillisecondIncrementalIdGenerator()
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="UTCIncrementalIdGenerator"/> class.
-		/// </summary>
-		public UTCIncrementalIdGenerator()
-		{
-			Current = (long)DateTime.UtcNow.ToUnix();
-		}
+		Current = (long)(DateTime.Now - DateTime.Today).TotalMilliseconds;
 	}
+}
 
+/// <summary>
+/// Identifier generator based on automatic incrementation starting from the current Unix time in seconds (UTC).
+/// </summary>
+public class UTCIncrementalIdGenerator : IncrementalIdGenerator
+{
 	/// <summary>
-	/// Identifier generator based on automatic incrementation starting from the current Unix time in milliseconds (UTC).
+	/// Initializes a new instance of the <see cref="UTCIncrementalIdGenerator"/> class.
 	/// </summary>
-	public class UTCMlsIncrementalIdGenerator : IncrementalIdGenerator
+	public UTCIncrementalIdGenerator()
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="UTCMlsIncrementalIdGenerator"/> class.
-		/// </summary>
-		public UTCMlsIncrementalIdGenerator()
-		{
-			Current = (long)DateTime.UtcNow.ToUnix(false);
-		}
+		Current = (long)DateTime.UtcNow.ToUnix();
 	}
+}
 
+/// <summary>
+/// Identifier generator based on automatic incrementation starting from the current Unix time in milliseconds (UTC).
+/// </summary>
+public class UTCMlsIncrementalIdGenerator : IncrementalIdGenerator
+{
 	/// <summary>
-	/// Identifier generator based on milliseconds.
-	/// Each subsequent call to <see cref="GetNextId"/> returns the number of milliseconds elapsed since the instance was created.
+	/// Initializes a new instance of the <see cref="UTCMlsIncrementalIdGenerator"/> class.
 	/// </summary>
-	public class MillisecondIdGenerator : IdGenerator
+	public UTCMlsIncrementalIdGenerator()
 	{
-		private readonly DateTime _start;
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="MillisecondIdGenerator"/> class.
-		/// </summary>
-		public MillisecondIdGenerator()
-		{
-			_start = DateTime.Now;
-		}
-
-		/// <summary>
-		/// Gets the next identifier representing the number of milliseconds elapsed since the object was created.
-		/// </summary>
-		/// <returns>The number of milliseconds elapsed.</returns>
-		public override long GetNextId()
-		{
-			return (long)(DateTime.Now - _start).TotalMilliseconds;
-		}
+		Current = (long)DateTime.UtcNow.ToUnix(false);
 	}
+}
+
+/// <summary>
+/// Identifier generator based on milliseconds.
+/// Each subsequent call to <see cref="GetNextId"/> returns the number of milliseconds elapsed since the instance was created.
+/// </summary>
+public class MillisecondIdGenerator : IdGenerator
+{
+	private readonly DateTime _start;
 
 	/// <summary>
-	/// Identifier generator based on the current Unix time in milliseconds (UTC).
+	/// Initializes a new instance of the <see cref="MillisecondIdGenerator"/> class.
 	/// </summary>
-	public class UTCMillisecondIdGenerator : IdGenerator
+	public MillisecondIdGenerator()
 	{
-		/// <summary>
-		/// Gets the next identifier based on Unix time in milliseconds.
-		/// </summary>
-		/// <returns>The Unix timestamp in milliseconds.</returns>
-		public override long GetNextId()
-		{
-			return (long)TimeHelper.UnixNowMls;
-		}
+		_start = DateTime.Now;
 	}
 
 	/// <summary>
-	/// Identifier generator based on the current Unix time in seconds (UTC).
+	/// Gets the next identifier representing the number of milliseconds elapsed since the object was created.
 	/// </summary>
-	public class UTCSecondIdGenerator : IdGenerator
+	/// <returns>The number of milliseconds elapsed.</returns>
+	public override long GetNextId()
 	{
-		/// <summary>
-		/// Gets the next identifier based on Unix time in seconds.
-		/// </summary>
-		/// <returns>The Unix timestamp in seconds.</returns>
-		public override long GetNextId()
-		{
-			return (long)TimeHelper.UnixNowS;
-		}
+		return (long)(DateTime.Now - _start).TotalMilliseconds;
 	}
+}
 
+/// <summary>
+/// Identifier generator based on the current Unix time in milliseconds (UTC).
+/// </summary>
+public class UTCMillisecondIdGenerator : IdGenerator
+{
+	/// <summary>
+	/// Gets the next identifier based on Unix time in milliseconds.
+	/// </summary>
+	/// <returns>The Unix timestamp in milliseconds.</returns>
+	public override long GetNextId()
+	{
+		return (long)TimeHelper.UnixNowMls;
+	}
+}
+
+/// <summary>
+/// Identifier generator based on the current Unix time in seconds (UTC).
+/// </summary>
+public class UTCSecondIdGenerator : IdGenerator
+{
 	/// <summary>
-	/// Identifier generator that uses the current UTC ticks as the identifier.
+	/// Gets the next identifier based on Unix time in seconds.
 	/// </summary>
-	public class TickIdGenerator : IdGenerator
+	/// <returns>The Unix timestamp in seconds.</returns>
+	public override long GetNextId()
 	{
-		/// <summary>
-		/// Gets the next identifier based on the current UTC ticks.
-		/// </summary>
-		/// <returns>The current UTC ticks.</returns>
-		public override long GetNextId()
-		{
-			return DateTime.UtcNow.Ticks;
-		}
+		return (long)TimeHelper.UnixNowS;
 	}
+}
 
+/// <summary>
+/// Identifier generator that uses the current UTC ticks as the identifier.
+/// </summary>
+public class TickIdGenerator : IdGenerator
+{
+	/// <summary>
+	/// Gets the next identifier based on the current UTC ticks.
+	/// </summary>
+	/// <returns>The current UTC ticks.</returns>
+	public override long GetNextId()
+	{
+		return DateTime.UtcNow.Ticks;
+	}
+}
+
+/// <summary>
+/// Identifier generator that starts at the current UTC ticks and increments by 1 for each call.
+/// </summary>
+public class TickIncrementalIdGenerator : IncrementalIdGenerator
+{
 	/// <summary>
-	/// Identifier generator that starts at the current UTC ticks and increments by 1 for each call.
+	/// Initializes a new instance of the <see cref="TickIncrementalIdGenerator"/> class,
+	/// setting the initial identifier value to the current UTC ticks.
 	/// </summary>
-	public class TickIncrementalIdGenerator : IncrementalIdGenerator
+	public TickIncrementalIdGenerator()
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="TickIncrementalIdGenerator"/> class,
-		/// setting the initial identifier value to the current UTC ticks.
-		/// </summary>
-		public TickIncrementalIdGenerator()
-		{
-			Current = DateTime.UtcNow.Ticks;
-		}
+		Current = DateTime.UtcNow.Ticks;
 	}
 }
\ No newline at end of file
diff --git a/Common/MathHelper.cs b/Common/MathHelper.cs
index 9438a13c..e25a561e 100644
--- a/Common/MathHelper.cs
+++ b/Common/MathHelper.cs
@@ -1,1845 +1,1844 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+using System;
+using System.Linq;
+using System.Collections.Generic;
+
+/// <summary>
+/// Provides various mathematical helper methods and extension methods for numeric types.
+/// </summary>
+public static class MathHelper
 {
-	using System;
-	using System.Linq;
-	using System.Collections.Generic;
+	/// <summary>
+	/// Returns the largest multiple of <paramref name="step"/> less than or equal to the specified <paramref name="value"/>.
+	/// </summary>
+	/// <param name="value">The decimal value.</param>
+	/// <param name="step">The step size.</param>
+	/// <returns>The floored value.</returns>
+	public static decimal Floor(this decimal value, decimal step) => Math.Floor(value / step) * step;
 
 	/// <summary>
-	/// Provides various mathematical helper methods and extension methods for numeric types.
+	/// Returns the smallest multiple of <paramref name="step"/> greater than or equal to the specified <paramref name="value"/>.
 	/// </summary>
-	public static class MathHelper
+	/// <param name="value">The decimal value.</param>
+	/// <param name="step">The step size.</param>
+	/// <returns>The ceiled value.</returns>
+	public static decimal Ceiling(this decimal value, decimal step) => Math.Ceiling(value / step) * step;
+
+	/// <summary>
+	/// Rounds the specified <paramref name="value"/> to the nearest integer.
+	/// </summary>
+	/// <param name="value">The decimal value.</param>
+	/// <returns>The rounded value.</returns>
+	public static decimal Round(this decimal value)
 	{
-		/// <summary>
-		/// Returns the largest multiple of <paramref name="step"/> less than or equal to the specified <paramref name="value"/>.
-		/// </summary>
-		/// <param name="value">The decimal value.</param>
-		/// <param name="step">The step size.</param>
-		/// <returns>The floored value.</returns>
-		public static decimal Floor(this decimal value, decimal step) => Math.Floor(value / step) * step;
+		return Math.Round(value);
+	}
 
-		/// <summary>
-		/// Returns the smallest multiple of <paramref name="step"/> greater than or equal to the specified <paramref name="value"/>.
-		/// </summary>
-		/// <param name="value">The decimal value.</param>
-		/// <param name="step">The step size.</param>
-		/// <returns>The ceiled value.</returns>
-		public static decimal Ceiling(this decimal value, decimal step) => Math.Ceiling(value / step) * step;
+	/// <summary>
+	/// Rounds the specified <paramref name="value"/> to a specified number of fractional digits.
+	/// </summary>
+	/// <param name="value">The decimal value.</param>
+	/// <param name="digits">The number of fractional digits.</param>
+	/// <returns>The rounded value.</returns>
+	public static decimal Round(this decimal value, int digits)
+	{
+		return Math.Round(value, digits);
+	}
 
-		/// <summary>
-		/// Rounds the specified <paramref name="value"/> to the nearest integer.
-		/// </summary>
-		/// <param name="value">The decimal value.</param>
-		/// <returns>The rounded value.</returns>
-		public static decimal Round(this decimal value)
-		{
-			return Math.Round(value);
-		}
+	/// <summary>
+	/// Rounds the specified <paramref name="value"/> to a specified number of fractional digits.
+	/// </summary>
+	/// <param name="value">The decimal value.</param>
+	/// <param name="digits">The number of fractional digits (as decimal, will be converted to int).</param>
+	/// <returns>The rounded value.</returns>
+	public static decimal Round(this decimal value, decimal digits)
+	{
+		return Round(value, (int)digits);
+	}
 
-		/// <summary>
-		/// Rounds the specified <paramref name="value"/> to a specified number of fractional digits.
-		/// </summary>
-		/// <param name="value">The decimal value.</param>
-		/// <param name="digits">The number of fractional digits.</param>
-		/// <returns>The rounded value.</returns>
-		public static decimal Round(this decimal value, int digits)
-		{
-			return Math.Round(value, digits);
-		}
+	/// <summary>
+	/// Returns the smallest integer greater than or equal to the specified <paramref name="value"/>.
+	/// </summary>
+	/// <param name="value">The decimal value.</param>
+	/// <returns>The ceiled value.</returns>
+	public static decimal Ceiling(this decimal value)
+	{
+		return Math.Ceiling(value);
+	}
 
-		/// <summary>
-		/// Rounds the specified <paramref name="value"/> to a specified number of fractional digits.
-		/// </summary>
-		/// <param name="value">The decimal value.</param>
-		/// <param name="digits">The number of fractional digits (as decimal, will be converted to int).</param>
-		/// <returns>The rounded value.</returns>
-		public static decimal Round(this decimal value, decimal digits)
-		{
-			return Round(value, (int)digits);
-		}
+	/// <summary>
+	/// Returns the largest integer less than or equal to the specified <paramref name="value"/>.
+	/// </summary>
+	/// <param name="value">The decimal value.</param>
+	/// <returns>The floored value.</returns>
+	public static decimal Floor(this decimal value)
+	{
+		return Math.Floor(value);
+	}
 
-		/// <summary>
-		/// Returns the smallest integer greater than or equal to the specified <paramref name="value"/>.
-		/// </summary>
-		/// <param name="value">The decimal value.</param>
-		/// <returns>The ceiled value.</returns>
-		public static decimal Ceiling(this decimal value)
-		{
-			return Math.Ceiling(value);
-		}
+	/// <summary>
+	/// Rounds the specified <paramref name="value"/> to the specified number of fractional digits using the specified rounding mode.
+	/// </summary>
+	/// <param name="value">The decimal value.</param>
+	/// <param name="digits">The number of fractional digits.</param>
+	/// <param name="rounding">The rounding mode.</param>
+	/// <returns>The rounded value.</returns>
+	public static decimal Round(this decimal value, int digits, MidpointRounding rounding) => Math.Round(value, digits, rounding);
 
-		/// <summary>
-		/// Returns the largest integer less than or equal to the specified <paramref name="value"/>.
-		/// </summary>
-		/// <param name="value">The decimal value.</param>
-		/// <returns>The floored value.</returns>
-		public static decimal Floor(this decimal value)
-		{
-			return Math.Floor(value);
-		}
+	/// <summary>
+	/// Rounds the specified <paramref name="value"/> using the specified rounding mode.
+	/// </summary>
+	/// <param name="value">The decimal value.</param>
+	/// <param name="rounding">The rounding mode.</param>
+	/// <returns>The rounded value.</returns>
+	public static decimal Round(this decimal value, MidpointRounding rounding) => Math.Round(value, rounding);
 
-		/// <summary>
-		/// Rounds the specified <paramref name="value"/> to the specified number of fractional digits using the specified rounding mode.
-		/// </summary>
-		/// <param name="value">The decimal value.</param>
-		/// <param name="digits">The number of fractional digits.</param>
-		/// <param name="rounding">The rounding mode.</param>
-		/// <returns>The rounded value.</returns>
-		public static decimal Round(this decimal value, int digits, MidpointRounding rounding) => Math.Round(value, digits, rounding);
+	/// <summary>
+	/// Rounds the specified <paramref name="value"/> to the nearest multiple of <paramref name="step"/>, and optionally rounds to the specified number of digits.
+	/// </summary>
+	/// <param name="value">The decimal value.</param>
+	/// <param name="step">The step size.</param>
+	/// <param name="digits">Optional number of fractional digits.</param>
+	/// <param name="rounding">The rounding mode (defaults to ToEven).</param>
+	/// <returns>The rounded value.</returns>
+	public static decimal Round(this decimal value, decimal step, int? digits, MidpointRounding rounding = MidpointRounding.ToEven)
+	{
+		if (step <= 0)
+			throw new ArgumentOutOfRangeException(nameof(step), step, "The 'step' parameter must be more than zero.");
 
-		/// <summary>
-		/// Rounds the specified <paramref name="value"/> using the specified rounding mode.
-		/// </summary>
-		/// <param name="value">The decimal value.</param>
-		/// <param name="rounding">The rounding mode.</param>
-		/// <returns>The rounded value.</returns>
-		public static decimal Round(this decimal value, MidpointRounding rounding) => Math.Round(value, rounding);
+		value = Math.Round(value / step, rounding) * step;
 
-		/// <summary>
-		/// Rounds the specified <paramref name="value"/> to the nearest multiple of <paramref name="step"/>, and optionally rounds to the specified number of digits.
-		/// </summary>
-		/// <param name="value">The decimal value.</param>
-		/// <param name="step">The step size.</param>
-		/// <param name="digits">Optional number of fractional digits.</param>
-		/// <param name="rounding">The rounding mode (defaults to ToEven).</param>
-		/// <returns>The rounded value.</returns>
-		public static decimal Round(this decimal value, decimal step, int? digits, MidpointRounding rounding = MidpointRounding.ToEven)
-		{
-			if (step <= 0)
-				throw new ArgumentOutOfRangeException(nameof(step), step, "The 'step' parameter must be more than zero.");
+		return digits == null ? value : Math.Round(value, digits.Value);
+	}
 
-			value = Math.Round(value / step, rounding) * step;
+	/// <summary>
+	/// Truncates the decimal <paramref name="value"/> by discarding the fractional part.
+	/// </summary>
+	/// <param name="value">The decimal value.</param>
+	/// <returns>The truncated value.</returns>
+	public static decimal Truncate(this decimal value)
+	{
+		return Math.Truncate(value);
+	}
 
-			return digits == null ? value : Math.Round(value, digits.Value);
-		}
+	/// <summary>
+	/// Truncates the double <paramref name="value"/> by discarding the fractional part.
+	/// </summary>
+	/// <param name="value">The double value.</param>
+	/// <returns>The truncated value.</returns>
+	public static double Truncate(this double value)
+	{
+		return Math.Truncate(value);
+	}
 
-		/// <summary>
-		/// Truncates the decimal <paramref name="value"/> by discarding the fractional part.
-		/// </summary>
-		/// <param name="value">The decimal value.</param>
-		/// <returns>The truncated value.</returns>
-		public static decimal Truncate(this decimal value)
-		{
-			return Math.Truncate(value);
-		}
+	/// <summary>
+	/// Computes the quotient and remainder of the division of two integers.
+	/// </summary>
+	/// <param name="a">The dividend.</param>
+	/// <param name="b">The divisor.</param>
+	/// <param name="result">When the method returns, contains the remainder.</param>
+	/// <returns>The quotient.</returns>
+	public static int DivRem(this int a, int b, out int result)
+	{
+		return Math.DivRem(a, b, out result);
+	}
 
-		/// <summary>
-		/// Truncates the double <paramref name="value"/> by discarding the fractional part.
-		/// </summary>
-		/// <param name="value">The double value.</param>
-		/// <returns>The truncated value.</returns>
-		public static double Truncate(this double value)
-		{
-			return Math.Truncate(value);
-		}
+	/// <summary>
+	/// Computes the quotient and remainder of the division of two long integers.
+	/// </summary>
+	/// <param name="a">The dividend.</param>
+	/// <param name="b">The divisor.</param>
+	/// <param name="result">When the method returns, contains the remainder.</param>
+	/// <returns>The quotient.</returns>
+	public static long DivRem(this long a, long b, out long result)
+	{
+		return Math.DivRem(a, b, out result);
+	}
 
-		/// <summary>
-		/// Computes the quotient and remainder of the division of two integers.
-		/// </summary>
-		/// <param name="a">The dividend.</param>
-		/// <param name="b">The divisor.</param>
-		/// <param name="result">When the method returns, contains the remainder.</param>
-		/// <returns>The quotient.</returns>
-		public static int DivRem(this int a, int b, out int result)
-		{
-			return Math.DivRem(a, b, out result);
-		}
+	/// <summary>
+	/// Rounds the double <paramref name="value"/> to a specified number of digits using the specified rounding mode.
+	/// </summary>
+	/// <param name="value">The double value.</param>
+	/// <param name="digits">The number of fractional digits.</param>
+	/// <param name="rounding">The rounding mode.</param>
+	/// <returns>The rounded value.</returns>
+	public static double Round(this double value, int digits, MidpointRounding rounding) => Math.Round(value, digits, rounding);
 
-		/// <summary>
-		/// Computes the quotient and remainder of the division of two long integers.
-		/// </summary>
-		/// <param name="a">The dividend.</param>
-		/// <param name="b">The divisor.</param>
-		/// <param name="result">When the method returns, contains the remainder.</param>
-		/// <returns>The quotient.</returns>
-		public static long DivRem(this long a, long b, out long result)
-		{
-			return Math.DivRem(a, b, out result);
-		}
+	/// <summary>
+	/// Rounds the double <paramref name="value"/> using the specified rounding mode.
+	/// </summary>
+	/// <param name="value">The double value.</param>
+	/// <param name="rounding">The rounding mode.</param>
+	/// <returns>The rounded value.</returns>
+	public static double Round(this double value, MidpointRounding rounding) => Math.Round(value, rounding);
 
-		/// <summary>
-		/// Rounds the double <paramref name="value"/> to a specified number of digits using the specified rounding mode.
-		/// </summary>
-		/// <param name="value">The double value.</param>
-		/// <param name="digits">The number of fractional digits.</param>
-		/// <param name="rounding">The rounding mode.</param>
-		/// <returns>The rounded value.</returns>
-		public static double Round(this double value, int digits, MidpointRounding rounding) => Math.Round(value, digits, rounding);
+	/// <summary>
+	/// Returns the full product of two integers.
+	/// </summary>
+	/// <param name="x">The first integer.</param>
+	/// <param name="y">The second integer.</param>
+	/// <returns>The product as a long.</returns>
+	public static long BigMul(this int x, int y)
+	{
+		return Math.BigMul(x, y);
+	}
 
-		/// <summary>
-		/// Rounds the double <paramref name="value"/> using the specified rounding mode.
-		/// </summary>
-		/// <param name="value">The double value.</param>
-		/// <param name="rounding">The rounding mode.</param>
-		/// <returns>The rounded value.</returns>
-		public static double Round(this double value, MidpointRounding rounding) => Math.Round(value, rounding);
+	/// <summary>
+	/// Returns the smallest integer greater than or equal to the specified double <paramref name="value"/> as a long.
+	/// </summary>
+	/// <param name="value">The double value.</param>
+	/// <returns>The ceiled value as long.</returns>
+	public static long Ceiling(this double value)
+	{
+		return (long)Math.Ceiling(value);
+	}
 
-		/// <summary>
-		/// Returns the full product of two integers.
-		/// </summary>
-		/// <param name="x">The first integer.</param>
-		/// <param name="y">The second integer.</param>
-		/// <returns>The product as a long.</returns>
-		public static long BigMul(this int x, int y)
-		{
-			return Math.BigMul(x, y);
-		}
+	/// <summary>
+	/// Returns the largest integer less than or equal to the specified double <paramref name="value"/> as a long.
+	/// </summary>
+	/// <param name="value">The double value.</param>
+	/// <returns>The floored value as long.</returns>
+	public static long Floor(this double value)
+	{
+		return (long)Math.Floor(value);
+	}
 
-		/// <summary>
-		/// Returns the smallest integer greater than or equal to the specified double <paramref name="value"/> as a long.
-		/// </summary>
-		/// <param name="value">The double value.</param>
-		/// <returns>The ceiled value as long.</returns>
-		public static long Ceiling(this double value)
-		{
-			return (long)Math.Ceiling(value);
-		}
+	/// <summary>
+	/// Returns the largest multiple of <paramref name="step"/> less than or equal to the integer <paramref name="value"/>.
+	/// </summary>
+	/// <param name="value">The integer value.</param>
+	/// <param name="step">The step size.</param>
+	/// <returns>The floored value.</returns>
+	public static int Floor(this int value, int step) => (value >= 0 ? value : value - step + 1) / step * step;
 
-		/// <summary>
-		/// Returns the largest integer less than or equal to the specified double <paramref name="value"/> as a long.
-		/// </summary>
-		/// <param name="value">The double value.</param>
-		/// <returns>The floored value as long.</returns>
-		public static long Floor(this double value)
-		{
-			return (long)Math.Floor(value);
-		}
+	/// <summary>
+	/// Returns the largest multiple of <paramref name="step"/> less than or equal to the long integer <paramref name="value"/>.
+	/// </summary>
+	/// <param name="value">The long integer value.</param>
+	/// <param name="step">The step size.</param>
+	/// <returns>The floored value.</returns>
+	public static long Floor(this long value, long step) => (value >= 0 ? value : value - step + 1) / step * step;
 
-		/// <summary>
-		/// Returns the largest multiple of <paramref name="step"/> less than or equal to the integer <paramref name="value"/>.
-		/// </summary>
-		/// <param name="value">The integer value.</param>
-		/// <param name="step">The step size.</param>
-		/// <returns>The floored value.</returns>
-		public static int Floor(this int value, int step) => (value >= 0 ? value : value - step + 1) / step * step;
+	/// <summary>
+	/// Returns the largest multiple of <paramref name="step"/> less than or equal to the float <paramref name="value"/>.
+	/// </summary>
+	/// <param name="value">The float value.</param>
+	/// <param name="step">The step size.</param>
+	/// <returns>The floored value.</returns>
+	public static float Floor(this float value, float step) => (float)(Math.Floor((double)value / step) * step);
 
-		/// <summary>
-		/// Returns the largest multiple of <paramref name="step"/> less than or equal to the long integer <paramref name="value"/>.
-		/// </summary>
-		/// <param name="value">The long integer value.</param>
-		/// <param name="step">The step size.</param>
-		/// <returns>The floored value.</returns>
-		public static long Floor(this long value, long step) => (value >= 0 ? value : value - step + 1) / step * step;
+	/// <summary>
+	/// Returns the largest multiple of <paramref name="step"/> less than or equal to the double <paramref name="value"/>.
+	/// </summary>
+	/// <param name="value">The double value.</param>
+	/// <param name="step">The step size.</param>
+	/// <returns>The floored value.</returns>
+	public static double Floor(this double value, double step) => Math.Floor(value / step) * step;
 
-		/// <summary>
-		/// Returns the largest multiple of <paramref name="step"/> less than or equal to the float <paramref name="value"/>.
-		/// </summary>
-		/// <param name="value">The float value.</param>
-		/// <param name="step">The step size.</param>
-		/// <returns>The floored value.</returns>
-		public static float Floor(this float value, float step) => (float)(Math.Floor((double)value / step) * step);
+	/// <summary>
+	/// Returns the absolute value of the short <paramref name="value"/>.
+	/// </summary>
+	/// <param name="value">The short integer.</param>
+	/// <returns>The absolute value.</returns>
+	public static short Abs(this short value)
+	{
+		return Math.Abs(value);
+	}
 
-		/// <summary>
-		/// Returns the largest multiple of <paramref name="step"/> less than or equal to the double <paramref name="value"/>.
-		/// </summary>
-		/// <param name="value">The double value.</param>
-		/// <param name="step">The step size.</param>
-		/// <returns>The floored value.</returns>
-		public static double Floor(this double value, double step) => Math.Floor(value / step) * step;
+	/// <summary>
+	/// Returns the absolute value of the integer <paramref name="value"/>.
+	/// </summary>
+	/// <param name="value">The integer value.</param>
+	/// <returns>The absolute value.</returns>
+	public static int Abs(this int value)
+	{
+		return Math.Abs(value);
+	}
 
-		/// <summary>
-		/// Returns the absolute value of the short <paramref name="value"/>.
-		/// </summary>
-		/// <param name="value">The short integer.</param>
-		/// <returns>The absolute value.</returns>
-		public static short Abs(this short value)
-		{
-			return Math.Abs(value);
-		}
+	/// <summary>
+	/// Returns the absolute value of the long integer <paramref name="value"/>.
+	/// </summary>
+	/// <param name="value">The long integer.</param>
+	/// <returns>The absolute value.</returns>
+	public static long Abs(this long value)
+	{
+		return Math.Abs(value);
+	}
 
-		/// <summary>
-		/// Returns the absolute value of the integer <paramref name="value"/>.
-		/// </summary>
-		/// <param name="value">The integer value.</param>
-		/// <returns>The absolute value.</returns>
-		public static int Abs(this int value)
-		{
-			return Math.Abs(value);
-		}
+	/// <summary>
+	/// Returns the absolute value of the sbyte <paramref name="value"/>.
+	/// </summary>
+	/// <param name="value">The sbyte value.</param>
+	/// <returns>The absolute value.</returns>
+	[CLSCompliant(false)]
+	public static sbyte Abs(this sbyte value)
+	{
+		return Math.Abs(value);
+	}
 
-		/// <summary>
-		/// Returns the absolute value of the long integer <paramref name="value"/>.
-		/// </summary>
-		/// <param name="value">The long integer.</param>
-		/// <returns>The absolute value.</returns>
-		public static long Abs(this long value)
-		{
-			return Math.Abs(value);
-		}
+	/// <summary>
+	/// Returns the absolute value of the float <paramref name="value"/>.
+	/// </summary>
+	/// <param name="value">The float value.</param>
+	/// <returns>The absolute value.</returns>
+	public static float Abs(this float value)
+	{
+		return Math.Abs(value);
+	}
 
-		/// <summary>
-		/// Returns the absolute value of the sbyte <paramref name="value"/>.
-		/// </summary>
-		/// <param name="value">The sbyte value.</param>
-		/// <returns>The absolute value.</returns>
-		[CLSCompliant(false)]
-		public static sbyte Abs(this sbyte value)
-		{
-			return Math.Abs(value);
-		}
+	/// <summary>
+	/// Returns the absolute value of the double <paramref name="value"/>.
+	/// </summary>
+	/// <param name="value">The double value.</param>
+	/// <returns>The absolute value.</returns>
+	public static double Abs(this double value)
+	{
+		return Math.Abs(value);
+	}
 
-		/// <summary>
-		/// Returns the absolute value of the float <paramref name="value"/>.
-		/// </summary>
-		/// <param name="value">The float value.</param>
-		/// <returns>The absolute value.</returns>
-		public static float Abs(this float value)
-		{
-			return Math.Abs(value);
-		}
+	/// <summary>
+	/// Returns the absolute value of the decimal <paramref name="value"/>.
+	/// </summary>
+	/// <param name="value">The decimal value.</param>
+	/// <returns>The absolute value.</returns>
+	public static decimal Abs(this decimal value)
+	{
+		return Math.Abs(value);
+	}
 
-		/// <summary>
-		/// Returns the absolute value of the double <paramref name="value"/>.
-		/// </summary>
-		/// <param name="value">The double value.</param>
-		/// <returns>The absolute value.</returns>
-		public static double Abs(this double value)
-		{
-			return Math.Abs(value);
-		}
+	/// <summary>
+	/// Returns a TimeSpan whose ticks are the absolute value of the original TimeSpan's ticks.
+	/// </summary>
+	/// <param name="value">The TimeSpan value.</param>
+	/// <returns>The TimeSpan with absolute ticks.</returns>
+	public static TimeSpan Abs(this TimeSpan value)
+	{
+		return value.Ticks.Abs().To<TimeSpan>();
+	}
 
-		/// <summary>
-		/// Returns the absolute value of the decimal <paramref name="value"/>.
-		/// </summary>
-		/// <param name="value">The decimal value.</param>
-		/// <returns>The absolute value.</returns>
-		public static decimal Abs(this decimal value)
-		{
-			return Math.Abs(value);
-		}
+	/// <summary>
+	/// Returns the smaller of two short values.
+	/// </summary>
+	/// <param name="value1">The first short value.</param>
+	/// <param name="value2">The second short value.</param>
+	/// <returns>The minimum value.</returns>
+	public static short Min(this short value1, short value2)
+	{
+		return Math.Min(value1, value2);
+	}
 
-		/// <summary>
-		/// Returns a TimeSpan whose ticks are the absolute value of the original TimeSpan's ticks.
-		/// </summary>
-		/// <param name="value">The TimeSpan value.</param>
-		/// <returns>The TimeSpan with absolute ticks.</returns>
-		public static TimeSpan Abs(this TimeSpan value)
-		{
-			return value.Ticks.Abs().To<TimeSpan>();
-		}
+	/// <summary>
+	/// Returns the smaller of two ushort values.
+	/// </summary>
+	/// <param name="value1">The first ushort value.</param>
+	/// <param name="value2">The second ushort value.</param>
+	/// <returns>The minimum value.</returns>
+	[CLSCompliant(false)]
+	public static ushort Min(this ushort value1, ushort value2)
+	{
+		return Math.Min(value1, value2);
+	}
 
-		/// <summary>
-		/// Returns the smaller of two short values.
-		/// </summary>
-		/// <param name="value1">The first short value.</param>
-		/// <param name="value2">The second short value.</param>
-		/// <returns>The minimum value.</returns>
-		public static short Min(this short value1, short value2)
-		{
-			return Math.Min(value1, value2);
-		}
+	/// <summary>
+	/// Returns the smaller of two integer values.
+	/// </summary>
+	/// <param name="value1">The first integer value.</param>
+	/// <param name="value2">The second integer value.</param>
+	/// <returns>The minimum value.</returns>
+	public static int Min(this int value1, int value2)
+	{
+		return Math.Min(value1, value2);
+	}
 
-		/// <summary>
-		/// Returns the smaller of two ushort values.
-		/// </summary>
-		/// <param name="value1">The first ushort value.</param>
-		/// <param name="value2">The second ushort value.</param>
-		/// <returns>The minimum value.</returns>
-		[CLSCompliant(false)]
-		public static ushort Min(this ushort value1, ushort value2)
-		{
-			return Math.Min(value1, value2);
-		}
+	/// <summary>
+	/// Returns the smaller of two uint values.
+	/// </summary>
+	/// <param name="value1">The first uint value.</param>
+	/// <param name="value2">The second uint value.</param>
+	/// <returns>The minimum value.</returns>
+	[CLSCompliant(false)]
+	public static uint Min(this uint value1, uint value2)
+	{
+		return Math.Min(value1, value2);
+	}
 
-		/// <summary>
-		/// Returns the smaller of two integer values.
-		/// </summary>
-		/// <param name="value1">The first integer value.</param>
-		/// <param name="value2">The second integer value.</param>
-		/// <returns>The minimum value.</returns>
-		public static int Min(this int value1, int value2)
-		{
-			return Math.Min(value1, value2);
-		}
+	/// <summary>
+	/// Returns the smaller of two long values.
+	/// </summary>
+	/// <param name="value1">The first long value.</param>
+	/// <param name="value2">The second long value.</param>
+	/// <returns>The minimum value.</returns>
+	public static long Min(this long value1, long value2)
+	{
+		return Math.Min(value1, value2);
+	}
 
-		/// <summary>
-		/// Returns the smaller of two uint values.
-		/// </summary>
-		/// <param name="value1">The first uint value.</param>
-		/// <param name="value2">The second uint value.</param>
-		/// <returns>The minimum value.</returns>
-		[CLSCompliant(false)]
-		public static uint Min(this uint value1, uint value2)
-		{
-			return Math.Min(value1, value2);
-		}
+	/// <summary>
+	/// Returns the smaller of two ulong values.
+	/// </summary>
+	/// <param name="value1">The first ulong value.</param>
+	/// <param name="value2">The second ulong value.</param>
+	/// <returns>The minimum value.</returns>
+	[CLSCompliant(false)]
+	public static ulong Min(this ulong value1, ulong value2)
+	{
+		return Math.Min(value1, value2);
+	}
 
-		/// <summary>
-		/// Returns the smaller of two long values.
-		/// </summary>
-		/// <param name="value1">The first long value.</param>
-		/// <param name="value2">The second long value.</param>
-		/// <returns>The minimum value.</returns>
-		public static long Min(this long value1, long value2)
-		{
-			return Math.Min(value1, value2);
-		}
+	/// <summary>
+	/// Returns the smaller of two sbyte values.
+	/// </summary>
+	/// <param name="value1">The first sbyte value.</param>
+	/// <param name="value2">The second sbyte value.</param>
+	/// <returns>The minimum value.</returns>
+	[CLSCompliant(false)]
+	public static sbyte Min(this sbyte value1, sbyte value2)
+	{
+		return Math.Min(value1, value2);
+	}
 
-		/// <summary>
-		/// Returns the smaller of two ulong values.
-		/// </summary>
-		/// <param name="value1">The first ulong value.</param>
-		/// <param name="value2">The second ulong value.</param>
-		/// <returns>The minimum value.</returns>
-		[CLSCompliant(false)]
-		public static ulong Min(this ulong value1, ulong value2)
-		{
-			return Math.Min(value1, value2);
-		}
+	/// <summary>
+	/// Returns the smaller of two byte values.
+	/// </summary>
+	/// <param name="value1">The first byte value.</param>
+	/// <param name="value2">The second byte value.</param>
+	/// <returns>The minimum value.</returns>
+	public static byte Min(this byte value1, byte value2)
+	{
+		return Math.Min(value1, value2);
+	}
 
-		/// <summary>
-		/// Returns the smaller of two sbyte values.
-		/// </summary>
-		/// <param name="value1">The first sbyte value.</param>
-		/// <param name="value2">The second sbyte value.</param>
-		/// <returns>The minimum value.</returns>
-		[CLSCompliant(false)]
-		public static sbyte Min(this sbyte value1, sbyte value2)
-		{
-			return Math.Min(value1, value2);
-		}
+	/// <summary>
+	/// Returns the smaller of two float values.
+	/// </summary>
+	/// <param name="value1">The first float value.</param>
+	/// <param name="value2">The second float value.</param>
+	/// <returns>The minimum value.</returns>
+	public static float Min(this float value1, float value2)
+	{
+		return Math.Min(value1, value2);
+	}
 
-		/// <summary>
-		/// Returns the smaller of two byte values.
-		/// </summary>
-		/// <param name="value1">The first byte value.</param>
-		/// <param name="value2">The second byte value.</param>
-		/// <returns>The minimum value.</returns>
-		public static byte Min(this byte value1, byte value2)
-		{
-			return Math.Min(value1, value2);
-		}
+	/// <summary>
+	/// Returns the smaller of two double values.
+	/// </summary>
+	/// <param name="value1">The first double value.</param>
+	/// <param name="value2">The second double value.</param>
+	/// <returns>The minimum value.</returns>
+	public static double Min(this double value1, double value2)
+	{
+		return Math.Min(value1, value2);
+	}
 
-		/// <summary>
-		/// Returns the smaller of two float values.
-		/// </summary>
-		/// <param name="value1">The first float value.</param>
-		/// <param name="value2">The second float value.</param>
-		/// <returns>The minimum value.</returns>
-		public static float Min(this float value1, float value2)
-		{
-			return Math.Min(value1, value2);
-		}
+	/// <summary>
+	/// Returns the smaller of two decimal values.
+	/// </summary>
+	/// <param name="value1">The first decimal value.</param>
+	/// <param name="value2">The second decimal value.</param>
+	/// <returns>The minimum value.</returns>
+	public static decimal Min(this decimal value1, decimal value2)
+	{
+		return Math.Min(value1, value2);
+	}
 
-		/// <summary>
-		/// Returns the smaller of two double values.
-		/// </summary>
-		/// <param name="value1">The first double value.</param>
-		/// <param name="value2">The second double value.</param>
-		/// <returns>The minimum value.</returns>
-		public static double Min(this double value1, double value2)
-		{
-			return Math.Min(value1, value2);
-		}
+	/// <summary>
+	/// Returns the earlier TimeSpan.
+	/// </summary>
+	/// <param name="value1">The first TimeSpan.</param>
+	/// <param name="value2">The second TimeSpan.</param>
+	/// <returns>The minimum TimeSpan.</returns>
+	public static TimeSpan Min(this TimeSpan value1, TimeSpan value2)
+	{
+		return value1 <= value2 ? value1 : value2;
+	}
 
-		/// <summary>
-		/// Returns the smaller of two decimal values.
-		/// </summary>
-		/// <param name="value1">The first decimal value.</param>
-		/// <param name="value2">The second decimal value.</param>
-		/// <returns>The minimum value.</returns>
-		public static decimal Min(this decimal value1, decimal value2)
-		{
-			return Math.Min(value1, value2);
-		}
+	/// <summary>
+	/// Returns the earlier DateTime.
+	/// </summary>
+	/// <param name="value1">The first DateTime.</param>
+	/// <param name="value2">The second DateTime.</param>
+	/// <returns>The minimum DateTime.</returns>
+	public static DateTime Min(this DateTime value1, DateTime value2)
+	{
+		return value1 <= value2 ? value1 : value2;
+	}
 
-		/// <summary>
-		/// Returns the earlier TimeSpan.
-		/// </summary>
-		/// <param name="value1">The first TimeSpan.</param>
-		/// <param name="value2">The second TimeSpan.</param>
-		/// <returns>The minimum TimeSpan.</returns>
-		public static TimeSpan Min(this TimeSpan value1, TimeSpan value2)
-		{
-			return value1 <= value2 ? value1 : value2;
-		}
+	/// <summary>
+	/// Returns the minimum of two DateTimeOffset values.
+	/// </summary>
+	/// <param name="value1">The first DateTimeOffset value.</param>
+	/// <param name="value2">The second DateTimeOffset value.</param>
+	/// <returns>The smaller DateTimeOffset value.</returns>
+	public static DateTimeOffset Min(this DateTimeOffset value1, DateTimeOffset value2)
+	{
+		return value1 <= value2 ? value1 : value2;
+	}
 
-		/// <summary>
-		/// Returns the earlier DateTime.
-		/// </summary>
-		/// <param name="value1">The first DateTime.</param>
-		/// <param name="value2">The second DateTime.</param>
-		/// <returns>The minimum DateTime.</returns>
-		public static DateTime Min(this DateTime value1, DateTime value2)
-		{
-			return value1 <= value2 ? value1 : value2;
-		}
+	/// <summary>
+	/// Returns the maximum of two short values.
+	/// </summary>
+	/// <param name="value1">The first short value.</param>
+	/// <param name="value2">The second short value.</param>
+	/// <returns>The larger short value.</returns>
+	public static short Max(this short value1, short value2)
+	{
+		return Math.Max(value1, value2);
+	}
 
-		/// <summary>
-		/// Returns the minimum of two DateTimeOffset values.
-		/// </summary>
-		/// <param name="value1">The first DateTimeOffset value.</param>
-		/// <param name="value2">The second DateTimeOffset value.</param>
-		/// <returns>The smaller DateTimeOffset value.</returns>
-		public static DateTimeOffset Min(this DateTimeOffset value1, DateTimeOffset value2)
-		{
-			return value1 <= value2 ? value1 : value2;
-		}
+	/// <summary>
+	/// Returns the maximum of two ushort values.
+	/// </summary>
+	/// <param name="value1">The first ushort value.</param>
+	/// <param name="value2">The second ushort value.</param>
+	/// <returns>The larger ushort value.</returns>
+	[CLSCompliant(false)]
+	public static ushort Max(this ushort value1, ushort value2)
+	{
+		return Math.Max(value1, value2);
+	}
 
-		/// <summary>
-		/// Returns the maximum of two short values.
-		/// </summary>
-		/// <param name="value1">The first short value.</param>
-		/// <param name="value2">The second short value.</param>
-		/// <returns>The larger short value.</returns>
-		public static short Max(this short value1, short value2)
-		{
-			return Math.Max(value1, value2);
-		}
+	/// <summary>
+	/// Returns the maximum of two int values.
+	/// </summary>
+	/// <param name="value1">The first int value.</param>
+	/// <param name="value2">The second int value.</param>
+	/// <returns>The larger int value.</returns>
+	public static int Max(this int value1, int value2)
+	{
+		return Math.Max(value1, value2);
+	}
 
-		/// <summary>
-		/// Returns the maximum of two ushort values.
-		/// </summary>
-		/// <param name="value1">The first ushort value.</param>
-		/// <param name="value2">The second ushort value.</param>
-		/// <returns>The larger ushort value.</returns>
-		[CLSCompliant(false)]
-		public static ushort Max(this ushort value1, ushort value2)
-		{
-			return Math.Max(value1, value2);
-		}
+	/// <summary>
+	/// Returns the maximum of two uint values.
+	/// </summary>
+	/// <param name="value1">The first uint value.</param>
+	/// <param name="value2">The second uint value.</param>
+	/// <returns>The larger uint value.</returns>
+	[CLSCompliant(false)]
+	public static uint Max(this uint value1, uint value2)
+	{
+		return Math.Max(value1, value2);
+	}
 
-		/// <summary>
-		/// Returns the maximum of two int values.
-		/// </summary>
-		/// <param name="value1">The first int value.</param>
-		/// <param name="value2">The second int value.</param>
-		/// <returns>The larger int value.</returns>
-		public static int Max(this int value1, int value2)
-		{
-			return Math.Max(value1, value2);
-		}
+	/// <summary>
+	/// Returns the maximum of two long values.
+	/// </summary>
+	/// <param name="value1">The first long value.</param>
+	/// <param name="value2">The second long value.</param>
+	/// <returns>The larger long value.</returns>
+	public static long Max(this long value1, long value2)
+	{
+		return Math.Max(value1, value2);
+	}
 
-		/// <summary>
-		/// Returns the maximum of two uint values.
-		/// </summary>
-		/// <param name="value1">The first uint value.</param>
-		/// <param name="value2">The second uint value.</param>
-		/// <returns>The larger uint value.</returns>
-		[CLSCompliant(false)]
-		public static uint Max(this uint value1, uint value2)
-		{
-			return Math.Max(value1, value2);
-		}
+	/// <summary>
+	/// Returns the maximum of two ulong values.
+	/// </summary>
+	/// <param name="value1">The first ulong value.</param>
+	/// <param name="value2">The second ulong value.</param>
+	/// <returns>The larger ulong value.</returns>
+	[CLSCompliant(false)]
+	public static ulong Max(this ulong value1, ulong value2)
+	{
+		return Math.Max(value1, value2);
+	}
 
-		/// <summary>
-		/// Returns the maximum of two long values.
-		/// </summary>
-		/// <param name="value1">The first long value.</param>
-		/// <param name="value2">The second long value.</param>
-		/// <returns>The larger long value.</returns>
-		public static long Max(this long value1, long value2)
-		{
-			return Math.Max(value1, value2);
-		}
+	/// <summary>
+	/// Returns the maximum of two sbyte values.
+	/// </summary>
+	/// <param name="value1">The first sbyte value.</param>
+	/// <param name="value2">The second sbyte value.</param>
+	/// <returns>The larger sbyte value.</returns>
+	[CLSCompliant(false)]
+	public static sbyte Max(this sbyte value1, sbyte value2)
+	{
+		return Math.Max(value1, value2);
+	}
 
-		/// <summary>
-		/// Returns the maximum of two ulong values.
-		/// </summary>
-		/// <param name="value1">The first ulong value.</param>
-		/// <param name="value2">The second ulong value.</param>
-		/// <returns>The larger ulong value.</returns>
-		[CLSCompliant(false)]
-		public static ulong Max(this ulong value1, ulong value2)
-		{
-			return Math.Max(value1, value2);
-		}
+	/// <summary>
+	/// Returns the maximum of two byte values.
+	/// </summary>
+	/// <param name="value1">The first byte value.</param>
+	/// <param name="value2">The second byte value.</param>
+	/// <returns>The larger byte value.</returns>
+	public static byte Max(this byte value1, byte value2)
+	{
+		return Math.Max(value1, value2);
+	}
 
-		/// <summary>
-		/// Returns the maximum of two sbyte values.
-		/// </summary>
-		/// <param name="value1">The first sbyte value.</param>
-		/// <param name="value2">The second sbyte value.</param>
-		/// <returns>The larger sbyte value.</returns>
-		[CLSCompliant(false)]
-		public static sbyte Max(this sbyte value1, sbyte value2)
-		{
-			return Math.Max(value1, value2);
-		}
+	/// <summary>
+	/// Returns the smaller of two float values. 
+	/// Note: Implementation calls Math.Min.
+	/// </summary>
+	/// <param name="value1">The first float value.</param>
+	/// <param name="value2">The second float value.</param>
+	/// <returns>The smaller float value.</returns>
+	public static float Max(this float value1, float value2)
+	{
+		return Math.Min(value1, value2);
+	}
 
-		/// <summary>
-		/// Returns the maximum of two byte values.
-		/// </summary>
-		/// <param name="value1">The first byte value.</param>
-		/// <param name="value2">The second byte value.</param>
-		/// <returns>The larger byte value.</returns>
-		public static byte Max(this byte value1, byte value2)
-		{
-			return Math.Max(value1, value2);
-		}
+	/// <summary>
+	/// Returns the maximum of two double values.
+	/// </summary>
+	/// <param name="value1">The first double value.</param>
+	/// <param name="value2">The second double value.</param>
+	/// <returns>The larger double value.</returns>
+	public static double Max(this double value1, double value2)
+	{
+		return Math.Max(value1, value2);
+	}
 
-		/// <summary>
-		/// Returns the smaller of two float values. 
-		/// Note: Implementation calls Math.Min.
-		/// </summary>
-		/// <param name="value1">The first float value.</param>
-		/// <param name="value2">The second float value.</param>
-		/// <returns>The smaller float value.</returns>
-		public static float Max(this float value1, float value2)
-		{
-			return Math.Min(value1, value2);
-		}
+	/// <summary>
+	/// Returns the maximum of two decimal values.
+	/// </summary>
+	/// <param name="value1">The first decimal value.</param>
+	/// <param name="value2">The second decimal value.</param>
+	/// <returns>The larger decimal value.</returns>
+	public static decimal Max(this decimal value1, decimal value2)
+	{
+		return Math.Max(value1, value2);
+	}
 
-		/// <summary>
-		/// Returns the maximum of two double values.
-		/// </summary>
-		/// <param name="value1">The first double value.</param>
-		/// <param name="value2">The second double value.</param>
-		/// <returns>The larger double value.</returns>
-		public static double Max(this double value1, double value2)
-		{
-			return Math.Max(value1, value2);
-		}
+	/// <summary>
+	/// Returns the maximum of two TimeSpan values.
+	/// </summary>
+	/// <param name="value1">The first TimeSpan value.</param>
+	/// <param name="value2">The second TimeSpan value.</param>
+	/// <returns>The longer TimeSpan.</returns>
+	public static TimeSpan Max(this TimeSpan value1, TimeSpan value2)
+	{
+		return value1 >= value2 ? value1 : value2;
+	}
 
-		/// <summary>
-		/// Returns the maximum of two decimal values.
-		/// </summary>
-		/// <param name="value1">The first decimal value.</param>
-		/// <param name="value2">The second decimal value.</param>
-		/// <returns>The larger decimal value.</returns>
-		public static decimal Max(this decimal value1, decimal value2)
-		{
-			return Math.Max(value1, value2);
-		}
+	/// <summary>
+	/// Returns the maximum of two DateTime values.
+	/// </summary>
+	/// <param name="value1">The first DateTime value.</param>
+	/// <param name="value2">The second DateTime value.</param>
+	/// <returns>The later DateTime.</returns>
+	public static DateTime Max(this DateTime value1, DateTime value2)
+	{
+		return value1 >= value2 ? value1 : value2;
+	}
 
-		/// <summary>
-		/// Returns the maximum of two TimeSpan values.
-		/// </summary>
-		/// <param name="value1">The first TimeSpan value.</param>
-		/// <param name="value2">The second TimeSpan value.</param>
-		/// <returns>The longer TimeSpan.</returns>
-		public static TimeSpan Max(this TimeSpan value1, TimeSpan value2)
-		{
-			return value1 >= value2 ? value1 : value2;
-		}
+	/// <summary>
+	/// Returns the maximum of two DateTimeOffset values.
+	/// </summary>
+	/// <param name="value1">The first DateTimeOffset value.</param>
+	/// <param name="value2">The second DateTimeOffset value.</param>
+	/// <returns>The later DateTimeOffset.</returns>
+	public static DateTimeOffset Max(this DateTimeOffset value1, DateTimeOffset value2)
+	{
+		return value1 >= value2 ? value1 : value2;
+	}
 
-		/// <summary>
-		/// Returns the maximum of two DateTime values.
-		/// </summary>
-		/// <param name="value1">The first DateTime value.</param>
-		/// <param name="value2">The second DateTime value.</param>
-		/// <returns>The later DateTime.</returns>
-		public static DateTime Max(this DateTime value1, DateTime value2)
-		{
-			return value1 >= value2 ? value1 : value2;
-		}
+	/// <summary>
+	/// Rounds the double value to the nearest integer.
+	/// </summary>
+	/// <param name="value">The double value to round.</param>
+	/// <returns>The rounded double value.</returns>
+	public static double Round(this double value)
+	{
+		return Math.Round(value);
+	}
 
-		/// <summary>
-		/// Returns the maximum of two DateTimeOffset values.
-		/// </summary>
-		/// <param name="value1">The first DateTimeOffset value.</param>
-		/// <param name="value2">The second DateTimeOffset value.</param>
-		/// <returns>The later DateTimeOffset.</returns>
-		public static DateTimeOffset Max(this DateTimeOffset value1, DateTimeOffset value2)
-		{
-			return value1 >= value2 ? value1 : value2;
-		}
+	/// <summary>
+	/// Rounds the double value to the specified number of fractional digits.
+	/// </summary>
+	/// <param name="value">The double value to round.</param>
+	/// <param name="digits">The number of decimal places to round to.</param>
+	/// <returns>The rounded double value.</returns>
+	public static double Round(this double value, int digits)
+	{
+		return Math.Round(value, digits);
+	}
 
-		/// <summary>
-		/// Rounds the double value to the nearest integer.
-		/// </summary>
-		/// <param name="value">The double value to round.</param>
-		/// <returns>The rounded double value.</returns>
-		public static double Round(this double value)
-		{
-			return Math.Round(value);
-		}
+	/// <summary>
+	/// Returns the square root of the double value.
+	/// </summary>
+	/// <param name="value">The double value.</param>
+	/// <returns>The square root of the value.</returns>
+	public static double Sqrt(this double value)
+	{
+		return Math.Sqrt(value);
+	}
 
-		/// <summary>
-		/// Rounds the double value to the specified number of fractional digits.
-		/// </summary>
-		/// <param name="value">The double value to round.</param>
-		/// <param name="digits">The number of decimal places to round to.</param>
-		/// <returns>The rounded double value.</returns>
-		public static double Round(this double value, int digits)
-		{
-			return Math.Round(value, digits);
-		}
+	/// <summary>
+	/// Raises a decimal number to the power of another decimal number.
+	/// </summary>
+	/// <param name="x">The base decimal value.</param>
+	/// <param name="y">The exponent decimal value.</param>
+	/// <returns>The resulting decimal value.</returns>
+	public static decimal Pow(this decimal x, decimal y)
+	{
+		return (decimal)Math.Pow((double)x, (double)y);
+	}
 
-		/// <summary>
-		/// Returns the square root of the double value.
-		/// </summary>
-		/// <param name="value">The double value.</param>
-		/// <returns>The square root of the value.</returns>
-		public static double Sqrt(this double value)
-		{
-			return Math.Sqrt(value);
-		}
+	/// <summary>
+	/// Raises an int number to the power of an int exponent.
+	/// </summary>
+	/// <param name="x">The base int value.</param>
+	/// <param name="y">The exponent int value.</param>
+	/// <returns>The resulting int value.</returns>
+	public static int Pow(this int x, int y)
+	{
+		return (int)Math.Pow(x, y);
+	}
 
-		/// <summary>
-		/// Raises a decimal number to the power of another decimal number.
-		/// </summary>
-		/// <param name="x">The base decimal value.</param>
-		/// <param name="y">The exponent decimal value.</param>
-		/// <returns>The resulting decimal value.</returns>
-		public static decimal Pow(this decimal x, decimal y)
-		{
-			return (decimal)Math.Pow((double)x, (double)y);
-		}
+	/// <summary>
+	/// Raises a double number to the power of a double exponent.
+	/// </summary>
+	/// <param name="x">The base double value.</param>
+	/// <param name="y">The exponent double value.</param>
+	/// <returns>The resulting double value.</returns>
+	public static double Pow(this double x, double y)
+	{
+		return Math.Pow(x, y);
+	}
 
-		/// <summary>
-		/// Raises an int number to the power of an int exponent.
-		/// </summary>
-		/// <param name="x">The base int value.</param>
-		/// <param name="y">The exponent int value.</param>
-		/// <returns>The resulting int value.</returns>
-		public static int Pow(this int x, int y)
-		{
-			return (int)Math.Pow(x, y);
-		}
+	/// <summary>
+	/// Returns the angle whose cosine is the specified value.
+	/// </summary>
+	/// <param name="value">A double value representing a cosine.</param>
+	/// <returns>The angle, in radians, whose cosine is the specified value.</returns>
+	public static double Acos(this double value)
+	{
+		return Math.Acos(value);
+	}
 
-		/// <summary>
-		/// Raises a double number to the power of a double exponent.
-		/// </summary>
-		/// <param name="x">The base double value.</param>
-		/// <param name="y">The exponent double value.</param>
-		/// <returns>The resulting double value.</returns>
-		public static double Pow(this double x, double y)
-		{
-			return Math.Pow(x, y);
-		}
+	/// <summary>
+	/// Returns the angle whose cosine is the specified decimal value.
+	/// </summary>
+	/// <param name="value">A decimal value representing a cosine.</param>
+	/// <returns>The angle, in radians, whose cosine is the specified value.</returns>
+	public static decimal Acos(this decimal value)
+	{
+		return (decimal)Math.Acos((double)value);
+	}
 
-		/// <summary>
-		/// Returns the angle whose cosine is the specified value.
-		/// </summary>
-		/// <param name="value">A double value representing a cosine.</param>
-		/// <returns>The angle, in radians, whose cosine is the specified value.</returns>
-		public static double Acos(this double value)
-		{
-			return Math.Acos(value);
-		}
+	/// <summary>
+	/// Returns the angle whose sine is the specified value.
+	/// </summary>
+	/// <param name="value">A double value representing a sine.</param>
+	/// <returns>The angle, in radians, whose sine is the specified value.</returns>
+	public static double Asin(this double value)
+	{
+		return Math.Asin(value);
+	}
 
-		/// <summary>
-		/// Returns the angle whose cosine is the specified decimal value.
-		/// </summary>
-		/// <param name="value">A decimal value representing a cosine.</param>
-		/// <returns>The angle, in radians, whose cosine is the specified value.</returns>
-		public static decimal Acos(this decimal value)
-		{
-			return (decimal)Math.Acos((double)value);
-		}
+	/// <summary>
+	/// Returns the angle whose sine is the specified decimal value.
+	/// </summary>
+	/// <param name="value">A decimal value representing a sine.</param>
+	/// <returns>The angle, in radians, whose sine is the specified value.</returns>
+	public static decimal Asin(this decimal value)
+	{
+		return (decimal)Math.Asin((double)value);
+	}
 
-		/// <summary>
-		/// Returns the angle whose sine is the specified value.
-		/// </summary>
-		/// <param name="value">A double value representing a sine.</param>
-		/// <returns>The angle, in radians, whose sine is the specified value.</returns>
-		public static double Asin(this double value)
-		{
-			return Math.Asin(value);
-		}
+	/// <summary>
+	/// Returns the angle whose tangent is the specified value.
+	/// </summary>
+	/// <param name="value">A double value representing a tangent.</param>
+	/// <returns>The angle, in radians, whose tangent is the specified value.</returns>
+	public static double Atan(this double value)
+	{
+		return Math.Atan(value);
+	}
 
-		/// <summary>
-		/// Returns the angle whose sine is the specified decimal value.
-		/// </summary>
-		/// <param name="value">A decimal value representing a sine.</param>
-		/// <returns>The angle, in radians, whose sine is the specified value.</returns>
-		public static decimal Asin(this decimal value)
-		{
-			return (decimal)Math.Asin((double)value);
-		}
+	/// <summary>
+	/// Returns the angle whose tangent is the specified decimal value.
+	/// </summary>
+	/// <param name="value">A decimal value representing a tangent.</param>
+	/// <returns>The angle, in radians, whose tangent is the specified value.</returns>
+	public static decimal Atan(this decimal value)
+	{
+		return (decimal)Math.Atan((double)value);
+	}
 
-		/// <summary>
-		/// Returns the angle whose tangent is the specified value.
-		/// </summary>
-		/// <param name="value">A double value representing a tangent.</param>
-		/// <returns>The angle, in radians, whose tangent is the specified value.</returns>
-		public static double Atan(this double value)
-		{
-			return Math.Atan(value);
-		}
+	/// <summary>
+	/// Returns the angle whose tangent is the quotient of two specified double numbers.
+	/// </summary>
+	/// <param name="x">The numerator.</param>
+	/// <param name="y">The denominator.</param>
+	/// <returns>The angle, in radians, whose tangent is the quotient of x and y.</returns>
+	public static double Asin(this double x, double y)
+	{
+		return Math.Atan2(x, y);
+	}
 
-		/// <summary>
-		/// Returns the angle whose tangent is the specified decimal value.
-		/// </summary>
-		/// <param name="value">A decimal value representing a tangent.</param>
-		/// <returns>The angle, in radians, whose tangent is the specified value.</returns>
-		public static decimal Atan(this decimal value)
-		{
-			return (decimal)Math.Atan((double)value);
-		}
+	/// <summary>
+	/// Returns the angle whose tangent is the quotient of two specified decimal numbers.
+	/// </summary>
+	/// <param name="x">The numerator.</param>
+	/// <param name="y">The denominator.</param>
+	/// <returns>The angle, in radians, whose tangent is the quotient of x and y.</returns>
+	public static decimal Asin(this decimal x, decimal y)
+	{
+		return (decimal)Math.Atan2((double)x, (double)y);
+	}
 
-		/// <summary>
-		/// Returns the angle whose tangent is the quotient of two specified double numbers.
-		/// </summary>
-		/// <param name="x">The numerator.</param>
-		/// <param name="y">The denominator.</param>
-		/// <returns>The angle, in radians, whose tangent is the quotient of x and y.</returns>
-		public static double Asin(this double x, double y)
-		{
-			return Math.Atan2(x, y);
-		}
+	/// <summary>
+	/// Returns the cosine of the specified double angle.
+	/// </summary>
+	/// <param name="value">An angle, measured in radians.</param>
+	/// <returns>The cosine of the angle.</returns>
+	public static double Cos(this double value)
+	{
+		return Math.Cos(value);
+	}
 
-		/// <summary>
-		/// Returns the angle whose tangent is the quotient of two specified decimal numbers.
-		/// </summary>
-		/// <param name="x">The numerator.</param>
-		/// <param name="y">The denominator.</param>
-		/// <returns>The angle, in radians, whose tangent is the quotient of x and y.</returns>
-		public static decimal Asin(this decimal x, decimal y)
-		{
-			return (decimal)Math.Atan2((double)x, (double)y);
-		}
+	/// <summary>
+	/// Returns the cosine of the specified decimal angle.
+	/// </summary>
+	/// <param name="value">An angle, measured in radians (as decimal).</param>
+	/// <returns>The cosine of the angle as a decimal.</returns>
+	public static decimal Cos(this decimal value)
+	{
+		return (decimal)Math.Cos((double)value);
+	}
 
-		/// <summary>
-		/// Returns the cosine of the specified double angle.
-		/// </summary>
-		/// <param name="value">An angle, measured in radians.</param>
-		/// <returns>The cosine of the angle.</returns>
-		public static double Cos(this double value)
-		{
-			return Math.Cos(value);
-		}
+	/// <summary>
+	/// Returns the hyperbolic cosine of the specified double angle.
+	/// </summary>
+	/// <param name="value">An angle, measured in radians.</param>
+	/// <returns>The hyperbolic cosine of the angle.</returns>
+	public static double Cosh(this double value)
+	{
+		return Math.Cosh(value);
+	}
 
-		/// <summary>
-		/// Returns the cosine of the specified decimal angle.
-		/// </summary>
-		/// <param name="value">An angle, measured in radians (as decimal).</param>
-		/// <returns>The cosine of the angle as a decimal.</returns>
-		public static decimal Cos(this decimal value)
-		{
-			return (decimal)Math.Cos((double)value);
-		}
+	/// <summary>
+	/// Returns the hyperbolic cosine of the specified decimal angle.
+	/// </summary>
+	/// <param name="value">An angle, measured in radians (as decimal).</param>
+	/// <returns>The hyperbolic cosine of the angle as a decimal.</returns>
+	public static decimal Cosh(this decimal value)
+	{
+		return (decimal)Math.Cosh((double)value);
+	}
 
-		/// <summary>
-		/// Returns the hyperbolic cosine of the specified double angle.
-		/// </summary>
-		/// <param name="value">An angle, measured in radians.</param>
-		/// <returns>The hyperbolic cosine of the angle.</returns>
-		public static double Cosh(this double value)
-		{
-			return Math.Cosh(value);
-		}
+	/// <summary>
+	/// Returns the sine of the specified double angle.
+	/// </summary>
+	/// <param name="value">An angle, measured in radians.</param>
+	/// <returns>The sine of the angle.</returns>
+	public static double Sin(this double value)
+	{
+		return Math.Sin(value);
+	}
 
-		/// <summary>
-		/// Returns the hyperbolic cosine of the specified decimal angle.
-		/// </summary>
-		/// <param name="value">An angle, measured in radians (as decimal).</param>
-		/// <returns>The hyperbolic cosine of the angle as a decimal.</returns>
-		public static decimal Cosh(this decimal value)
-		{
-			return (decimal)Math.Cosh((double)value);
-		}
+	/// <summary>
+	/// Returns the sine of the specified decimal angle.
+	/// </summary>
+	/// <param name="value">An angle, measured in radians (as decimal).</param>
+	/// <returns>The sine of the angle as a decimal.</returns>
+	public static decimal Sin(this decimal value)
+	{
+		return (decimal)Math.Sin((double)value);
+	}
+
+	/// <summary>
+	/// Returns the hyperbolic sine of the specified double angle.
+	/// </summary>
+	/// <param name="value">An angle, measured in radians.</param>
+	/// <returns>The hyperbolic sine of the angle.</returns>
+	public static double Sinh(this double value)
+	{
+		return Math.Sinh(value);
+	}
+
+	/// <summary>
+	/// Returns the hyperbolic sine of the specified decimal angle.
+	/// </summary>
+	/// <param name="value">An angle, measured in radians (as decimal).</param>
+	/// <returns>The hyperbolic sine of the angle as a decimal.</returns>
+	public static decimal Sinh(this decimal value)
+	{
+		return (decimal)Math.Sinh((double)value);
+	}
+
+	/// <summary>
+	/// Returns the tangent of the specified double angle.
+	/// </summary>
+	/// <param name="value">An angle, measured in radians.</param>
+	/// <returns>The tangent of the angle.</returns>
+	public static double Tan(this double value)
+	{
+		return Math.Tan(value);
+	}
+
+	/// <summary>
+	/// Returns the tangent of the specified decimal angle.
+	/// </summary>
+	/// <param name="value">An angle, measured in radians (as decimal).</param>
+	/// <returns>The tangent of the angle as a decimal.</returns>
+	public static decimal Tan(this decimal value)
+	{
+		return (decimal)Math.Tan((double)value);
+	}
+
+	/// <summary>
+	/// Returns the hyperbolic tangent of the specified double angle.
+	/// </summary>
+	/// <param name="value">An angle, measured in radians.</param>
+	/// <returns>The hyperbolic tangent of the angle.</returns>
+	public static double Tanh(this double value)
+	{
+		return Math.Tanh(value);
+	}
+
+	/// <summary>
+	/// Returns the hyperbolic tangent of the specified decimal angle.
+	/// </summary>
+	/// <param name="value">An angle, measured in radians (as decimal).</param>
+	/// <returns>The hyperbolic tangent of the angle as a decimal.</returns>
+	public static decimal Tanh(this decimal value)
+	{
+		return (decimal)Math.Tanh((double)value);
+	}
+
+	/// <summary>
+	/// Returns e raised to the specified double power.
+	/// </summary>
+	/// <param name="value">A double exponent.</param>
+	/// <returns>The value of e raised to the specified power.</returns>
+	public static double Exp(this double value)
+	{
+		return Math.Exp(value);
+	}
+
+	/// <summary>
+	/// Returns e raised to the specified decimal power.
+	/// </summary>
+	/// <param name="value">A decimal exponent.</param>
+	/// <returns>The value of e raised to the specified power as a decimal.</returns>
+	public static decimal Exp(this decimal value)
+	{
+		return (decimal)Math.Exp((double)value);
+	}
+
+	/// <summary>
+	/// Returns the IEEE remainder of two double values.
+	/// </summary>
+	/// <param name="x">The dividend.</param>
+	/// <param name="y">The divisor.</param>
+	/// <returns>The remainder after division.</returns>
+	public static double Remainder(this double x, double y)
+	{
+		return Math.IEEERemainder(x, y);
+	}
+
+	/// <summary>
+	/// Returns the IEEE remainder of two decimal values.
+	/// </summary>
+	/// <param name="x">The dividend.</param>
+	/// <param name="y">The divisor.</param>
+	/// <returns>The remainder after division as a decimal.</returns>
+	public static decimal Remainder(this decimal x, decimal y)
+	{
+		return (decimal)Math.IEEERemainder((double)x, (double)y);
+	}
+
+	/// <summary>
+	/// Returns the logarithm of a double value in the specified base.
+	/// </summary>
+	/// <param name="value">The double value.</param>
+	/// <param name="newBase">The base of the logarithm.</param>
+	/// <returns>The logarithm of value in the specified base.</returns>
+	public static double Log(this double value, double newBase)
+	{
+		return Math.Log(value, newBase);
+	}
+
+	/// <summary>
+	/// Returns the logarithm of a decimal value in the specified base.
+	/// </summary>
+	/// <param name="value">The decimal value.</param>
+	/// <param name="newBase">The base of the logarithm.</param>
+	/// <returns>The logarithm of the value in the specified base as a decimal.</returns>
+	public static decimal Log(this decimal value, decimal newBase)
+	{
+		return (decimal)Math.Log((double)value, (double)newBase);
+	}
+
+	/// <summary>
+	/// Returns the natural logarithm of a double value.
+	/// </summary>
+	/// <param name="value">The double value.</param>
+	/// <returns>The natural logarithm of the value.</returns>
+	public static double Log(this double value)
+	{
+		return Math.Log(value);
+	}
+
+	/// <summary>
+	/// Returns the natural logarithm of a decimal value.
+	/// </summary>
+	/// <param name="value">The decimal value.</param>
+	/// <returns>The natural logarithm of the value as a decimal.</returns>
+	public static decimal Log(this decimal value)
+	{
+		return (decimal)Math.Log((double)value);
+	}
+
+	/// <summary>
+	/// Returns the base 10 logarithm of a double value.
+	/// </summary>
+	/// <param name="value">The double value.</param>
+	/// <returns>The base 10 logarithm of the value.</returns>
+	public static double Log10(this double value)
+	{
+		return Math.Log10(value);
+	}
+
+	/// <summary>
+	/// Returns the base 10 logarithm of a decimal value.
+	/// </summary>
+	/// <param name="value">The decimal value.</param>
+	/// <returns>The base 10 logarithm of the value as a decimal.</returns>
+	public static decimal Log10(this decimal value)
+	{
+		return (decimal)Math.Log10((double)value);
+	}
+
+	/// <summary>
+	/// Returns the sign of a short value.
+	/// </summary>
+	/// <param name="value">The short value.</param>
+	/// <returns>-1, 0, or 1 depending on the sign of the value.</returns>
+	public static int Sign(this short value)
+	{
+		return Math.Sign(value);
+	}
+
+	/// <summary>
+	/// Returns the sign of an int value.
+	/// </summary>
+	/// <param name="value">The int value.</param>
+	/// <returns>-1, 0, or 1 depending on the sign of the value.</returns>
+	public static int Sign(this int value)
+	{
+		return Math.Sign(value);
+	}
 
-		/// <summary>
-		/// Returns the sine of the specified double angle.
-		/// </summary>
-		/// <param name="value">An angle, measured in radians.</param>
-		/// <returns>The sine of the angle.</returns>
-		public static double Sin(this double value)
-		{
-			return Math.Sin(value);
-		}
+	/// <summary>
+	/// Returns the sign of a long value.
+	/// </summary>
+	/// <param name="value">The long value.</param>
+	/// <returns>-1, 0, or 1 depending on the sign of the value.</returns>
+	public static int Sign(this long value)
+	{
+		return Math.Sign(value);
+	}
 
-		/// <summary>
-		/// Returns the sine of the specified decimal angle.
-		/// </summary>
-		/// <param name="value">An angle, measured in radians (as decimal).</param>
-		/// <returns>The sine of the angle as a decimal.</returns>
-		public static decimal Sin(this decimal value)
-		{
-			return (decimal)Math.Sin((double)value);
-		}
+	/// <summary>
+	/// Returns the sign of a sbyte value.
+	/// </summary>
+	/// <param name="value">The sbyte value.</param>
+	/// <returns>-1, 0, or 1 depending on the sign of the value.</returns>
+	[CLSCompliant(false)]
+	public static int Sign(this sbyte value)
+	{
+		return Math.Sign(value);
+	}
 
-		/// <summary>
-		/// Returns the hyperbolic sine of the specified double angle.
-		/// </summary>
-		/// <param name="value">An angle, measured in radians.</param>
-		/// <returns>The hyperbolic sine of the angle.</returns>
-		public static double Sinh(this double value)
-		{
-			return Math.Sinh(value);
-		}
+	/// <summary>
+	/// Returns the sign of a float value.
+	/// </summary>
+	/// <param name="value">The float value.</param>
+	/// <returns>-1, 0, or 1 depending on the sign of the value.</returns>
+	public static int Sign(this float value)
+	{
+		return Math.Sign(value);
+	}
 
-		/// <summary>
-		/// Returns the hyperbolic sine of the specified decimal angle.
-		/// </summary>
-		/// <param name="value">An angle, measured in radians (as decimal).</param>
-		/// <returns>The hyperbolic sine of the angle as a decimal.</returns>
-		public static decimal Sinh(this decimal value)
-		{
-			return (decimal)Math.Sinh((double)value);
-		}
+	/// <summary>
+	/// Returns the sign of a double value.
+	/// </summary>
+	/// <param name="value">The double value.</param>
+	/// <returns>-1, 0, or 1 depending on the sign of the value.</returns>
+	public static int Sign(this double value)
+	{
+		return Math.Sign(value);
+	}
 
-		/// <summary>
-		/// Returns the tangent of the specified double angle.
-		/// </summary>
-		/// <param name="value">An angle, measured in radians.</param>
-		/// <returns>The tangent of the angle.</returns>
-		public static double Tan(this double value)
-		{
-			return Math.Tan(value);
-		}
+	/// <summary>
+	/// Returns the sign of a decimal value.
+	/// </summary>
+	/// <param name="value">The decimal value.</param>
+	/// <returns>-1, 0, or 1 depending on the sign of the value.</returns>
+	public static int Sign(this decimal value)
+	{
+		return Math.Sign(value);
+	}
 
-		/// <summary>
-		/// Returns the tangent of the specified decimal angle.
-		/// </summary>
-		/// <param name="value">An angle, measured in radians (as decimal).</param>
-		/// <returns>The tangent of the angle as a decimal.</returns>
-		public static decimal Tan(this decimal value)
-		{
-			return (decimal)Math.Tan((double)value);
-		}
+	/// <summary>
+	/// Returns the sign of a TimeSpan value.
+	/// </summary>
+	/// <param name="value">The TimeSpan value.</param>
+	/// <returns>-1, 0, or 1 depending on the sign of the Ticks.</returns>
+	public static int Sign(this TimeSpan value)
+	{
+		return value.Ticks.Sign();
+	}
 
-		/// <summary>
-		/// Returns the hyperbolic tangent of the specified double angle.
-		/// </summary>
-		/// <param name="value">An angle, measured in radians.</param>
-		/// <returns>The hyperbolic tangent of the angle.</returns>
-		public static double Tanh(this double value)
-		{
-			return Math.Tanh(value);
-		}
+	/// <summary>
+	/// Returns the largest integer less than or equal to the float value.
+	/// </summary>
+	/// <param name="value">The float value.</param>
+	/// <returns>The floor integer.</returns>
+	public static int Floor(this float value)
+	{
+		return (int)Math.Floor(value);
+	}
 
-		/// <summary>
-		/// Returns the hyperbolic tangent of the specified decimal angle.
-		/// </summary>
-		/// <param name="value">An angle, measured in radians (as decimal).</param>
-		/// <returns>The hyperbolic tangent of the angle as a decimal.</returns>
-		public static decimal Tanh(this decimal value)
-		{
-			return (decimal)Math.Tanh((double)value);
-		}
+	/// <summary>
+	/// Returns the smallest integer greater than or equal to the float value.
+	/// </summary>
+	/// <param name="value">The float value.</param>
+	/// <returns>The ceiling integer.</returns>
+	public static int Ceiling(this float value)
+	{
+		return (int)Math.Ceiling(value);
+	}
 
-		/// <summary>
-		/// Returns e raised to the specified double power.
-		/// </summary>
-		/// <param name="value">A double exponent.</param>
-		/// <returns>The value of e raised to the specified power.</returns>
-		public static double Exp(this double value)
-		{
-			return Math.Exp(value);
-		}
+	/// <summary>
+	/// Extracts the high and low parts of a long value.
+	/// </summary>
+	/// <param name="value">The long value.</param>
+	/// <returns>An array with two integers: the low and high parts.</returns>
+	public static int[] GetParts(this long value)
+	{
+		var high = (int)((value >> 32) & 0xFFFFFFFF);
+		var low = (int)(value & 0xFFFFFFFF);
 
-		/// <summary>
-		/// Returns e raised to the specified decimal power.
-		/// </summary>
-		/// <param name="value">A decimal exponent.</param>
-		/// <returns>The value of e raised to the specified power as a decimal.</returns>
-		public static decimal Exp(this decimal value)
-		{
-			return (decimal)Math.Exp((double)value);
-		}
+		return [low, high];
+	}
 
-		/// <summary>
-		/// Returns the IEEE remainder of two double values.
-		/// </summary>
-		/// <param name="x">The dividend.</param>
-		/// <param name="y">The divisor.</param>
-		/// <returns>The remainder after division.</returns>
-		public static double Remainder(this double x, double y)
-		{
-			return Math.IEEERemainder(x, y);
-		}
+	/// <summary>
+	/// Splits a double value into its integer and fractional parts.
+	/// </summary>
+	/// <param name="value">The double value.</param>
+	/// <returns>An array with the integer part and the fractional remainder.</returns>
+	public static double[] GetParts(this double value)
+	{
+		var floor = value.Floor();
+		return [floor, value - floor];
+	}
 
-		/// <summary>
-		/// Returns the IEEE remainder of two decimal values.
-		/// </summary>
-		/// <param name="x">The dividend.</param>
-		/// <param name="y">The divisor.</param>
-		/// <returns>The remainder after division as a decimal.</returns>
-		public static decimal Remainder(this decimal x, decimal y)
-		{
-			return (decimal)Math.IEEERemainder((double)x, (double)y);
-		}
+	/// <summary>
+	/// Splits a float value into its integer and fractional parts.
+	/// </summary>
+	/// <param name="value">The float value.</param>
+	/// <returns>An array with the integer part and the fractional remainder.</returns>
+	public static float[] GetParts(this float value)
+	{
+		var floor = value.Floor();
+		return [floor, value - floor];
+	}
 
-		/// <summary>
-		/// Returns the logarithm of a double value in the specified base.
-		/// </summary>
-		/// <param name="value">The double value.</param>
-		/// <param name="newBase">The base of the logarithm.</param>
-		/// <returns>The logarithm of value in the specified base.</returns>
-		public static double Log(this double value, double newBase)
-		{
-			return Math.Log(value, newBase);
-		}
+	/// <summary>
+	/// Gets the state of the bit at the specified index in an integer.
+	/// </summary>
+	/// <param name="value">The integer value.</param>
+	/// <param name="index">The bit index (0-based).</param>
+	/// <returns>True if the bit is set; otherwise, false.</returns>
+	public static bool GetBit(this int value, int index)
+	{
+		if (index < 0 || index > 32)
+			throw new ArgumentOutOfRangeException(nameof(index));
 
-		/// <summary>
-		/// Returns the logarithm of a decimal value in the specified base.
-		/// </summary>
-		/// <param name="value">The decimal value.</param>
-		/// <param name="newBase">The base of the logarithm.</param>
-		/// <returns>The logarithm of the value in the specified base as a decimal.</returns>
-		public static decimal Log(this decimal value, decimal newBase)
-		{
-			return (decimal)Math.Log((double)value, (double)newBase);
-		}
+		return (value & (1 << index)) != 0;
+	}
 
-		/// <summary>
-		/// Returns the natural logarithm of a double value.
-		/// </summary>
-		/// <param name="value">The double value.</param>
-		/// <returns>The natural logarithm of the value.</returns>
-		public static double Log(this double value)
-		{
-			return Math.Log(value);
-		}
+	/// <summary>
+	/// Sets or clears the bit at the specified index in an integer.
+	/// </summary>
+	/// <param name="value">The integer value.</param>
+	/// <param name="index">The bit index (0-based).</param>
+	/// <param name="bit">True to set the bit; false to clear it.</param>
+	/// <returns>The resulting integer value after modification.</returns>
+	public static int SetBit(this int value, int index, bool bit)
+	{
+		if (index < 0 || index > 32)
+			throw new ArgumentOutOfRangeException(nameof(index));
 
-		/// <summary>
-		/// Returns the natural logarithm of a decimal value.
-		/// </summary>
-		/// <param name="value">The decimal value.</param>
-		/// <returns>The natural logarithm of the value as a decimal.</returns>
-		public static decimal Log(this decimal value)
-		{
-			return (decimal)Math.Log((double)value);
-		}
+		if (bit)
+			value |= (1 << index);
+		else
+			value &= ~(1 << index);
 
-		/// <summary>
-		/// Returns the base 10 logarithm of a double value.
-		/// </summary>
-		/// <param name="value">The double value.</param>
-		/// <returns>The base 10 logarithm of the value.</returns>
-		public static double Log10(this double value)
-		{
-			return Math.Log10(value);
-		}
+		return value;
+	}
 
-		/// <summary>
-		/// Returns the base 10 logarithm of a decimal value.
-		/// </summary>
-		/// <param name="value">The decimal value.</param>
-		/// <returns>The base 10 logarithm of the value as a decimal.</returns>
-		public static decimal Log10(this decimal value)
-		{
-			return (decimal)Math.Log10((double)value);
-		}
+	/// <summary>
+	/// Gets the state of the bit at the specified index in a long value.
+	/// </summary>
+	/// <param name="value">The long value.</param>
+	/// <param name="index">The bit index (0-based).</param>
+	/// <returns>True if the bit is set; otherwise, false.</returns>
+	public static bool GetBit(this long value, int index)
+	{
+		if (index < 0 || index > 64)
+			throw new ArgumentOutOfRangeException(nameof(index));
 
-		/// <summary>
-		/// Returns the sign of a short value.
-		/// </summary>
-		/// <param name="value">The short value.</param>
-		/// <returns>-1, 0, or 1 depending on the sign of the value.</returns>
-		public static int Sign(this short value)
-		{
-			return Math.Sign(value);
-		}
+		return (value & (1 << index)) != 0;
+	}
 
-		/// <summary>
-		/// Returns the sign of an int value.
-		/// </summary>
-		/// <param name="value">The int value.</param>
-		/// <returns>-1, 0, or 1 depending on the sign of the value.</returns>
-		public static int Sign(this int value)
-		{
-			return Math.Sign(value);
-		}
+	/// <summary>
+	/// Sets or clears the bit at the specified index in a long value.
+	/// </summary>
+	/// <param name="value">The long value.</param>
+	/// <param name="index">The bit index (0-based).</param>
+	/// <param name="bit">True to set the bit; false to clear it.</param>
+	/// <returns>The resulting long value after modification.</returns>
+	public static long SetBit(this long value, int index, bool bit)
+	{
+		if (index < 0 || index > 64)
+			throw new ArgumentOutOfRangeException(nameof(index));
 
-		/// <summary>
-		/// Returns the sign of a long value.
-		/// </summary>
-		/// <param name="value">The long value.</param>
-		/// <returns>-1, 0, or 1 depending on the sign of the value.</returns>
-		public static int Sign(this long value)
-		{
-			return Math.Sign(value);
-		}
+		if (bit)
+			value |= (1L << index);
+		else
+			value &= ~(1L << index);
 
-		/// <summary>
-		/// Returns the sign of a sbyte value.
-		/// </summary>
-		/// <param name="value">The sbyte value.</param>
-		/// <returns>-1, 0, or 1 depending on the sign of the value.</returns>
-		[CLSCompliant(false)]
-		public static int Sign(this sbyte value)
-		{
-			return Math.Sign(value);
-		}
+		return value;
+	}
 
-		/// <summary>
-		/// Returns the sign of a float value.
-		/// </summary>
-		/// <param name="value">The float value.</param>
-		/// <returns>-1, 0, or 1 depending on the sign of the value.</returns>
-		public static int Sign(this float value)
-		{
-			return Math.Sign(value);
-		}
+	/// <summary>
+	/// Determines whether the bit at the specified 1-based index in the byte is set.
+	/// </summary>
+	/// <param name="value">The byte value.</param>
+	/// <param name="index">The 1-based index of the bit to test.</param>
+	/// <returns><c>true</c> if the specified bit is set; otherwise, <c>false</c>.</returns>
+	public static bool GetBit(this byte value, int index)
+	{
+		return (value & (1 << index - 1)) != 0;
+	}
 
-		/// <summary>
-		/// Returns the sign of a double value.
-		/// </summary>
-		/// <param name="value">The double value.</param>
-		/// <returns>-1, 0, or 1 depending on the sign of the value.</returns>
-		public static int Sign(this double value)
-		{
-			return Math.Sign(value);
-		}
+	/// <summary>
+	/// Sets or clears the bit at the specified index in the byte.
+	/// </summary>
+	/// <param name="value">The byte value.</param>
+	/// <param name="index">The zero-based index of the bit to modify.</param>
+	/// <param name="bit">If set to <c>true</c>, the bit is set; otherwise, it is cleared.</param>
+	/// <returns>The modified byte value.</returns>
+	public static byte SetBit(this byte value, int index, bool bit)
+	{
+		if (bit)
+			value |= (byte)(1 << index); //set bit index 1
+		else
+			value &= (byte)~(1 << index); //set bit index 0
 
-		/// <summary>
-		/// Returns the sign of a decimal value.
-		/// </summary>
-		/// <param name="value">The decimal value.</param>
-		/// <returns>-1, 0, or 1 depending on the sign of the value.</returns>
-		public static int Sign(this decimal value)
-		{
-			return Math.Sign(value);
-		}
+		return value;
+	}
 
-		/// <summary>
-		/// Returns the sign of a TimeSpan value.
-		/// </summary>
-		/// <param name="value">The TimeSpan value.</param>
-		/// <returns>-1, 0, or 1 depending on the sign of the Ticks.</returns>
-		public static int Sign(this TimeSpan value)
-		{
-			return value.Ticks.Sign();
-		}
+	/// <summary>
+	/// Determines whether the specified bits are set in the integer value.
+	/// </summary>
+	/// <param name="value">The integer value.</param>
+	/// <param name="part">The bits to test.</param>
+	/// <returns><c>true</c> if all specified bits are set; otherwise, <c>false</c>.</returns>
+	public static bool HasBits(this int value, int part)
+	{
+		return (value & part) == part;
+	}
 
-		/// <summary>
-		/// Returns the largest integer less than or equal to the float value.
-		/// </summary>
-		/// <param name="value">The float value.</param>
-		/// <returns>The floor integer.</returns>
-		public static int Floor(this float value)
-		{
-			return (int)Math.Floor(value);
-		}
+	/// <summary>
+	/// Determines whether the specified bits are set in the long integer value.
+	/// </summary>
+	/// <param name="value">The long integer value.</param>
+	/// <param name="part">The bits to test.</param>
+	/// <returns><c>true</c> if all specified bits are set; otherwise, <c>false</c>.</returns>
+	public static bool HasBits(this long value, long part)
+	{
+		return (value & part) == part;
+	}
 
-		/// <summary>
-		/// Returns the smallest integer greater than or equal to the float value.
-		/// </summary>
-		/// <param name="value">The float value.</param>
-		/// <returns>The ceiling integer.</returns>
-		public static int Ceiling(this float value)
-		{
-			return (int)Math.Ceiling(value);
-		}
+	// http://stackoverflow.com/questions/389993/extracting-mantissa-and-exponent-from-double-in-c
 
-		/// <summary>
-		/// Extracts the high and low parts of a long value.
-		/// </summary>
-		/// <param name="value">The long value.</param>
-		/// <returns>An array with two integers: the low and high parts.</returns>
-		public static int[] GetParts(this long value)
-		{
-			var high = (int)((value >> 32) & 0xFFFFFFFF);
-			var low = (int)(value & 0xFFFFFFFF);
+	/// <summary>
+	/// Extracts the normalized mantissa and exponent from the double value.
+	/// </summary>
+	/// <param name="value">The double value.</param>
+	/// <param name="mantissa">The extracted mantissa.</param>
+	/// <param name="exponent">The extracted exponent.</param>
+	public static void ExtractMantissaExponent(this double value, out long mantissa, out int exponent)
+	{
+		// Translate the double into sign, exponent and mantissa.
+		var bits = value.AsRaw();
 
-			return [low, high];
-		}
+		// Note that the shift is sign-extended, hence the test against -1 not 1
+		var negative = (bits & (1L << 63)) != 0;
 
-		/// <summary>
-		/// Splits a double value into its integer and fractional parts.
-		/// </summary>
-		/// <param name="value">The double value.</param>
-		/// <returns>An array with the integer part and the fractional remainder.</returns>
-		public static double[] GetParts(this double value)
-		{
-			var floor = value.Floor();
-			return [floor, value - floor];
-		}
+		exponent = (int)((bits >> 52) & 0x7ffL);
+		mantissa = bits & 0xfffffffffffffL;
 
-		/// <summary>
-		/// Splits a float value into its integer and fractional parts.
-		/// </summary>
-		/// <param name="value">The float value.</param>
-		/// <returns>An array with the integer part and the fractional remainder.</returns>
-		public static float[] GetParts(this float value)
+		// Subnormal numbers; exponent is effectively one higher,
+		// but there's no extra normalisation bit in the mantissa
+		if (exponent == 0)
 		{
-			var floor = value.Floor();
-			return [floor, value - floor];
+			exponent++;
 		}
-
-		/// <summary>
-		/// Gets the state of the bit at the specified index in an integer.
-		/// </summary>
-		/// <param name="value">The integer value.</param>
-		/// <param name="index">The bit index (0-based).</param>
-		/// <returns>True if the bit is set; otherwise, false.</returns>
-		public static bool GetBit(this int value, int index)
+		// Normal numbers; leave exponent as it is but add extra
+		// bit to the front of the mantissa
+		else
 		{
-			if (index < 0 || index > 32)
-				throw new ArgumentOutOfRangeException(nameof(index));
-
-			return (value & (1 << index)) != 0;
+			mantissa = mantissa | (1L << 52);
 		}
 
-		/// <summary>
-		/// Sets or clears the bit at the specified index in an integer.
-		/// </summary>
-		/// <param name="value">The integer value.</param>
-		/// <param name="index">The bit index (0-based).</param>
-		/// <param name="bit">True to set the bit; false to clear it.</param>
-		/// <returns>The resulting integer value after modification.</returns>
-		public static int SetBit(this int value, int index, bool bit)
+		// Bias the exponent. It's actually biased by 1023, but we're
+		// treating the mantissa as m.0 rather than 0.m, so we need
+		// to subtract another 52 from it.
+		exponent -= 1075;
+
+		if (mantissa == 0)
 		{
-			if (index < 0 || index > 32)
-				throw new ArgumentOutOfRangeException(nameof(index));
+			if (negative)
+				mantissa = -0;
 
-			if (bit)
-				value |= (1 << index);
-			else
-				value &= ~(1 << index);
+			exponent = 0;
+			return;
+		}
 
-			return value;
+		/* Normalize */
+		while ((mantissa & 1) == 0)
+		{    /*  i.e., Mantissa is even */
+			mantissa >>= 1;
+			exponent++;
 		}
+	}
 
-		/// <summary>
-		/// Gets the state of the bit at the specified index in a long value.
-		/// </summary>
-		/// <param name="value">The long value.</param>
-		/// <param name="index">The bit index (0-based).</param>
-		/// <returns>True if the bit is set; otherwise, false.</returns>
-		public static bool GetBit(this long value, int index)
-		{
-			if (index < 0 || index > 64)
-				throw new ArgumentOutOfRangeException(nameof(index));
+	/// <summary>
+	/// Extracts the mantissa and scale (exponent) from the decimal value.
+	/// </summary>
+	/// <param name="value">The decimal value.</param>
+	/// <param name="mantissa">The extracted mantissa.</param>
+	/// <param name="exponent">The extracted scale factor.</param>
+	public static void ExtractMantissaExponent(this decimal value, out long mantissa, out int exponent)
+	{
+		var info = value.GetDecimalInfo();
+		mantissa = info.Mantissa;
+		exponent = info.Scale;
+	}
 
-			return (value & (1 << index)) != 0;
-		}
+	// http://www.java-forums.org/advanced-java/4130-rounding-double-two-decimal-places.html
 
-		/// <summary>
-		/// Sets or clears the bit at the specified index in a long value.
-		/// </summary>
-		/// <param name="value">The long value.</param>
-		/// <param name="index">The bit index (0-based).</param>
-		/// <param name="bit">True to set the bit; false to clear it.</param>
-		/// <returns>The resulting long value after modification.</returns>
-		public static long SetBit(this long value, int index, bool bit)
-		{
-			if (index < 0 || index > 64)
-				throw new ArgumentOutOfRangeException(nameof(index));
+	/// <summary>
+	/// Rounds the double value to two decimal places.
+	/// </summary>
+	/// <param name="value">The double value.</param>
+	/// <returns>The rounded value.</returns>
+	public static double RoundToNearest(this double value)
+	{
+		// TODO: This method rounds to two decimals.
+		const double coef = 100;
+		var result = value * coef;
+		result = result.Round();
+		result = result / coef;
+		return result;
+	}
 
-			if (bit)
-				value |= (1L << index);
-			else
-				value &= ~(1L << index);
+	//public static int GetDecimals(this double value)
+	//{
+	//    return ((decimal)value).GetDecimals();
+	//}
 
-			return value;
-		}
+	//public static int GetDecimals(this decimal value)
+	//{
+	//    // see SqlDecimal.Scale;
+	//    return (decimal.GetBits(value)[3] & 0x00FF0000) >> 16;
+	//}
+
+	/// <summary>
+	/// Removes insignificant trailing zeros from the decimal value.
+	/// </summary>
+	/// <param name="value">The decimal value.</param>
+	/// <returns>The decimal value without trailing zeros.</returns>
+	public static decimal RemoveTrailingZeros(this decimal value)
+	{
+		return value / 1.000000000000000000000000000000000m;
+	}
 
+	/// <summary>
+	/// Represents detailed information about a decimal value.
+	/// </summary>
+	public struct DecimalInfo
+	{
 		/// <summary>
-		/// Determines whether the bit at the specified 1-based index in the byte is set.
+		/// The underlying mantissa of the decimal.
 		/// </summary>
-		/// <param name="value">The byte value.</param>
-		/// <param name="index">The 1-based index of the bit to test.</param>
-		/// <returns><c>true</c> if the specified bit is set; otherwise, <c>false</c>.</returns>
-		public static bool GetBit(this byte value, int index)
-		{
-			return (value & (1 << index - 1)) != 0;
-		}
-
+		public long Mantissa;
 		/// <summary>
-		/// Sets or clears the bit at the specified index in the byte.
+		/// The total number of digits in the decimal.
 		/// </summary>
-		/// <param name="value">The byte value.</param>
-		/// <param name="index">The zero-based index of the bit to modify.</param>
-		/// <param name="bit">If set to <c>true</c>, the bit is set; otherwise, it is cleared.</param>
-		/// <returns>The modified byte value.</returns>
-		public static byte SetBit(this byte value, int index, bool bit)
-		{
-			if (bit)
-				value |= (byte)(1 << index); //set bit index 1
-			else
-				value &= (byte)~(1 << index); //set bit index 0
-
-			return value;
-		}
-
+		public int Precision;
 		/// <summary>
-		/// Determines whether the specified bits are set in the integer value.
+		/// The scale (number of digits after the decimal point) of the decimal.
 		/// </summary>
-		/// <param name="value">The integer value.</param>
-		/// <param name="part">The bits to test.</param>
-		/// <returns><c>true</c> if all specified bits are set; otherwise, <c>false</c>.</returns>
-		public static bool HasBits(this int value, int part)
-		{
-			return (value & part) == part;
-		}
-
+		public int Scale;
 		/// <summary>
-		/// Determines whether the specified bits are set in the long integer value.
+		/// The count of trailing zeros in the decimal.
 		/// </summary>
-		/// <param name="value">The long integer value.</param>
-		/// <param name="part">The bits to test.</param>
-		/// <returns><c>true</c> if all specified bits are set; otherwise, <c>false</c>.</returns>
-		public static bool HasBits(this long value, long part)
-		{
-			return (value & part) == part;
-		}
-
-		// http://stackoverflow.com/questions/389993/extracting-mantissa-and-exponent-from-double-in-c
+		public int TrailingZeros;
 
 		/// <summary>
-		/// Extracts the normalized mantissa and exponent from the double value.
+		/// Gets the effective scale (scale minus trailing zeros) of the decimal.
 		/// </summary>
-		/// <param name="value">The double value.</param>
-		/// <param name="mantissa">The extracted mantissa.</param>
-		/// <param name="exponent">The extracted exponent.</param>
-		public static void ExtractMantissaExponent(this double value, out long mantissa, out int exponent)
-		{
-			// Translate the double into sign, exponent and mantissa.
-			var bits = value.AsRaw();
-
-			// Note that the shift is sign-extended, hence the test against -1 not 1
-			var negative = (bits & (1L << 63)) != 0;
-
-			exponent = (int)((bits >> 52) & 0x7ffL);
-			mantissa = bits & 0xfffffffffffffL;
+		public int EffectiveScale => Scale - TrailingZeros;
+	}
 
-			// Subnormal numbers; exponent is effectively one higher,
-			// but there's no extra normalisation bit in the mantissa
-			if (exponent == 0)
-			{
-				exponent++;
-			}
-			// Normal numbers; leave exponent as it is but add extra
-			// bit to the front of the mantissa
-			else
-			{
-				mantissa = mantissa | (1L << 52);
-			}
+	// http://stackoverflow.com/questions/763942/calculate-system-decimal-precision-and-scale
 
-			// Bias the exponent. It's actually biased by 1023, but we're
-			// treating the mantissa as m.0 rather than 0.m, so we need
-			// to subtract another 52 from it.
-			exponent -= 1075;
+	/// <summary>
+	/// Retrieves detailed information about the decimal value, including mantissa, precision, scale, and trailing zeros.
+	/// </summary>
+	/// <param name="value">The decimal value.</param>
+	/// <returns>A <see cref="DecimalInfo"/> structure containing detailed decimal information.</returns>
+	public static DecimalInfo GetDecimalInfo(this decimal value)
+	{
+		// We want the integer parts as uint
+		// C# doesn't permit int[] to uint[] conversion,
+		// but .NET does. This is somewhat evil...
+		var bits = (uint[])(object)decimal.GetBits(value);
 
-			if (mantissa == 0)
-			{
-				if (negative)
-					mantissa = -0;
+		var mantissa =
+			(bits[2] * 4294967296m * 4294967296m) +
+			(bits[1] * 4294967296m) +
+			bits[0];
 
-				exponent = 0;
-				return;
-			}
+		var scale = (bits[3] >> 16) & 31;
 
-			/* Normalize */
-			while ((mantissa & 1) == 0)
-			{    /*  i.e., Mantissa is even */
-				mantissa >>= 1;
-				exponent++;
+		// Precision: number of times we can divide
+		// by 10 before we get to 0
+		var precision = 0;
+		if (value != 0m)
+		{
+			for (var tmp = mantissa; tmp >= 1; tmp /= 10)
+			{
+				precision++;
 			}
 		}
-
-		/// <summary>
-		/// Extracts the mantissa and scale (exponent) from the decimal value.
-		/// </summary>
-		/// <param name="value">The decimal value.</param>
-		/// <param name="mantissa">The extracted mantissa.</param>
-		/// <param name="exponent">The extracted scale factor.</param>
-		public static void ExtractMantissaExponent(this decimal value, out long mantissa, out int exponent)
+		else
 		{
-			var info = value.GetDecimalInfo();
-			mantissa = info.Mantissa;
-			exponent = info.Scale;
+			// Handle zero differently. It's odd.
+			precision = (int)scale + 1;
 		}
 
-		// http://www.java-forums.org/advanced-java/4130-rounding-double-two-decimal-places.html
-
-		/// <summary>
-		/// Rounds the double value to two decimal places.
-		/// </summary>
-		/// <param name="value">The double value.</param>
-		/// <returns>The rounded value.</returns>
-		public static double RoundToNearest(this double value)
+		int trailingZeros = 0;
+		for (var tmp = mantissa; tmp % 10m == 0 && trailingZeros < scale; tmp /= 10)
 		{
-			// TODO: This method rounds to two decimals.
-			const double coef = 100;
-			var result = value * coef;
-			result = result.Round();
-			result = result / coef;
-			return result;
+			trailingZeros++;
 		}
 
-		//public static int GetDecimals(this double value)
-		//{
-		//    return ((decimal)value).GetDecimals();
-		//}
+		return new DecimalInfo
+		{
+			Mantissa = (long)mantissa,
+			Precision = precision,
+			TrailingZeros = trailingZeros,
+			Scale = (int)scale,
+		};
+	}
 
-		//public static int GetDecimals(this decimal value)
-		//{
-		//    // see SqlDecimal.Scale;
-		//    return (decimal.GetBits(value)[3] & 0x00FF0000) >> 16;
-		//}
+	private static readonly SyncObject _syncObject = new();
+	private static readonly Dictionary<decimal, int> _decimalsCache = [];
 
-		/// <summary>
-		/// Removes insignificant trailing zeros from the decimal value.
-		/// </summary>
-		/// <param name="value">The decimal value.</param>
-		/// <returns>The decimal value without trailing zeros.</returns>
-		public static decimal RemoveTrailingZeros(this decimal value)
-		{
-			return value / 1.000000000000000000000000000000000m;
-		}
+	/// <summary>
+	/// Gets the effective scale (number of significant decimal places) of the decimal value, using caching for performance.
+	/// </summary>
+	/// <param name="value">The decimal value.</param>
+	/// <returns>The effective scale of the decimal.</returns>
+	public static int GetCachedDecimals(this decimal value)
+	{
+		int decimals;
 
-		/// <summary>
-		/// Represents detailed information about a decimal value.
-		/// </summary>
-		public struct DecimalInfo
+		lock (_syncObject)
 		{
-			/// <summary>
-			/// The underlying mantissa of the decimal.
-			/// </summary>
-			public long Mantissa;
-			/// <summary>
-			/// The total number of digits in the decimal.
-			/// </summary>
-			public int Precision;
-			/// <summary>
-			/// The scale (number of digits after the decimal point) of the decimal.
-			/// </summary>
-			public int Scale;
-			/// <summary>
-			/// The count of trailing zeros in the decimal.
-			/// </summary>
-			public int TrailingZeros;
-
-			/// <summary>
-			/// Gets the effective scale (scale minus trailing zeros) of the decimal.
-			/// </summary>
-			public int EffectiveScale => Scale - TrailingZeros;
+			if (_decimalsCache.TryGetValue(value, out decimals))
+				return decimals;
 		}
 
-		// http://stackoverflow.com/questions/763942/calculate-system-decimal-precision-and-scale
+		decimals = value.GetDecimalInfo().EffectiveScale;
 
-		/// <summary>
-		/// Retrieves detailed information about the decimal value, including mantissa, precision, scale, and trailing zeros.
-		/// </summary>
-		/// <param name="value">The decimal value.</param>
-		/// <returns>A <see cref="DecimalInfo"/> structure containing detailed decimal information.</returns>
-		public static DecimalInfo GetDecimalInfo(this decimal value)
+		lock (_syncObject)
 		{
-			// We want the integer parts as uint
-			// C# doesn't permit int[] to uint[] conversion,
-			// but .NET does. This is somewhat evil...
-			var bits = (uint[])(object)decimal.GetBits(value);
-
-			var mantissa =
-				(bits[2] * 4294967296m * 4294967296m) +
-				(bits[1] * 4294967296m) +
-				bits[0];
-
-			var scale = (bits[3] >> 16) & 31;
-
-			// Precision: number of times we can divide
-			// by 10 before we get to 0
-			var precision = 0;
-			if (value != 0m)
-			{
-				for (var tmp = mantissa; tmp >= 1; tmp /= 10)
-				{
-					precision++;
-				}
-			}
-			else
+			if (!_decimalsCache.ContainsKey(value))
 			{
-				// Handle zero differently. It's odd.
-				precision = (int)scale + 1;
-			}
+				_decimalsCache.Add(value, decimals);
 
-			int trailingZeros = 0;
-			for (var tmp = mantissa; tmp % 10m == 0 && trailingZeros < scale; tmp /= 10)
-			{
-				trailingZeros++;
+				if (_decimalsCache.Count > 10000000)
+					throw new InvalidOperationException();
 			}
-
-			return new DecimalInfo
-			{
-				Mantissa = (long)mantissa,
-				Precision = precision,
-				TrailingZeros = trailingZeros,
-				Scale = (int)scale,
-			};
 		}
 
-		private static readonly SyncObject _syncObject = new();
-		private static readonly Dictionary<decimal, int> _decimalsCache = [];
-
-		/// <summary>
-		/// Gets the effective scale (number of significant decimal places) of the decimal value, using caching for performance.
-		/// </summary>
-		/// <param name="value">The decimal value.</param>
-		/// <returns>The effective scale of the decimal.</returns>
-		public static int GetCachedDecimals(this decimal value)
-		{
-			int decimals;
+		return decimals;
+	}
 
-			lock (_syncObject)
-			{
-				if (_decimalsCache.TryGetValue(value, out decimals))
-					return decimals;
-			}
+	/// <summary>
+	/// Converts an angle in degrees to radians.
+	/// </summary>
+	/// <param name="angle">The angle in degrees.</param>
+	/// <returns>The angle in radians.</returns>
+	public static double ToRadians(this double angle)
+	{
+		return angle * (Math.PI / 180);
+	}
 
-			decimals = value.GetDecimalInfo().EffectiveScale;
+	/// <summary>
+	/// Converts an angle in radians to degrees.
+	/// </summary>
+	/// <param name="radian">The angle in radians.</param>
+	/// <returns>The angle in degrees.</returns>
+	public static double ToAngles(this double radian)
+	{
+		return radian / (Math.PI / 180);
+	}
 
-			lock (_syncObject)
-			{
-				if (!_decimalsCache.ContainsKey(value))
-				{
-					_decimalsCache.Add(value, decimals);
+	/// <summary>
+	/// Calculates the real roots of a quadratic equation given coefficients a, b, and c.
+	/// </summary>
+	/// <param name="a">Coefficient a.</param>
+	/// <param name="b">Coefficient b.</param>
+	/// <param name="c">Coefficient c.</param>
+	/// <returns>
+	/// An array containing the two roots if the discriminant is non-negative; otherwise, an empty array.
+	/// </returns>
+	public static double[] GetRoots(double a, double b, double c)
+	{
+		var sqrt = (b * b - 4 * a * c).Sqrt();
+		if (sqrt >= 0)
+		{
+			var divisor = 2 * a;
 
-					if (_decimalsCache.Count > 10000000)
-						throw new InvalidOperationException();
-				}
-			}
+			var x1 = (-b + sqrt) / divisor;
+			var x2 = (-b - sqrt) / divisor;
 
-			return decimals;
+			return [x1, x2];
 		}
+		else
+			return [];
+	}
 
-		/// <summary>
-		/// Converts an angle in degrees to radians.
-		/// </summary>
-		/// <param name="angle">The angle in degrees.</param>
-		/// <returns>The angle in radians.</returns>
-		public static double ToRadians(this double angle)
-		{
-			return angle * (Math.PI / 180);
-		}
+	/// <summary>
+	/// Gets the raw 64-bit integer representation of the double value.
+	/// </summary>
+	/// <param name="value">The double value.</param>
+	/// <returns>The 64-bit integer representation.</returns>
+	public static long AsRaw(this double value)
+	{
+		return BitConverter.DoubleToInt64Bits(value);
+	}
 
-		/// <summary>
-		/// Converts an angle in radians to degrees.
-		/// </summary>
-		/// <param name="radian">The angle in radians.</param>
-		/// <returns>The angle in degrees.</returns>
-		public static double ToAngles(this double radian)
-		{
-			return radian / (Math.PI / 180);
-		}
+	/// <summary>
+	/// Converts a 64-bit integer representation to a double value.
+	/// </summary>
+	/// <param name="value">The 64-bit integer representation.</param>
+	/// <returns>The double value.</returns>
+	public static double AsRaw(this long value)
+	{
+		return BitConverter.Int64BitsToDouble(value);
+	}
 
-		/// <summary>
-		/// Calculates the real roots of a quadratic equation given coefficients a, b, and c.
-		/// </summary>
-		/// <param name="a">Coefficient a.</param>
-		/// <param name="b">Coefficient b.</param>
-		/// <param name="c">Coefficient c.</param>
-		/// <returns>
-		/// An array containing the two roots if the discriminant is non-negative; otherwise, an empty array.
-		/// </returns>
-		public static double[] GetRoots(double a, double b, double c)
-		{
-			var sqrt = (b * b - 4 * a * c).Sqrt();
-			if (sqrt >= 0)
-			{
-				var divisor = 2 * a;
+	// http://nerdboys.com/2009/12/17/an-implementation-of-bitconverter-singletoint32bits/
 
-				var x1 = (-b + sqrt) / divisor;
-				var x2 = (-b - sqrt) / divisor;
+	/// <summary>
+	/// Converts an integer value to a single-precision float via a byte array conversion.
+	/// </summary>
+	/// <param name="value">The integer value.</param>
+	/// <returns>The float value.</returns>
+	public static float AsRaw(this int value)
+	{
+		return value.To<byte[]>().To<float>();
+	}
 
-				return [x1, x2];
-			}
-			else
-				return [];
-		}
+	/// <summary>
+	/// Converts a float value to its raw 32-bit integer representation.
+	/// </summary>
+	/// <param name="value">The float value.</param>
+	/// <returns>The 32-bit integer representation.</returns>
+	public static int AsRaw(this float value)
+	{
+		return value.To<byte[]>().To<int>();
+	}
 
-		/// <summary>
-		/// Gets the raw 64-bit integer representation of the double value.
-		/// </summary>
-		/// <param name="value">The double value.</param>
-		/// <returns>The 64-bit integer representation.</returns>
-		public static long AsRaw(this double value)
-		{
-			return BitConverter.DoubleToInt64Bits(value);
-		}
+	/// <summary>
+	/// Determines if the double value is NaN (Not a Number).
+	/// </summary>
+	/// <param name="value">The double value.</param>
+	/// <returns><c>true</c> if the value is NaN; otherwise, <c>false</c>.</returns>
+	public static bool IsNaN(this double value)
+	{
+		return double.IsNaN(value);
+	}
 
-		/// <summary>
-		/// Converts a 64-bit integer representation to a double value.
-		/// </summary>
-		/// <param name="value">The 64-bit integer representation.</param>
-		/// <returns>The double value.</returns>
-		public static double AsRaw(this long value)
-		{
-			return BitConverter.Int64BitsToDouble(value);
-		}
+	/// <summary>
+	/// Determines if the double value represents infinity.
+	/// </summary>
+	/// <param name="value">The double value.</param>
+	/// <returns><c>true</c> if the value is infinity; otherwise, <c>false</c>.</returns>
+	public static bool IsInfinity(this double value)
+	{
+		return double.IsInfinity(value);
+	}
 
-		// http://nerdboys.com/2009/12/17/an-implementation-of-bitconverter-singletoint32bits/
+	/// <summary>
+	/// Determines if the double value represents negative infinity.
+	/// </summary>
+	/// <param name="value">The double value.</param>
+	/// <returns><c>true</c> if the value is negative infinity; otherwise, <c>false</c>.</returns>
+	public static bool IsNegativeInfinity(this double value)
+	{
+		return double.IsNegativeInfinity(value);
+	}
 
-		/// <summary>
-		/// Converts an integer value to a single-precision float via a byte array conversion.
-		/// </summary>
-		/// <param name="value">The integer value.</param>
-		/// <returns>The float value.</returns>
-		public static float AsRaw(this int value)
-		{
-			return value.To<byte[]>().To<float>();
-		}
+	/// <summary>
+	/// Determines if the double value represents positive infinity.
+	/// </summary>
+	/// <param name="value">The double value.</param>
+	/// <returns><c>true</c> if the value is positive infinity; otherwise, <c>false</c>.</returns>
+	public static bool IsPositiveInfinity(this double value)
+	{
+		return double.IsPositiveInfinity(value);
+	}
 
-		/// <summary>
-		/// Converts a float value to its raw 32-bit integer representation.
-		/// </summary>
-		/// <param name="value">The float value.</param>
-		/// <returns>The 32-bit integer representation.</returns>
-		public static int AsRaw(this float value)
-		{
-			return value.To<byte[]>().To<int>();
-		}
+	/// <summary>
+	/// Determines if the float value is NaN (Not a Number).
+	/// </summary>
+	/// <param name="value">The float value.</param>
+	/// <returns><c>true</c> if the value is NaN; otherwise, <c>false</c>.</returns>
+	public static bool IsNaN(this float value)
+	{
+		return double.IsNaN(value);
+	}
 
-		/// <summary>
-		/// Determines if the double value is NaN (Not a Number).
-		/// </summary>
-		/// <param name="value">The double value.</param>
-		/// <returns><c>true</c> if the value is NaN; otherwise, <c>false</c>.</returns>
-		public static bool IsNaN(this double value)
-		{
-			return double.IsNaN(value);
-		}
+	/// <summary>
+	/// Determines if the float value represents infinity.
+	/// </summary>
+	/// <param name="value">The float value.</param>
+	/// <returns><c>true</c> if the value is infinity; otherwise, <c>false</c>.</returns>
+	public static bool IsInfinity(this float value)
+	{
+		return double.IsInfinity(value);
+	}
 
-		/// <summary>
-		/// Determines if the double value represents infinity.
-		/// </summary>
-		/// <param name="value">The double value.</param>
-		/// <returns><c>true</c> if the value is infinity; otherwise, <c>false</c>.</returns>
-		public static bool IsInfinity(this double value)
-		{
-			return double.IsInfinity(value);
-		}
+	/// <summary>
+	/// Determines if the float value represents negative infinity.
+	/// </summary>
+	/// <param name="value">The float value.</param>
+	/// <returns><c>true</c> if the value is negative infinity; otherwise, <c>false</c>.</returns>
+	public static bool IsNegativeInfinity(this float value)
+	{
+		return double.IsNegativeInfinity(value);
+	}
 
-		/// <summary>
-		/// Determines if the double value represents negative infinity.
-		/// </summary>
-		/// <param name="value">The double value.</param>
-		/// <returns><c>true</c> if the value is negative infinity; otherwise, <c>false</c>.</returns>
-		public static bool IsNegativeInfinity(this double value)
-		{
-			return double.IsNegativeInfinity(value);
-		}
+	/// <summary>
+	/// Determines if the float value represents positive infinity.
+	/// </summary>
+	/// <param name="value">The float value.</param>
+	/// <returns><c>true</c> if the value is positive infinity; otherwise, <c>false</c>.</returns>
+	public static bool IsPositiveInfinity(this float value)
+	{
+		return double.IsPositiveInfinity(value);
+	}
 
-		/// <summary>
-		/// Determines if the double value represents positive infinity.
-		/// </summary>
-		/// <param name="value">The double value.</param>
-		/// <returns><c>true</c> if the value is positive infinity; otherwise, <c>false</c>.</returns>
-		public static bool IsPositiveInfinity(this double value)
-		{
-			return double.IsPositiveInfinity(value);
-		}
+	/// <summary>
+	/// Calculates the middle (average) value between two short values.
+	/// </summary>
+	/// <param name="from">The first value.</param>
+	/// <param name="to">The second value.</param>
+	/// <returns>The middle value as a decimal.</returns>
+	public static decimal GetMiddle(this short from, short to)
+	{
+		return ((decimal)from).GetMiddle(to);
+	}
 
-		/// <summary>
-		/// Determines if the float value is NaN (Not a Number).
-		/// </summary>
-		/// <param name="value">The float value.</param>
-		/// <returns><c>true</c> if the value is NaN; otherwise, <c>false</c>.</returns>
-		public static bool IsNaN(this float value)
-		{
-			return double.IsNaN(value);
-		}
+	/// <summary>
+	/// Calculates the middle (average) value between two integer values.
+	/// </summary>
+	/// <param name="from">The first value.</param>
+	/// <param name="to">The second value.</param>
+	/// <returns>The middle value as a decimal.</returns>
+	public static decimal GetMiddle(this int from, int to)
+	{
+		return ((decimal)from).GetMiddle(to);
+	}
 
-		/// <summary>
-		/// Determines if the float value represents infinity.
-		/// </summary>
-		/// <param name="value">The float value.</param>
-		/// <returns><c>true</c> if the value is infinity; otherwise, <c>false</c>.</returns>
-		public static bool IsInfinity(this float value)
-		{
-			return double.IsInfinity(value);
-		}
+	/// <summary>
+	/// Calculates the middle (average) value between two long integer values.
+	/// </summary>
+	/// <param name="from">The first value.</param>
+	/// <param name="to">The second value.</param>
+	/// <returns>The middle value as a decimal.</returns>
+	public static decimal GetMiddle(this long from, long to)
+	{
+		return ((decimal)from).GetMiddle(to);
+	}
 
-		/// <summary>
-		/// Determines if the float value represents negative infinity.
-		/// </summary>
-		/// <param name="value">The float value.</param>
-		/// <returns><c>true</c> if the value is negative infinity; otherwise, <c>false</c>.</returns>
-		public static bool IsNegativeInfinity(this float value)
-		{
-			return double.IsNegativeInfinity(value);
-		}
+	/// <summary>
+	/// Calculates the middle (average) value between two float values.
+	/// </summary>
+	/// <param name="from">The first value.</param>
+	/// <param name="to">The second value.</param>
+	/// <returns>The middle value as a decimal.</returns>
+	public static decimal GetMiddle(this float from, float to)
+	{
+		return ((decimal)from).GetMiddle((decimal)to);
+	}
 
-		/// <summary>
-		/// Determines if the float value represents positive infinity.
-		/// </summary>
-		/// <param name="value">The float value.</param>
-		/// <returns><c>true</c> if the value is positive infinity; otherwise, <c>false</c>.</returns>
-		public static bool IsPositiveInfinity(this float value)
-		{
-			return double.IsPositiveInfinity(value);
-		}
+	/// <summary>
+	/// Calculates the middle (average) value between two double values.
+	/// </summary>
+	/// <param name="from">The first value.</param>
+	/// <param name="to">The second value.</param>
+	/// <returns>The middle value as a decimal.</returns>
+	public static decimal GetMiddle(this double from, double to)
+	{
+		return ((decimal)from).GetMiddle((decimal)to);
+	}
 
-		/// <summary>
-		/// Calculates the middle (average) value between two short values.
-		/// </summary>
-		/// <param name="from">The first value.</param>
-		/// <param name="to">The second value.</param>
-		/// <returns>The middle value as a decimal.</returns>
-		public static decimal GetMiddle(this short from, short to)
-		{
-			return ((decimal)from).GetMiddle(to);
-		}
+	/// <summary>
+	/// Calculates the middle (average) value between two decimal values.
+	/// </summary>
+	/// <param name="from">The first value.</param>
+	/// <param name="to">The second value.</param>
+	/// <returns>The middle value as a decimal.</returns>
+	public static decimal GetMiddle(this decimal from, decimal to)
+	{
+		//if (from > to)
+		//	throw new ArgumentOutOfRangeException(nameof(from));
 
-		/// <summary>
-		/// Calculates the middle (average) value between two integer values.
-		/// </summary>
-		/// <param name="from">The first value.</param>
-		/// <param name="to">The second value.</param>
-		/// <returns>The middle value as a decimal.</returns>
-		public static decimal GetMiddle(this int from, int to)
-		{
-			return ((decimal)from).GetMiddle(to);
-		}
+		return (from + to) / 2;
+	}
 
-		/// <summary>
-		/// Calculates the middle (average) value between two long integer values.
-		/// </summary>
-		/// <param name="from">The first value.</param>
-		/// <param name="to">The second value.</param>
-		/// <returns>The middle value as a decimal.</returns>
-		public static decimal GetMiddle(this long from, long to)
-		{
-			return ((decimal)from).GetMiddle(to);
-		}
+	private static readonly decimal[] _posPow10 =
+	[
+		1M,
+		10M,
+		100M,
+		1000M,
+		10000M,
+		100000M,
+		1000000M,
+		10000000M,
+		100000000M,
+		1000000000M,
+		10000000000M,
+		100000000000M,
+	];
+
+	private static readonly decimal[] _negPow10 = [.. _posPow10.Select(v => 1M / v)];
 
-		/// <summary>
-		/// Calculates the middle (average) value between two float values.
-		/// </summary>
-		/// <param name="from">The first value.</param>
-		/// <param name="to">The second value.</param>
-		/// <returns>The middle value as a decimal.</returns>
-		public static decimal GetMiddle(this float from, float to)
-		{
-			return ((decimal)from).GetMiddle((decimal)to);
-		}
+	/// <summary>
+	/// Creates a decimal value from a given mantissa and exponent by applying power-of-ten adjustments.
+	/// </summary>
+	/// <param name="mantissa">The mantissa.</param>
+	/// <param name="exponent">The exponent, where positive values scale up and negative values scale down.</param>
+	/// <returns>The resulting decimal value.</returns>
+	public static decimal ToDecimal(long mantissa, int exponent)
+	{
+		decimal result = mantissa;
 
-		/// <summary>
-		/// Calculates the middle (average) value between two double values.
-		/// </summary>
-		/// <param name="from">The first value.</param>
-		/// <param name="to">The second value.</param>
-		/// <returns>The middle value as a decimal.</returns>
-		public static decimal GetMiddle(this double from, double to)
+		if (exponent >= 0)
 		{
-			return ((decimal)from).GetMiddle((decimal)to);
+			result *= _posPow10[exponent];
 		}
-
-		/// <summary>
-		/// Calculates the middle (average) value between two decimal values.
-		/// </summary>
-		/// <param name="from">The first value.</param>
-		/// <param name="to">The second value.</param>
-		/// <returns>The middle value as a decimal.</returns>
-		public static decimal GetMiddle(this decimal from, decimal to)
+		else
 		{
-			//if (from > to)
-			//	throw new ArgumentOutOfRangeException(nameof(from));
-
-			return (from + to) / 2;
+			result *= _negPow10[-exponent];
 		}
 
-		private static readonly decimal[] _posPow10 =
-		[
-			1M,
-			10M,
-			100M,
-			1000M,
-			10000M,
-			100000M,
-			1000000M,
-			10000000M,
-			100000000M,
-			1000000000M,
-			10000000000M,
-			100000000000M,
-		];
-
-		private static readonly decimal[] _negPow10 = [.. _posPow10.Select(v => 1M / v)];
+		return result;
+	}
 
-		/// <summary>
-		/// Creates a decimal value from a given mantissa and exponent by applying power-of-ten adjustments.
-		/// </summary>
-		/// <param name="mantissa">The mantissa.</param>
-		/// <param name="exponent">The exponent, where positive values scale up and negative values scale down.</param>
-		/// <returns>The resulting decimal value.</returns>
-		public static decimal ToDecimal(long mantissa, int exponent)
-		{
-			decimal result = mantissa;
+	private const double _minValue = (double)decimal.MinValue;
+	private const double _maxValue = (double)decimal.MaxValue;
 
-			if (exponent >= 0)
-			{
-				result *= _posPow10[exponent];
-			}
-			else
-			{
-				result *= _negPow10[-exponent];
-			}
+	/// <summary>
+	/// Converts a double to a decimal if within the allowed range; otherwise, returns null.
+	/// </summary>
+	/// <param name="value">The double value.</param>
+	/// <returns>The converted decimal value or <c>null</c> when conversion is not possible.</returns>
+	public static decimal? ToDecimal(this double value)
+	{
+		return value.IsInfinity() || value.IsNaN() || value < _minValue || value > _maxValue ? (decimal?)null : (decimal)value;
+	}
 
-			return result;
-		}
+	/// <summary>
+	/// Converts a float to a decimal if within the allowed range; otherwise, returns null.
+	/// </summary>
+	/// <param name="value">The float value.</param>
+	/// <returns>The converted decimal value or <c>null</c> when conversion is not possible.</returns>
+	public static decimal? ToDecimal(this float value)
+	{
+		return value.IsInfinity() || value.IsNaN() || value < _minValue || value > _maxValue ? (decimal?)null : (decimal)value;
+	}
 
-		private const double _minValue = (double)decimal.MinValue;
-		private const double _maxValue = (double)decimal.MaxValue;
+	/// <summary>
+	/// Returns the number of digits in a positive integer.
+	/// </summary>
+	/// <param name="x">The positive integer value.</param>
+	/// <returns>The digit count.</returns>
+	/// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="x"/> is negative.</exception>
+	public static int GetDigitCount(this int x)
+	{
+		if (x < 0)
+			throw new ArgumentOutOfRangeException(nameof(x));
 
-		/// <summary>
-		/// Converts a double to a decimal if within the allowed range; otherwise, returns null.
-		/// </summary>
-		/// <param name="value">The double value.</param>
-		/// <returns>The converted decimal value or <c>null</c> when conversion is not possible.</returns>
-		public static decimal? ToDecimal(this double value)
+		if (x < 1000000)
 		{
-			return value.IsInfinity() || value.IsNaN() || value < _minValue || value > _maxValue ? (decimal?)null : (decimal)value;
-		}
+			if (x < 10) return 1;
+			if (x < 100) return 2;
+			if (x < 1000) return 3;
+			if (x < 10000) return 4;
+			if (x < 100000) return 5;
 
-		/// <summary>
-		/// Converts a float to a decimal if within the allowed range; otherwise, returns null.
-		/// </summary>
-		/// <param name="value">The float value.</param>
-		/// <returns>The converted decimal value or <c>null</c> when conversion is not possible.</returns>
-		public static decimal? ToDecimal(this float value)
-		{
-			return value.IsInfinity() || value.IsNaN() || value < _minValue || value > _maxValue ? (decimal?)null : (decimal)value;
+			return 6;
 		}
 
-		/// <summary>
-		/// Returns the number of digits in a positive integer.
-		/// </summary>
-		/// <param name="x">The positive integer value.</param>
-		/// <returns>The digit count.</returns>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="x"/> is negative.</exception>
-		public static int GetDigitCount(this int x)
-		{
-			if (x < 0)
-				throw new ArgumentOutOfRangeException(nameof(x));
-
-			if (x < 1000000)
-			{
-				if (x < 10) return 1;
-				if (x < 100) return 2;
-				if (x < 1000) return 3;
-				if (x < 10000) return 4;
-				if (x < 100000) return 5;
-
-				return 6;
-			}
+		if (x < 10000000) return 7;
+		if (x < 100000000) return 8;
+		if (x < 1000000000) return 9;
 
-			if (x < 10000000) return 7;
-			if (x < 100000000) return 8;
-			if (x < 1000000000) return 9;
+		return 10;
+	}
 
-			return 10;
-		}
+	/// <summary>
+	/// Returns the number of digits in a positive long integer.
+	/// </summary>
+	/// <param name="x">The positive long integer value.</param>
+	/// <returns>The digit count.</returns>
+	/// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="x"/> is negative.</exception>
+	public static int GetDigitCount(this long x)
+	{
+		if (x < 0)
+			throw new ArgumentOutOfRangeException(nameof(x));
 
-		/// <summary>
-		/// Returns the number of digits in a positive long integer.
-		/// </summary>
-		/// <param name="x">The positive long integer value.</param>
-		/// <returns>The digit count.</returns>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="x"/> is negative.</exception>
-		public static int GetDigitCount(this long x)
+		if (x < 1000000)
 		{
-			if (x < 0)
-				throw new ArgumentOutOfRangeException(nameof(x));
+			if (x < 10) return 1;
+			if (x < 100) return 2;
+			if (x < 1000) return 3;
+			if (x < 10000) return 4;
+			if (x < 100000) return 5;
 
-			if (x < 1000000)
-			{
-				if (x < 10) return 1;
-				if (x < 100) return 2;
-				if (x < 1000) return 3;
-				if (x < 10000) return 4;
-				if (x < 100000) return 5;
+			return 6;
+		}
 
-				return 6;
-			}
+		if (x < 10000000) return 7;
+		if (x < 100000000) return 8;
+		if (x < 1000000000) return 9;
+		if (x < 10000000000) return 10;
+		if (x < 100000000000) return 11;
+		if (x < 1000000000000) return 12;
+		if (x < 10000000000000) return 13;
+		if (x < 100000000000000) return 14;
+		if (x < 1000000000000000) return 15;
+		if (x < 10000000000000000) return 16;
+		if (x < 100000000000000000) return 17;
 
-			if (x < 10000000) return 7;
-			if (x < 100000000) return 8;
-			if (x < 1000000000) return 9;
-			if (x < 10000000000) return 10;
-			if (x < 100000000000) return 11;
-			if (x < 1000000000000) return 12;
-			if (x < 10000000000000) return 13;
-			if (x < 100000000000000) return 14;
-			if (x < 1000000000000000) return 15;
-			if (x < 10000000000000000) return 16;
-			if (x < 100000000000000000) return 17;
-
-			return 18;
-		}
+		return 18;
 	}
 }
diff --git a/Common/NtpClient.cs b/Common/NtpClient.cs
index a2d156fc..426a717c 100644
--- a/Common/NtpClient.cs
+++ b/Common/NtpClient.cs
@@ -1,87 +1,86 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+using System;
+using System.Net;
+using System.Net.Sockets;
+
+/// <summary>
+/// Provides functionality to retrieve time from a remote NTP server.
+/// </summary>
+/// <param name="ntpServer">The endpoint of the NTP server.</param>
+public class NtpClient(EndPoint ntpServer)
 {
-	using System;
-	using System.Net;
-	using System.Net.Sockets;
+	private readonly EndPoint _ntpServer = ntpServer ?? throw new ArgumentNullException(nameof(ntpServer));
 
 	/// <summary>
-	/// Provides functionality to retrieve time from a remote NTP server.
+	/// Initializes a new instance of the <see cref="NtpClient"/> class using the NTP server address.
 	/// </summary>
-	/// <param name="ntpServer">The endpoint of the NTP server.</param>
-	public class NtpClient(EndPoint ntpServer)
+	/// <param name="ntpServer">The NTP server address in the format "hostname:port". Default is "time-a.nist.gov:123".</param>
+	public NtpClient(string ntpServer = "time-a.nist.gov:123")
+		: this(ntpServer.To<EndPoint>())
 	{
-		private readonly EndPoint _ntpServer = ntpServer ?? throw new ArgumentNullException(nameof(ntpServer));
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="NtpClient"/> class using the NTP server address.
-		/// </summary>
-		/// <param name="ntpServer">The NTP server address in the format "hostname:port". Default is "time-a.nist.gov:123".</param>
-		public NtpClient(string ntpServer = "time-a.nist.gov:123")
-			: this(ntpServer.To<EndPoint>())
-		{
-			//var address = Dns.GetHostEntry(ntpServer).AddressList;
-
-			//if (address is null || address.Length == 0)
-			//    throw new ArgumentException(string.Format("Could not resolve ip address from '{0}'.", ntpServer), "ntpServer");
-
-			//_endPoint = new IPEndPoint(address[0], 123);
-		}
-
-		/// <summary>
-		/// Retrieves the local time based on the specified time zone.
-		/// </summary>
-		/// <param name="info">The time zone information.</param>
-		/// <param name="timeout">The timeout in milliseconds for the NTP request. Default is 5000ms.</param>
-		/// <returns>The local time adjusted to the specified time zone.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="info"/> is null.</exception>
-		public DateTime GetLocalTime(TimeZoneInfo info, int timeout = 5000)
-		{
-			if (info is null)
-				throw new ArgumentNullException(nameof(info));
-
-			var utcTime = GetUtcTime(timeout);
-			return utcTime + info.GetUtcOffset(utcTime);
-		}
-
-		/// <summary>
-		/// Retrieves the UTC time from the NTP server.
-		/// </summary>
-		/// <param name="timeout">The timeout in milliseconds for the NTP request. Default is 5000ms.</param>
-		/// <returns>The UTC time as provided by the NTP server.</returns>
-		public DateTime GetUtcTime(int timeout = 5000)
-		{
-			using var s = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
-			s.SendTimeout = timeout;
-			s.ReceiveTimeout = timeout;
-
-			s.Connect(_ntpServer);
-
-			var ntpData = new byte[48]; // RFC 2030
-			ntpData[0] = 0x1B;
-			for (var i = 1; i < 48; i++)
-				ntpData[i] = 0;
-
-			s.Send(ntpData);
-			s.Receive(ntpData);
-
-			const byte offsetTransmitTime = 40;
-			ulong intpart = 0;
-			ulong fractpart = 0;
-
-			for (var i = 0; i <= 3; i++)
-				intpart = 256 * intpart + ntpData[offsetTransmitTime + i];
-
-			for (var i = 4; i <= 7; i++)
-				fractpart = 256 * fractpart + ntpData[offsetTransmitTime + i];
-
-			var milliseconds = (intpart * 1000 + (fractpart * 1000) / 0x100000000L);
-
-			var timeSpan = TimeSpan.FromMilliseconds(milliseconds);
-
-			var dateTime = new DateTime(1900, 1, 1);
-			dateTime += timeSpan;
-
-			return dateTime;
-		}
+		//var address = Dns.GetHostEntry(ntpServer).AddressList;
+
+		//if (address is null || address.Length == 0)
+		//    throw new ArgumentException(string.Format("Could not resolve ip address from '{0}'.", ntpServer), "ntpServer");
+
+		//_endPoint = new IPEndPoint(address[0], 123);
+	}
+
+	/// <summary>
+	/// Retrieves the local time based on the specified time zone.
+	/// </summary>
+	/// <param name="info">The time zone information.</param>
+	/// <param name="timeout">The timeout in milliseconds for the NTP request. Default is 5000ms.</param>
+	/// <returns>The local time adjusted to the specified time zone.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="info"/> is null.</exception>
+	public DateTime GetLocalTime(TimeZoneInfo info, int timeout = 5000)
+	{
+		if (info is null)
+			throw new ArgumentNullException(nameof(info));
+
+		var utcTime = GetUtcTime(timeout);
+		return utcTime + info.GetUtcOffset(utcTime);
+	}
+
+	/// <summary>
+	/// Retrieves the UTC time from the NTP server.
+	/// </summary>
+	/// <param name="timeout">The timeout in milliseconds for the NTP request. Default is 5000ms.</param>
+	/// <returns>The UTC time as provided by the NTP server.</returns>
+	public DateTime GetUtcTime(int timeout = 5000)
+	{
+		using var s = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
+		s.SendTimeout = timeout;
+		s.ReceiveTimeout = timeout;
+
+		s.Connect(_ntpServer);
+
+		var ntpData = new byte[48]; // RFC 2030
+		ntpData[0] = 0x1B;
+		for (var i = 1; i < 48; i++)
+			ntpData[i] = 0;
+
+		s.Send(ntpData);
+		s.Receive(ntpData);
+
+		const byte offsetTransmitTime = 40;
+		ulong intpart = 0;
+		ulong fractpart = 0;
+
+		for (var i = 0; i <= 3; i++)
+			intpart = 256 * intpart + ntpData[offsetTransmitTime + i];
+
+		for (var i = 4; i <= 7; i++)
+			fractpart = 256 * fractpart + ntpData[offsetTransmitTime + i];
+
+		var milliseconds = (intpart * 1000 + (fractpart * 1000) / 0x100000000L);
+
+		var timeSpan = TimeSpan.FromMilliseconds(milliseconds);
+
+		var dateTime = new DateTime(1900, 1, 1);
+		dateTime += timeSpan;
+
+		return dateTime;
 	}
 }
\ No newline at end of file
diff --git a/Common/NullableEx.cs b/Common/NullableEx.cs
index 716df7fe..230c085c 100644
--- a/Common/NullableEx.cs
+++ b/Common/NullableEx.cs
@@ -1,80 +1,79 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+using System;
+using System.Runtime.Serialization;
+
+/// <summary>
+/// Represents a wrapper for nullable types that can be serialized.
+/// </summary>
+/// <typeparam name="T">The underlying type of the nullable value.</typeparam>
+[Serializable]
+[DataContract]
+public class NullableEx<T> : Equatable<NullableEx<T>>
 {
-	using System;
-	using System.Runtime.Serialization;
+	#region HasValue
 
 	/// <summary>
-	/// Represents a wrapper for nullable types that can be serialized.
+	/// Gets a value indicating whether the current NullableEx object has a valid value.
 	/// </summary>
-	/// <typeparam name="T">The underlying type of the nullable value.</typeparam>
-	[Serializable]
-	[DataContract]
-	public class NullableEx<T> : Equatable<NullableEx<T>>
-	{
-		#region HasValue
+	public bool HasValue { get; private set; }
 
-		/// <summary>
-		/// Gets a value indicating whether the current NullableEx object has a valid value.
-		/// </summary>
-		public bool HasValue { get; private set; }
+	#endregion
 
-		#endregion
+	#region Value
 
-		#region Value
+	private T _value;
 
-		private T _value;
-
-		/// <summary>
-		/// Gets or sets the value of the current NullableEx object.
-		/// </summary>
-		/// <exception cref="InvalidOperationException">The HasValue property is false.</exception>
-		[DataMember]
-		public T Value
+	/// <summary>
+	/// Gets or sets the value of the current NullableEx object.
+	/// </summary>
+	/// <exception cref="InvalidOperationException">The HasValue property is false.</exception>
+	[DataMember]
+	public T Value
+	{
+		get
+		{
+			if (HasValue)
+				return _value;
+			else
+				throw new InvalidOperationException();
+		}
+		set
 		{
-			get
-			{
-				if (HasValue)
-					return _value;
-				else
-					throw new InvalidOperationException();
-			}
-			set
-			{
-				_value = value;
-				HasValue = true;
-			}
+			_value = value;
+			HasValue = true;
 		}
+	}
 
-		#endregion
+	#endregion
 
-		#region Equatable<NullableEx<T>> Members
+	#region Equatable<NullableEx<T>> Members
 
-		/// <inheritdoc/>
-		protected override bool OnEquals(NullableEx<T> other)
-		{
-			if (HasValue != other.HasValue)
-				return false;
+	/// <inheritdoc/>
+	protected override bool OnEquals(NullableEx<T> other)
+	{
+		if (HasValue != other.HasValue)
+			return false;
 
-			return !HasValue || Value.Equals(other.Value);
-		}
+		return !HasValue || Value.Equals(other.Value);
+	}
 
-		/// <inheritdoc/>
-		public override NullableEx<T> Clone()
-		{
-			var retVal = new NullableEx<T>();
+	/// <inheritdoc/>
+	public override NullableEx<T> Clone()
+	{
+		var retVal = new NullableEx<T>();
 
-			if (HasValue)
-				retVal.Value = Value;
+		if (HasValue)
+			retVal.Value = Value;
 
-			return retVal;
-		}
+		return retVal;
+	}
 
-		#endregion
+	#endregion
 
-		/// <inheritdoc/>
-		public override int GetHashCode()
-		{
-			return HasValue ? Value.GetHashCode() : typeof(T).GetHashCode();
-		}
+	/// <inheritdoc/>
+	public override int GetHashCode()
+	{
+		return HasValue ? Value.GetHashCode() : typeof(T).GetHashCode();
 	}
 }
\ No newline at end of file
diff --git a/Common/NullableHelper.cs b/Common/NullableHelper.cs
index 55caa9fb..40ea82bf 100644
--- a/Common/NullableHelper.cs
+++ b/Common/NullableHelper.cs
@@ -1,136 +1,135 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+using System;
+
+/// <summary>
+/// Provides helper extension methods for working with nullable types.
+/// </summary>
+public static class NullableHelper
 {
-	using System;
+	/// <summary>
+	/// Gets the underlying type argument of the specified nullable type.
+	/// </summary>
+	/// <param name="nullableType">The nullable type to get the underlying type from.</param>
+	/// <returns>The underlying type if the provided type is nullable; otherwise, null.</returns>
+	public static Type GetUnderlyingType(this Type nullableType)
+	{
+		return Nullable.GetUnderlyingType(nullableType);
+	}
+
+	/// <summary>
+	/// Determines whether the specified type is a nullable type.
+	/// </summary>
+	/// <param name="type">The type to inspect.</param>
+	/// <returns>True if the type is nullable; otherwise, false.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="type"/> is null.</exception>
+	public static bool IsNullable(this Type type)
+	{
+		if (type is null)
+			throw new ArgumentNullException(nameof(type));
+
+		return type.GetUnderlyingType() != null;
+	}
+
+	/// <summary>
+	/// Determines whether the specified value is null.
+	/// For value types, this method returns false.
+	/// </summary>
+	/// <typeparam name="T">The type of the value.</typeparam>
+	/// <param name="value">The value to check for null.</param>
+	/// <returns>True if the value is null; otherwise, false.</returns>
+	public static bool IsNull<T>(this T value)
+	{
+		return value.IsNull(false);
+	}
+
+	/// <summary>
+	/// Determines whether the specified value is null or its default for value types.
+	/// </summary>
+	/// <typeparam name="T">The type of the value.</typeparam>
+	/// <param name="value">The value to check.</param>
+	/// <param name="checkValueTypeOnDefault">
+	/// If true and the type is a value type, the value is compared to its default value.
+	/// </param>
+	/// <returns>
+	/// True if the reference type value is null or if the value type is equal to its default value when <paramref name="checkValueTypeOnDefault"/> is true; otherwise, false.
+	/// </returns>
+	public static bool IsNull<T>(this T value, bool checkValueTypeOnDefault)
+	{
+		if (value is not ValueType)
+			return value is null;
+
+		if (!checkValueTypeOnDefault)
+			return false;
+
+		var defValue = default(T);
+
+		// typeof(T) == typeof(object)
+		defValue ??= (T)Activator.CreateInstance(value.GetType());
+
+		return value.Equals(defValue);
+	}
 
 	/// <summary>
-	/// Provides helper extension methods for working with nullable types.
+	/// Converts the value to a result type using the appropriate conversion function based on whether the value is null.
 	/// </summary>
-	public static class NullableHelper
+	/// <typeparam name="T">The type of the input value. Must be a reference type.</typeparam>
+	/// <typeparam name="TResult">The type of the result.</typeparam>
+	/// <param name="value">The input value to convert.</param>
+	/// <param name="notNullFunc">A function to convert the value when it is not null.</param>
+	/// <param name="nullFunc">A function to produce a result when the value is null.</param>
+	/// <returns>
+	/// The result of applying either <paramref name="notNullFunc"/> or <paramref name="nullFunc"/> to the value.
+	/// </returns>
+	/// <exception cref="ArgumentNullException">
+	/// Thrown when <paramref name="notNullFunc"/> or <paramref name="nullFunc"/> is null.
+	/// </exception>
+	public static TResult Convert<T, TResult>(this T value, Func<T, TResult> notNullFunc, Func<TResult> nullFunc)
+		where T : class
 	{
-		/// <summary>
-		/// Gets the underlying type argument of the specified nullable type.
-		/// </summary>
-		/// <param name="nullableType">The nullable type to get the underlying type from.</param>
-		/// <returns>The underlying type if the provided type is nullable; otherwise, null.</returns>
-		public static Type GetUnderlyingType(this Type nullableType)
-		{
-			return Nullable.GetUnderlyingType(nullableType);
-		}
-
-		/// <summary>
-		/// Determines whether the specified type is a nullable type.
-		/// </summary>
-		/// <param name="type">The type to inspect.</param>
-		/// <returns>True if the type is nullable; otherwise, false.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="type"/> is null.</exception>
-		public static bool IsNullable(this Type type)
-		{
-			if (type is null)
-				throw new ArgumentNullException(nameof(type));
-
-			return type.GetUnderlyingType() != null;
-		}
-
-		/// <summary>
-		/// Determines whether the specified value is null.
-		/// For value types, this method returns false.
-		/// </summary>
-		/// <typeparam name="T">The type of the value.</typeparam>
-		/// <param name="value">The value to check for null.</param>
-		/// <returns>True if the value is null; otherwise, false.</returns>
-		public static bool IsNull<T>(this T value)
-		{
-			return value.IsNull(false);
-		}
-
-		/// <summary>
-		/// Determines whether the specified value is null or its default for value types.
-		/// </summary>
-		/// <typeparam name="T">The type of the value.</typeparam>
-		/// <param name="value">The value to check.</param>
-		/// <param name="checkValueTypeOnDefault">
-		/// If true and the type is a value type, the value is compared to its default value.
-		/// </param>
-		/// <returns>
-		/// True if the reference type value is null or if the value type is equal to its default value when <paramref name="checkValueTypeOnDefault"/> is true; otherwise, false.
-		/// </returns>
-		public static bool IsNull<T>(this T value, bool checkValueTypeOnDefault)
-		{
-			if (value is not ValueType)
-				return value is null;
-
-			if (!checkValueTypeOnDefault)
-				return false;
-
-			var defValue = default(T);
-
-			// typeof(T) == typeof(object)
-			defValue ??= (T)Activator.CreateInstance(value.GetType());
-
-			return value.Equals(defValue);
-		}
-
-		/// <summary>
-		/// Converts the value to a result type using the appropriate conversion function based on whether the value is null.
-		/// </summary>
-		/// <typeparam name="T">The type of the input value. Must be a reference type.</typeparam>
-		/// <typeparam name="TResult">The type of the result.</typeparam>
-		/// <param name="value">The input value to convert.</param>
-		/// <param name="notNullFunc">A function to convert the value when it is not null.</param>
-		/// <param name="nullFunc">A function to produce a result when the value is null.</param>
-		/// <returns>
-		/// The result of applying either <paramref name="notNullFunc"/> or <paramref name="nullFunc"/> to the value.
-		/// </returns>
-		/// <exception cref="ArgumentNullException">
-		/// Thrown when <paramref name="notNullFunc"/> or <paramref name="nullFunc"/> is null.
-		/// </exception>
-		public static TResult Convert<T, TResult>(this T value, Func<T, TResult> notNullFunc, Func<TResult> nullFunc)
-			where T : class
-		{
-			if (notNullFunc is null)
-				throw new ArgumentNullException(nameof(notNullFunc));
-
-			if (nullFunc is null)
-				throw new ArgumentNullException(nameof(nullFunc));
-
-			return value is null ? nullFunc() : notNullFunc(value);
-		}
-
-		/// <summary>
-		/// Returns the default value as null if the value is equal to its default; otherwise, returns the value as a nullable type.
-		/// </summary>
-		/// <typeparam name="T">The value type.</typeparam>
-		/// <param name="value">The value to check.</param>
-		/// <returns>
-		/// Null if the value is the default of its type; otherwise, the value wrapped as a nullable type.
-		/// </returns>
-		public static T? DefaultAsNull<T>(this T value)
-			where T : struct
-		{
-			return value.IsDefault() ? null : value;
-		}
-
-		/// <summary>
-		/// Creates a nullable type from the given type.
-		/// </summary>
-		/// <param name="type">The type to make nullable.</param>
-		/// <returns>A nullable type of the given type.</returns>
-		public static Type MakeNullable(this Type type)
-			=> typeof(Nullable<>).Make(type);
-
-		/// <summary>
-		/// Converts the given type to a nullable type if it is a non-nullable value type.
-		/// </summary>
-		/// <param name="type">The type to convert.</param>
-		/// <returns>
-		/// The nullable version of the type if it is a value type and not already nullable; otherwise, the original type.
-		/// </returns>
-		public static Type TryMakeNullable(this Type type)
-		{
-			if (!type.IsNullable() && type.IsValueType)
-				type = typeof(Nullable<>).Make(type);
-
-			return type;
-		}
+		if (notNullFunc is null)
+			throw new ArgumentNullException(nameof(notNullFunc));
+
+		if (nullFunc is null)
+			throw new ArgumentNullException(nameof(nullFunc));
+
+		return value is null ? nullFunc() : notNullFunc(value);
+	}
+
+	/// <summary>
+	/// Returns the default value as null if the value is equal to its default; otherwise, returns the value as a nullable type.
+	/// </summary>
+	/// <typeparam name="T">The value type.</typeparam>
+	/// <param name="value">The value to check.</param>
+	/// <returns>
+	/// Null if the value is the default of its type; otherwise, the value wrapped as a nullable type.
+	/// </returns>
+	public static T? DefaultAsNull<T>(this T value)
+		where T : struct
+	{
+		return value.IsDefault() ? null : value;
+	}
+
+	/// <summary>
+	/// Creates a nullable type from the given type.
+	/// </summary>
+	/// <param name="type">The type to make nullable.</param>
+	/// <returns>A nullable type of the given type.</returns>
+	public static Type MakeNullable(this Type type)
+		=> typeof(Nullable<>).Make(type);
+
+	/// <summary>
+	/// Converts the given type to a nullable type if it is a non-nullable value type.
+	/// </summary>
+	/// <param name="type">The type to convert.</param>
+	/// <returns>
+	/// The nullable version of the type if it is a value type and not already nullable; otherwise, the original type.
+	/// </returns>
+	public static Type TryMakeNullable(this Type type)
+	{
+		if (!type.IsNullable() && type.IsValueType)
+			type = typeof(Nullable<>).Make(type);
+
+		return type;
 	}
 }
\ No newline at end of file
diff --git a/Common/OperatingSystemEx.cs b/Common/OperatingSystemEx.cs
index 6e620999..946b34cf 100644
--- a/Common/OperatingSystemEx.cs
+++ b/Common/OperatingSystemEx.cs
@@ -1,120 +1,119 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+using System.Linq;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using System.IO;
+using System;
+
+/// <summary>
+/// Provides operating system related helper methods and properties.
+/// </summary>
+public static class OperatingSystemEx
 {
-	using System.Linq;
-	using System.Collections.Generic;
-	using System.Runtime.InteropServices;
-	using System.IO;
-	using System;
+	/// <summary>
+	/// Determines whether the current operating system is Windows.
+	/// </summary>
+	/// <returns><c>true</c> if the operating system is Windows; otherwise, <c>false</c>.</returns>
+	public static bool IsWindows() => OSPlatform.Windows.IsOSPlatform();
+
+	/// <summary>
+	/// Determines whether the current operating system is macOS.
+	/// </summary>
+	/// <returns><c>true</c> if the operating system is macOS; otherwise, <c>false</c>.</returns>
+	public static bool IsMacOS() => OSPlatform.OSX.IsOSPlatform();
+
+	/// <summary>
+	/// Determines whether the current operating system is Linux.
+	/// </summary>
+	/// <returns><c>true</c> if the operating system is Linux; otherwise, <c>false</c>.</returns>
+	public static bool IsLinux() => OSPlatform.Linux.IsOSPlatform();
 
 	/// <summary>
-	/// Provides operating system related helper methods and properties.
+	/// Determines whether the specified <see cref="OSPlatform"/> is the current platform.
 	/// </summary>
-	public static class OperatingSystemEx
+	/// <param name="platform">The operating system platform to check.</param>
+	/// <returns><c>true</c> if the specified platform is the current operating system; otherwise, <c>false</c>.</returns>
+	public static bool IsOSPlatform(this OSPlatform platform)
+		=> RuntimeInformation.IsOSPlatform(platform);
+
+	/// <summary>
+	/// Gets all available operating system platforms defined in <see cref="OSPlatform"/>.
+	/// </summary>
+	public static IEnumerable<OSPlatform> Platforms =>
+		[.. typeof(OSPlatform)
+			.GetProperties()
+				.Where(p => p.PropertyType == typeof(OSPlatform))
+				.Select(p => (OSPlatform)p.GetValue(null))];
+
+	/// <summary>
+	/// Gets a value indicating whether the current runtime framework is .NET Framework.
+	/// </summary>
+	public static bool IsFramework
+		=> RuntimeInformation.FrameworkDescription.StartsWithIgnoreCase(".NET Framework");
+
+	/// <summary>
+	/// Retrieves runtime package versions based on the provided framework version.
+	/// </summary>
+	/// <param name="fwVer">The framework version to look up corresponding runtime packages.</param>
+	/// <returns>
+	/// A dictionary containing the package name as the key and its <see cref="Version"/> as the value.
+	/// </returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="fwVer"/> is null.</exception>
+	public static IDictionary<string, Version> GetRuntimePackages(Version fwVer)
 	{
-		/// <summary>
-		/// Determines whether the current operating system is Windows.
-		/// </summary>
-		/// <returns><c>true</c> if the operating system is Windows; otherwise, <c>false</c>.</returns>
-		public static bool IsWindows() => OSPlatform.Windows.IsOSPlatform();
-
-		/// <summary>
-		/// Determines whether the current operating system is macOS.
-		/// </summary>
-		/// <returns><c>true</c> if the operating system is macOS; otherwise, <c>false</c>.</returns>
-		public static bool IsMacOS() => OSPlatform.OSX.IsOSPlatform();
-
-		/// <summary>
-		/// Determines whether the current operating system is Linux.
-		/// </summary>
-		/// <returns><c>true</c> if the operating system is Linux; otherwise, <c>false</c>.</returns>
-		public static bool IsLinux() => OSPlatform.Linux.IsOSPlatform();
-
-		/// <summary>
-		/// Determines whether the specified <see cref="OSPlatform"/> is the current platform.
-		/// </summary>
-		/// <param name="platform">The operating system platform to check.</param>
-		/// <returns><c>true</c> if the specified platform is the current operating system; otherwise, <c>false</c>.</returns>
-		public static bool IsOSPlatform(this OSPlatform platform)
-			=> RuntimeInformation.IsOSPlatform(platform);
-
-		/// <summary>
-		/// Gets all available operating system platforms defined in <see cref="OSPlatform"/>.
-		/// </summary>
-		public static IEnumerable<OSPlatform> Platforms =>
-			[.. typeof(OSPlatform)
-				.GetProperties()
-					.Where(p => p.PropertyType == typeof(OSPlatform))
-					.Select(p => (OSPlatform)p.GetValue(null))];
-
-		/// <summary>
-		/// Gets a value indicating whether the current runtime framework is .NET Framework.
-		/// </summary>
-		public static bool IsFramework
-			=> RuntimeInformation.FrameworkDescription.StartsWithIgnoreCase(".NET Framework");
-
-		/// <summary>
-		/// Retrieves runtime package versions based on the provided framework version.
-		/// </summary>
-		/// <param name="fwVer">The framework version to look up corresponding runtime packages.</param>
-		/// <returns>
-		/// A dictionary containing the package name as the key and its <see cref="Version"/> as the value.
-		/// </returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="fwVer"/> is null.</exception>
-		public static IDictionary<string, Version> GetRuntimePackages(Version fwVer)
+		if (fwVer is null)
+			throw new ArgumentNullException(nameof(fwVer));
+
+		var runtimePackages = new Dictionary<string, Version>(StringComparer.InvariantCultureIgnoreCase)
 		{
-			if (fwVer is null)
-				throw new ArgumentNullException(nameof(fwVer));
+			{ "NETStandard.Library", fwVer },
+		};
 
-			var runtimePackages = new Dictionary<string, Version>(StringComparer.InvariantCultureIgnoreCase)
-			{
-				{ "NETStandard.Library", fwVer },
-			};
+		try
+		{
+			var fi = new DirectoryInfo(RuntimeEnvironment.GetRuntimeDirectory());
 
-			try
+			if (fi.Exists && fi.Parent?.Parent is not null)
 			{
-				var fi = new DirectoryInfo(RuntimeEnvironment.GetRuntimeDirectory());
+				var dirs = fi.Parent.Parent.GetDirectories();
 
-				if (fi.Exists && fi.Parent?.Parent is not null)
+				// Local function to fill the runtime packages from a specific folder.
+				void fillPackages(string name)
 				{
-					var dirs = fi.Parent.Parent.GetDirectories();
+					var dir = dirs.FirstOrDefault(d => d.Name.EqualsIgnoreCase(name));
 
-					// Local function to fill the runtime packages from a specific folder.
-					void fillPackages(string name)
-					{
-						var dir = dirs.FirstOrDefault(d => d.Name.EqualsIgnoreCase(name));
-
-						if (dir is null)
-							return;
+					if (dir is null)
+						return;
 
-						var verDir = dir
-							.GetDirectories()
-							.Select(d => (dir: d, ver: Version.TryParse(d.Name, out var ver) ? ver : null))
-							.Where(t => t.ver is not null && t.ver.Major == fwVer.Major && t.ver.Minor == fwVer.Minor)
-							.OrderByDescending(t => t.ver)
-							.FirstOrDefault().dir;
+					var verDir = dir
+						.GetDirectories()
+						.Select(d => (dir: d, ver: Version.TryParse(d.Name, out var ver) ? ver : null))
+						.Where(t => t.ver is not null && t.ver.Major == fwVer.Major && t.ver.Minor == fwVer.Minor)
+						.OrderByDescending(t => t.ver)
+						.FirstOrDefault().dir;
 
-						if (verDir is null || !Version.TryParse(verDir.Name, out var ver))
-							return;
+					if (verDir is null || !Version.TryParse(verDir.Name, out var ver))
+						return;
 
-						foreach (var packageName in verDir.GetFiles("*.dll").Select(f => Path.GetFileNameWithoutExtension(f.Name)))
-						{
-							if (runtimePackages.ContainsKey(packageName))
-								continue;
+					foreach (var packageName in verDir.GetFiles("*.dll").Select(f => Path.GetFileNameWithoutExtension(f.Name)))
+					{
+						if (runtimePackages.ContainsKey(packageName))
+							continue;
 
-							runtimePackages.Add(packageName, ver);
-						}
+						runtimePackages.Add(packageName, ver);
 					}
-
-					fillPackages("Microsoft.NETCore.App");
-					fillPackages("Microsoft.WindowsDesktop.App");
 				}
-			}
-			catch
-			{
-				// Suppress any exceptions during package retrieval.
-			}
 
-			return runtimePackages;
+				fillPackages("Microsoft.NETCore.App");
+				fillPackages("Microsoft.WindowsDesktop.App");
+			}
 		}
+		catch
+		{
+			// Suppress any exceptions during package retrieval.
+		}
+
+		return runtimePackages;
 	}
 }
\ No newline at end of file
diff --git a/Common/Platforms.cs b/Common/Platforms.cs
index 49cd7fa9..9eac1338 100644
--- a/Common/Platforms.cs
+++ b/Common/Platforms.cs
@@ -1,50 +1,49 @@
-namespace Ecng.Common
-{
-	using System;
+namespace Ecng.Common;
+
+using System;
 
+/// <summary>
+/// Enumeration for representing supported platform types.
+/// </summary>
+public enum Platforms
+{
 	/// <summary>
-	/// Enumeration for representing supported platform types.
+	/// Represents the 32-bit platform.
 	/// </summary>
-	public enum Platforms
-	{
-		/// <summary>
-		/// Represents the 32-bit platform.
-		/// </summary>
-		x86,
+	x86,
 
-		/// <summary>
-		/// Represents the 64-bit platform.
-		/// </summary>
-		x64,
+	/// <summary>
+	/// Represents the 64-bit platform.
+	/// </summary>
+	x64,
 
-		/// <summary>
-		/// Represents any CPU architecture.
-		/// </summary>
-		AnyCPU,
-	}
+	/// <summary>
+	/// Represents any CPU architecture.
+	/// </summary>
+	AnyCPU,
+}
 
+/// <summary>
+/// Provides helper methods for <see cref="Platforms"/>.
+/// </summary>
+public static class PlatformHelper
+{
 	/// <summary>
-	/// Provides helper methods for <see cref="Platforms"/>.
+	/// Determines whether the current process is compatible with the specified platform.
 	/// </summary>
-	public static class PlatformHelper
+	/// <param name="platform">The target platform to check compatibility for.</param>
+	/// <returns>
+	/// <c>true</c> if the current process is compatible with the specified platform; otherwise, <c>false</c>.
+	/// </returns>
+	/// <exception cref="ArgumentOutOfRangeException">Thrown when the platform is not recognized.</exception>
+	public static bool IsCompatible(this Platforms platform)
 	{
-		/// <summary>
-		/// Determines whether the current process is compatible with the specified platform.
-		/// </summary>
-		/// <param name="platform">The target platform to check compatibility for.</param>
-		/// <returns>
-		/// <c>true</c> if the current process is compatible with the specified platform; otherwise, <c>false</c>.
-		/// </returns>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown when the platform is not recognized.</exception>
-		public static bool IsCompatible(this Platforms platform)
+		return platform switch
 		{
-			return platform switch
-			{
-				Platforms.x86 => !Environment.Is64BitProcess,
-				Platforms.x64 => Environment.Is64BitProcess,
-				Platforms.AnyCPU => true,
-				_ => throw new ArgumentOutOfRangeException(nameof(platform)),
-			};
-		}
+			Platforms.x86 => !Environment.Is64BitProcess,
+			Platforms.x64 => Environment.Is64BitProcess,
+			Platforms.AnyCPU => true,
+			_ => throw new ArgumentOutOfRangeException(nameof(platform)),
+		};
 	}
 }
\ No newline at end of file
diff --git a/Common/ProcessExtensions.cs b/Common/ProcessExtensions.cs
index f3a7917d..213bd867 100644
--- a/Common/ProcessExtensions.cs
+++ b/Common/ProcessExtensions.cs
@@ -1,147 +1,146 @@
-namespace Ecng.Common
-{
+namespace Ecng.Common;
+
 #if !NET5_0_OR_GREATER
-	using System;
-	using System.Diagnostics;
-	using System.Threading;
-	using System.Threading.Tasks;
+using System;
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+
+static class ProcessExtensions
+{
+	public static bool Associated(this Process process)
+	{
+		if (process is null)
+			throw new ArgumentNullException(nameof(process));
 
-	static class ProcessExtensions
+		return process.Handle != default;
+	}
+
+	// https://github.com/dotnet/runtime/blob/main/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.cs#L1422
+
+	/// <summary>
+	/// Instructs the Process component to wait for the associated process to exit, or
+	/// for the <paramref name="cancellationToken"/> to be canceled.
+	/// </summary>
+	/// <returns>
+	/// A task that will complete when the process has exited, cancellation has been requested,
+	/// or an error occurs.
+	/// </returns>
+	public static async Task WaitForExitAsync(this Process process, CancellationToken cancellationToken = default)
 	{
-		public static bool Associated(this Process process)
+		if (process is null)
+			throw new ArgumentNullException(nameof(process));
+
+		// Because the process has already started by the time this method is called,
+		// we're in a race against the process to set up our exit handlers before the process
+		// exits. As a result, there are several different flows that must be handled:
+		//
+		// CASE 1: WE ENABLE EVENTS
+		// This is the "happy path". In this case we enable events.
+		//
+		// CASE 1.1: PROCESS EXITS OR IS CANCELED AFTER REGISTERING HANDLER
+		// This case continues the "happy path". The process exits or waiting is canceled after
+		// registering the handler and no special cases are needed.
+		//
+		// CASE 1.2: PROCESS EXITS BEFORE REGISTERING HANDLER
+		// It's possible that the process can exit after we enable events but before we reigster
+		// the handler. In that case we must check for exit after registering the handler.
+		//
+		//
+		// CASE 2: PROCESS EXITS BEFORE ENABLING EVENTS
+		// The process may exit before we attempt to enable events. In that case EnableRaisingEvents
+		// will throw an exception like this:
+		//     System.InvalidOperationException : Cannot process request because the process (42) has exited.
+		// In this case we catch the InvalidOperationException. If the process has exited, our work
+		// is done and we return. If for any reason (now or in the future) enabling events fails
+		// and the process has not exited, bubble the exception up to the user.
+		//
+		//
+		// CASE 3: USER ALREADY ENABLED EVENTS
+		// In this case the user has already enabled raising events. Re-enabling events is a no-op
+		// as the value hasn't changed. However, no-op also means that if the process has already
+		// exited, EnableRaisingEvents won't throw an exception.
+		//
+		// CASE 3.1: PROCESS EXITS OR IS CANCELED AFTER REGISTERING HANDLER
+		// (See CASE 1.1)
+		//
+		// CASE 3.2: PROCESS EXITS BEFORE REGISTERING HANDLER
+		// (See CASE 1.2)
+
+		if (!process.Associated())
 		{
-			if (process is null)
-				throw new ArgumentNullException(nameof(process));
+			throw new InvalidOperationException("Not associated.");
+		}
 
-			return process.Handle != default;
+		if (!process.HasExited)
+		{
+			// Early out for cancellation before doing more expensive work
+			cancellationToken.ThrowIfCancellationRequested();
 		}
 
-		// https://github.com/dotnet/runtime/blob/main/src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.cs#L1422
-
-		/// <summary>
-		/// Instructs the Process component to wait for the associated process to exit, or
-		/// for the <paramref name="cancellationToken"/> to be canceled.
-		/// </summary>
-		/// <returns>
-		/// A task that will complete when the process has exited, cancellation has been requested,
-		/// or an error occurs.
-		/// </returns>
-		public static async Task WaitForExitAsync(this Process process, CancellationToken cancellationToken = default)
+		try
+		{
+			// CASE 1: We enable events
+			// CASE 2: Process exits before enabling events (and throws an exception)
+			// CASE 3: User already enabled events (no-op)
+			process.EnableRaisingEvents = true;
+		}
+		catch (InvalidOperationException)
 		{
-			if (process is null)
-				throw new ArgumentNullException(nameof(process));
-
-			// Because the process has already started by the time this method is called,
-			// we're in a race against the process to set up our exit handlers before the process
-			// exits. As a result, there are several different flows that must be handled:
-			//
-			// CASE 1: WE ENABLE EVENTS
-			// This is the "happy path". In this case we enable events.
-			//
-			// CASE 1.1: PROCESS EXITS OR IS CANCELED AFTER REGISTERING HANDLER
-			// This case continues the "happy path". The process exits or waiting is canceled after
-			// registering the handler and no special cases are needed.
-			//
-			// CASE 1.2: PROCESS EXITS BEFORE REGISTERING HANDLER
-			// It's possible that the process can exit after we enable events but before we reigster
-			// the handler. In that case we must check for exit after registering the handler.
-			//
-			//
-			// CASE 2: PROCESS EXITS BEFORE ENABLING EVENTS
-			// The process may exit before we attempt to enable events. In that case EnableRaisingEvents
-			// will throw an exception like this:
-			//     System.InvalidOperationException : Cannot process request because the process (42) has exited.
-			// In this case we catch the InvalidOperationException. If the process has exited, our work
-			// is done and we return. If for any reason (now or in the future) enabling events fails
-			// and the process has not exited, bubble the exception up to the user.
-			//
-			//
-			// CASE 3: USER ALREADY ENABLED EVENTS
-			// In this case the user has already enabled raising events. Re-enabling events is a no-op
-			// as the value hasn't changed. However, no-op also means that if the process has already
-			// exited, EnableRaisingEvents won't throw an exception.
-			//
-			// CASE 3.1: PROCESS EXITS OR IS CANCELED AFTER REGISTERING HANDLER
-			// (See CASE 1.1)
-			//
-			// CASE 3.2: PROCESS EXITS BEFORE REGISTERING HANDLER
-			// (See CASE 1.2)
-
-			if (!process.Associated())
+			// CASE 2: If the process has exited, our work is done, otherwise bubble the
+			// exception up to the user
+			if (process.HasExited)
 			{
-				throw new InvalidOperationException("Not associated.");
+				await WaitUntilOutputEOF(cancellationToken).ConfigureAwait(false);
+				return;
 			}
 
-			if (!process.HasExited)
-			{
-				// Early out for cancellation before doing more expensive work
-				cancellationToken.ThrowIfCancellationRequested();
-			}
+			throw;
+		}
 
-			try
+		var tcs = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
+
+		EventHandler handler = (_, _) => tcs.TrySetResult(true);
+		process.Exited += handler;
+
+		try
+		{
+			if (process.HasExited)
 			{
-				// CASE 1: We enable events
-				// CASE 2: Process exits before enabling events (and throws an exception)
-				// CASE 3: User already enabled events (no-op)
-				process.EnableRaisingEvents = true;
+				// CASE 1.2 & CASE 3.2: Handle race where the process exits before registering the handler
 			}
-			catch (InvalidOperationException)
+			else
 			{
-				// CASE 2: If the process has exited, our work is done, otherwise bubble the
-				// exception up to the user
-				if (process.HasExited)
+				// CASE 1.1 & CASE 3.1: Process exits or is canceled here
+				using (cancellationToken.Register(() => tcs.TrySetCanceled(cancellationToken), false))
 				{
-					await WaitUntilOutputEOF(cancellationToken).ConfigureAwait(false);
-					return;
+					await tcs.Task.ConfigureAwait(false);
 				}
-
-				throw;
 			}
 
-			var tcs = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
-
-			EventHandler handler = (_, _) => tcs.TrySetResult(true);
-			process.Exited += handler;
-
-			try
-			{
-				if (process.HasExited)
-				{
-					// CASE 1.2 & CASE 3.2: Handle race where the process exits before registering the handler
-				}
-				else
-				{
-					// CASE 1.1 & CASE 3.1: Process exits or is canceled here
-					using (cancellationToken.Register(() => tcs.TrySetCanceled(cancellationToken), false))
-					{
-						await tcs.Task.ConfigureAwait(false);
-					}
-				}
-
-				// Wait until output streams have been drained
-				await WaitUntilOutputEOF(cancellationToken).ConfigureAwait(false);
-			}
-			finally
-			{
-				process.Exited -= handler;
-			}
+			// Wait until output streams have been drained
+			await WaitUntilOutputEOF(cancellationToken).ConfigureAwait(false);
+		}
+		finally
+		{
+			process.Exited -= handler;
+		}
 
-			static Task WaitUntilOutputEOF(CancellationToken cancellationToken)
-			{
-				// TODO
-				return Task.CompletedTask;
-
-				//if (process._output is not null)
-				//{
-				//	await process._output.EOF.WaitAsync(cancellationToken).ConfigureAwait(false);
-				//}
-
-				//if (process._error is not null)
-				//{
-				//	await process._error.EOF.WaitAsync(cancellationToken).ConfigureAwait(false);
-				//}
-			}
+		static Task WaitUntilOutputEOF(CancellationToken cancellationToken)
+		{
+			// TODO
+			return Task.CompletedTask;
+
+			//if (process._output is not null)
+			//{
+			//	await process._output.EOF.WaitAsync(cancellationToken).ConfigureAwait(false);
+			//}
+
+			//if (process._error is not null)
+			//{
+			//	await process._error.EOF.WaitAsync(cancellationToken).ConfigureAwait(false);
+			//}
 		}
 	}
-#endif
 }
+#endif
diff --git a/Common/RandomArray.cs b/Common/RandomArray.cs
index be83b047..5fb523c4 100644
--- a/Common/RandomArray.cs
+++ b/Common/RandomArray.cs
@@ -1,130 +1,129 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+using System;
+using System.Linq;
+
+/// <summary>
+/// Provides functionality to generate a random array of values of type T.
+/// </summary>
+/// <typeparam name="T">The type of the elements in the array. Must be a value type that implements IComparable.</typeparam>
+public class RandomArray<T>
+	where T : struct, IComparable<T>
 {
-	using System;
-	using System.Linq;
+	private readonly SyncObject _lock = new();
+	private readonly T[] _data;
+	private int _index;
 
 	/// <summary>
-	/// Provides functionality to generate a random array of values of type T.
+	/// Initializes a new instance of the <see cref="RandomArray{T}"/> class with a specified count.
 	/// </summary>
-	/// <typeparam name="T">The type of the elements in the array. Must be a value type that implements IComparable.</typeparam>
-	public class RandomArray<T>
-		where T : struct, IComparable<T>
+	/// <param name="count">The number of elements in the random array.</param>
+	/// <exception cref="NotSupportedException">Thrown when type T is not supported for random generation.</exception>
+	public RandomArray(int count)
 	{
-		private readonly SyncObject _lock = new();
-		private readonly T[] _data;
-		private int _index;
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="RandomArray{T}"/> class with a specified count.
-		/// </summary>
-		/// <param name="count">The number of elements in the random array.</param>
-		/// <exception cref="NotSupportedException">Thrown when type T is not supported for random generation.</exception>
-		public RandomArray(int count)
+		Count = count;
+
+		_data = [.. Enumerable.Repeat<T>(default, count)];
+
+		if (typeof(T) == typeof(double))
+		{
+			for (var i = 0; i < _data.Length; i++)
+				_data[i] = RandomGen.GetDouble().To<T>();
+		}
+		else if (typeof(T) == typeof(int))
+		{
+			for (var i = 0; i < _data.Length; i++)
+				_data[i] = RandomGen.GetInt().To<T>();
+		}
+		else if (typeof(T) == typeof(bool))
+		{
+			for (var i = 0; i < _data.Length; i++)
+				_data[i] = RandomGen.GetBool().To<T>();
+		}
+		else if (typeof(T).IsEnum)
+		{
+			for (var i = 0; i < _data.Length; i++)
+				_data[i] = RandomGen.GetEnum<T>();
+		}
+		else if (typeof(T) == typeof(byte))
 		{
-			Count = count;
+			RandomGen.GetBytes(count).CopyTo(_data, 0);
+		}
+		else
+			throw new NotSupportedException();
+	}
 
-			_data = [.. Enumerable.Repeat<T>(default, count)];
+	/// <summary>
+	/// Initializes a new instance of the <see cref="RandomArray{T}"/> class within a specified range.
+	/// </summary>
+	/// <param name="min">The minimum value of the range.</param>
+	/// <param name="max">The maximum value of the range.</param>
+	/// <param name="count">The number of elements in the random array.</param>
+	/// <exception cref="ArgumentException">Thrown when <paramref name="min"/> is greater than <paramref name="max"/>.</exception>
+	/// <exception cref="NotSupportedException">Thrown when type T is not supported for ranged random generation.</exception>
+	public RandomArray(T min, T max, int count)
+	{
+		Min = min;
+		Max = max;
+		Count = count;
 
-			if (typeof(T) == typeof(double))
-			{
-				for (var i = 0; i < _data.Length; i++)
-					_data[i] = RandomGen.GetDouble().To<T>();
-			}
-			else if (typeof(T) == typeof(int))
-			{
-				for (var i = 0; i < _data.Length; i++)
-					_data[i] = RandomGen.GetInt().To<T>();
-			}
-			else if (typeof(T) == typeof(bool))
+		if (min.CompareTo(max) > 0)
+			throw new ArgumentException("min > max");
+
+		_data = [.. Enumerable.Repeat(min, count)];
+
+		if (min.CompareTo(max) != 0)
+		{
+			if (typeof(T) == typeof(int))
 			{
+				var minInt = min.To<int>();
+				var maxInt = max.To<int>();
+
 				for (var i = 0; i < _data.Length; i++)
-					_data[i] = RandomGen.GetBool().To<T>();
+					_data[i] = RandomGen.GetInt(minInt, maxInt).To<T>();
 			}
-			else if (typeof(T).IsEnum)
+			else if (typeof(T) == typeof(TimeSpan))
 			{
+				var minTimeSpan = min.To<TimeSpan>();
+				var maxTimeSpan = max.To<TimeSpan>();
+
 				for (var i = 0; i < _data.Length; i++)
-					_data[i] = RandomGen.GetEnum<T>();
-			}
-			else if (typeof(T) == typeof(byte))
-			{
-				RandomGen.GetBytes(count).CopyTo(_data, 0);
+					_data[i] = RandomGen.GetTime(minTimeSpan, maxTimeSpan).To<T>();
 			}
 			else
 				throw new NotSupportedException();
 		}
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="RandomArray{T}"/> class within a specified range.
-		/// </summary>
-		/// <param name="min">The minimum value of the range.</param>
-		/// <param name="max">The maximum value of the range.</param>
-		/// <param name="count">The number of elements in the random array.</param>
-		/// <exception cref="ArgumentException">Thrown when <paramref name="min"/> is greater than <paramref name="max"/>.</exception>
-		/// <exception cref="NotSupportedException">Thrown when type T is not supported for ranged random generation.</exception>
-		public RandomArray(T min, T max, int count)
-		{
-			Min = min;
-			Max = max;
-			Count = count;
-
-			if (min.CompareTo(max) > 0)
-				throw new ArgumentException("min > max");
+	/// <summary>
+	/// Gets the total number of elements in the random array.
+	/// </summary>
+	public int Count { get; }
 
-			_data = [.. Enumerable.Repeat(min, count)];
+	/// <summary>
+	/// Gets the minimum value (or default seed value) used in the random array generation.
+	/// </summary>
+	public T Min { get; }
 
-			if (min.CompareTo(max) != 0)
-			{
-				if (typeof(T) == typeof(int))
-				{
-					var minInt = min.To<int>();
-					var maxInt = max.To<int>();
-
-					for (var i = 0; i < _data.Length; i++)
-						_data[i] = RandomGen.GetInt(minInt, maxInt).To<T>();
-				}
-				else if (typeof(T) == typeof(TimeSpan))
-				{
-					var minTimeSpan = min.To<TimeSpan>();
-					var maxTimeSpan = max.To<TimeSpan>();
-
-					for (var i = 0; i < _data.Length; i++)
-						_data[i] = RandomGen.GetTime(minTimeSpan, maxTimeSpan).To<T>();
-				}
-				else
-					throw new NotSupportedException();
-			}
-		}
+	/// <summary>
+	/// Gets the maximum value used in the random array generation.
+	/// </summary>
+	public T Max { get; }
 
-		/// <summary>
-		/// Gets the total number of elements in the random array.
-		/// </summary>
-		public int Count { get; }
-
-		/// <summary>
-		/// Gets the minimum value (or default seed value) used in the random array generation.
-		/// </summary>
-		public T Min { get; }
-
-		/// <summary>
-		/// Gets the maximum value used in the random array generation.
-		/// </summary>
-		public T Max { get; }
-
-		/// <summary>
-		/// Returns the next random element from the array.
-		/// </summary>
-		/// <returns>A random element of type T from the array.</returns>
-		public T Next()
+	/// <summary>
+	/// Returns the next random element from the array.
+	/// </summary>
+	/// <returns>A random element of type T from the array.</returns>
+	public T Next()
+	{
+		lock (_lock)
 		{
-			lock (_lock)
-			{
-				var next = _data[_index++];
+			var next = _data[_index++];
 
-				if (_index == _data.Length)
-					_index = 0;
+			if (_index == _data.Length)
+				_index = 0;
 
-				return next;
-			}
+			return next;
 		}
 	}
 }
\ No newline at end of file
diff --git a/Common/RandomGen.cs b/Common/RandomGen.cs
index a295608e..92ecb81d 100644
--- a/Common/RandomGen.cs
+++ b/Common/RandomGen.cs
@@ -1,270 +1,269 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Globalization;
+using System.Runtime.CompilerServices;
+
+/// <summary>
+/// Provides methods for generating random values of various types.
+/// </summary>
+public static class RandomGen
 {
-	using System;
-	using System.Collections.Generic;
-	using System.Linq;
-	using System.Globalization;
-	using System.Runtime.CompilerServices;
+	private static readonly SyncObject _sync = new();
+	private static readonly Random _value = new((int)DateTime.Now.Ticks);
 
 	/// <summary>
-	/// Provides methods for generating random values of various types.
+	/// Returns a random double value between 0.0 and 1.0.
 	/// </summary>
-	public static class RandomGen
+	/// <returns>A random double.</returns>
+	public static double GetDouble()
 	{
-		private static readonly SyncObject _sync = new();
-		private static readonly Random _value = new((int)DateTime.Now.Ticks);
-
-		/// <summary>
-		/// Returns a random double value between 0.0 and 1.0.
-		/// </summary>
-		/// <returns>A random double.</returns>
-		public static double GetDouble()
-		{
-			lock (_sync)
-				return _value.NextDouble();
-		}
+		lock (_sync)
+			return _value.NextDouble();
+	}
 
-		/// <summary>
-		/// Returns an array of random bytes with the specified count.
-		/// </summary>
-		/// <param name="count">The number of random bytes to generate.</param>
-		/// <returns>An array of random bytes.</returns>
-		public static byte[] GetBytes(int count)
-		{
-			var buffer = new byte[count];
-			GetBytes(buffer);
-			return buffer;
-		}
+	/// <summary>
+	/// Returns an array of random bytes with the specified count.
+	/// </summary>
+	/// <param name="count">The number of random bytes to generate.</param>
+	/// <returns>An array of random bytes.</returns>
+	public static byte[] GetBytes(int count)
+	{
+		var buffer = new byte[count];
+		GetBytes(buffer);
+		return buffer;
+	}
 
-		/// <summary>
-		/// Fills the provided array with random bytes.
-		/// </summary>
-		/// <param name="buffer">The array to fill with random bytes.</param>
-		public static void GetBytes(byte[] buffer)
-		{
-			lock (_sync)
-				_value.NextBytes(buffer);
-		}
+	/// <summary>
+	/// Fills the provided array with random bytes.
+	/// </summary>
+	/// <param name="buffer">The array to fill with random bytes.</param>
+	public static void GetBytes(byte[] buffer)
+	{
+		lock (_sync)
+			_value.NextBytes(buffer);
+	}
 
-		/// <summary>
-		/// Returns a random non-negative integer.
-		/// </summary>
-		/// <returns>A random integer.</returns>
-		public static int GetInt()
-		{
-			lock (_sync)
-				return _value.Next();
-		}
+	/// <summary>
+	/// Returns a random non-negative integer.
+	/// </summary>
+	/// <returns>A random integer.</returns>
+	public static int GetInt()
+	{
+		lock (_sync)
+			return _value.Next();
+	}
 
-		/// <summary>
-		/// Returns a random integer between 0 and the specified maximum value (inclusive).
-		/// </summary>
-		/// <param name="max">The maximum value.</param>
-		/// <returns>A random integer between 0 and max (inclusive).</returns>
-		public static int GetInt(int max)
+	/// <summary>
+	/// Returns a random integer between 0 and the specified maximum value (inclusive).
+	/// </summary>
+	/// <param name="max">The maximum value.</param>
+	/// <returns>A random integer between 0 and max (inclusive).</returns>
+	public static int GetInt(int max)
+	{
+		lock (_sync)
+			return _value.Next(max + 1);
+	}
+
+	/// <summary>
+	/// Returns a random integer between the specified minimum and maximum values (inclusive).
+	/// </summary>
+	/// <param name="min">The minimum value.</param>
+	/// <param name="max">The maximum value.</param>
+	/// <returns>A random integer between min and max (inclusive).</returns>
+	public static int GetInt(int min, int max)
+	{
+		lock (_sync)
+			return _value.Next(min, max + 1);
+	}
+
+	/// <summary>
+	/// Returns a random long value between long.MinValue and long.MaxValue.
+	/// </summary>
+	/// <returns>A random long value.</returns>
+	public static long GetLong() => GetLong(long.MinValue, long.MaxValue);
+
+	/// <summary>
+	/// Returns a random long value between the specified minimum and maximum values (inclusive).
+	/// </summary>
+	/// <param name="min">The minimum value.</param>
+	/// <param name="max">The maximum value.</param>
+	/// <returns>A random long value between min and max (inclusive).</returns>
+	public static long GetLong(long min, long max)
+	{
+		//if (min >= int.MinValue && max <= int.MaxValue)
+		//	return GetInt((int)min, (int)max);
+
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+		static int Log2Ceiling(ulong value)
 		{
-			lock (_sync)
-				return _value.Next(max + 1);
+			[MethodImpl(MethodImplOptions.AggressiveInlining)]
+			static int NumberOfSetBits(ulong i)
+			{
+				i -= (i >> 1) & 0x5555555555555555UL;
+				i = (i & 0x3333333333333333UL) + ((i >> 2) & 0x3333333333333333UL);
+				return (int)(unchecked(((i + (i >> 4)) & 0xF0F0F0F0F0F0F0FUL) * 0x101010101010101UL) >> 56);
+			}
+
+			var result = (int)Math.Log(value, 2);
+
+			if (NumberOfSetBits(value) != 1)
+				result++;
+
+			return result;
 		}
 
-		/// <summary>
-		/// Returns a random integer between the specified minimum and maximum values (inclusive).
-		/// </summary>
-		/// <param name="min">The minimum value.</param>
-		/// <param name="max">The maximum value.</param>
-		/// <returns>A random integer between min and max (inclusive).</returns>
-		public static int GetInt(int min, int max)
+		static ulong GetULong()
 		{
 			lock (_sync)
-				return _value.Next(min, max + 1);
+			{
+				return ((ulong)(uint)_value.Next(1 << 22)) |
+				(((ulong)(uint)_value.Next(1 << 22)) << 22) |
+				(((ulong)(uint)_value.Next(1 << 20)) << 44);
+			}
 		}
 
-		/// <summary>
-		/// Returns a random long value between long.MinValue and long.MaxValue.
-		/// </summary>
-		/// <returns>A random long value.</returns>
-		public static long GetLong() => GetLong(long.MinValue, long.MaxValue);
-
-		/// <summary>
-		/// Returns a random long value between the specified minimum and maximum values (inclusive).
-		/// </summary>
-		/// <param name="min">The minimum value.</param>
-		/// <param name="max">The maximum value.</param>
-		/// <returns>A random long value between min and max (inclusive).</returns>
-		public static long GetLong(long min, long max)
+		var exclusiveRange = (ulong)(max - min);
+
+		if (exclusiveRange > 1)
 		{
-			//if (min >= int.MinValue && max <= int.MaxValue)
-			//	return GetInt((int)min, (int)max);
+			// Narrow down to the smallest range [0, 2^bits] that contains maxValue - minValue.
+			// Then repeatedly generate a value in that outer range until we get one within the inner range.
+			var bits = Log2Ceiling(exclusiveRange);
 
-			[MethodImpl(MethodImplOptions.AggressiveInlining)]
-			static int Log2Ceiling(ulong value)
+			while (true)
 			{
-				[MethodImpl(MethodImplOptions.AggressiveInlining)]
-				static int NumberOfSetBits(ulong i)
-				{
-					i -= (i >> 1) & 0x5555555555555555UL;
-					i = (i & 0x3333333333333333UL) + ((i >> 2) & 0x3333333333333333UL);
-					return (int)(unchecked(((i + (i >> 4)) & 0xF0F0F0F0F0F0F0FUL) * 0x101010101010101UL) >> 56);
-				}
+				var result = GetULong() >> (sizeof(long) * 8 - bits);
 
-				var result = (int)Math.Log(value, 2);
+				if (result < exclusiveRange)
+					return (long)result + min;
+			}
+		}
 
-				if (NumberOfSetBits(value) != 1)
-					result++;
+		return min + GetInt((int)exclusiveRange);
+	}
 
-				return result;
-			}
+	/// <summary>
+	/// Returns a random boolean value.
+	/// </summary>
+	/// <returns>A random boolean.</returns>
+	public static bool GetBool() => GetInt(1) == 1;
 
-			static ulong GetULong()
-			{
-				lock (_sync)
-				{
-					return ((ulong)(uint)_value.Next(1 << 22)) |
-					(((ulong)(uint)_value.Next(1 << 22)) << 22) |
-					(((ulong)(uint)_value.Next(1 << 20)) << 44);
-				}
-			}
+	/// <summary>
+	/// Returns a random enum value of type T.
+	/// </summary>
+	/// <typeparam name="T">The enum type.</typeparam>
+	/// <returns>A random enum value.</returns>
+	public static T GetEnum<T>()
+		where T : struct
+		=> GetEnum(Enumerator.GetValues<T>());
 
-			var exclusiveRange = (ulong)(max - min);
+	/// <summary>
+	/// Returns a random enum value from the specified collection of values.
+	/// </summary>
+	/// <typeparam name="T">The enum type.</typeparam>
+	/// <param name="values">A collection of enum values.</param>
+	/// <returns>A random enum value from the collection.</returns>
+	public static T GetEnum<T>(IEnumerable<T> values)
+		where T : struct
+		=> GetEnum(default, values.Max(value => value.To<long>()).To<T>());
 
-			if (exclusiveRange > 1)
-			{
-				// Narrow down to the smallest range [0, 2^bits] that contains maxValue - minValue.
-				// Then repeatedly generate a value in that outer range until we get one within the inner range.
-				var bits = Log2Ceiling(exclusiveRange);
+	/// <summary>
+	/// Returns a random enum value between the specified minimum and maximum enum values.
+	/// </summary>
+	/// <typeparam name="T">The enum type.</typeparam>
+	/// <param name="min">The minimum enum value.</param>
+	/// <param name="max">The maximum enum value.</param>
+	/// <returns>A random enum value between min and max.</returns>
+	public static T GetEnum<T>(T min, T max)
+		where T : struct
+		=> GetLong(min.To<long>(), max.To<long>()).To<T>();
 
-				while (true)
-				{
-					var result = GetULong() >> (sizeof(long) * 8 - bits);
+	/// <summary>
+	/// Returns a random element from the specified collection.
+	/// </summary>
+	/// <typeparam name="T">The type of elements in the collection.</typeparam>
+	/// <param name="array">The collection of elements.</param>
+	/// <returns>A random element from the collection.</returns>
+	public static T GetElement<T>(IEnumerable<T> array)
+		=> array.ElementAt(GetInt(0, array.Count() - 1));
 
-					if (result < exclusiveRange)
-						return (long)result + min;
-				}
-			}
+	/// <summary>
+	/// Returns a random Base64 encoded string generated from a random salt.
+	/// </summary>
+	/// <param name="min">The minimum length for generating the salt.</param>
+	/// <param name="max">The maximum length for generating the salt.</param>
+	/// <returns>A random Base64 encoded string.</returns>
+	public static string GetString(int min, int max)
+		=> TypeHelper.GenerateSalt(GetInt(min, max)).Base64();
 
-			return min + GetInt((int)exclusiveRange);
-		}
+	/// <summary>
+	/// Returns a random DateTime value between DateTime.MinValue and DateTime.MaxValue.
+	/// </summary>
+	/// <returns>A random DateTime.</returns>
+	public static DateTime GetDate()
+		=> GetDate(DateTime.MinValue, DateTime.MaxValue);
 
-		/// <summary>
-		/// Returns a random boolean value.
-		/// </summary>
-		/// <returns>A random boolean.</returns>
-		public static bool GetBool() => GetInt(1) == 1;
-
-		/// <summary>
-		/// Returns a random enum value of type T.
-		/// </summary>
-		/// <typeparam name="T">The enum type.</typeparam>
-		/// <returns>A random enum value.</returns>
-		public static T GetEnum<T>()
-			where T : struct
-			=> GetEnum(Enumerator.GetValues<T>());
-
-		/// <summary>
-		/// Returns a random enum value from the specified collection of values.
-		/// </summary>
-		/// <typeparam name="T">The enum type.</typeparam>
-		/// <param name="values">A collection of enum values.</param>
-		/// <returns>A random enum value from the collection.</returns>
-		public static T GetEnum<T>(IEnumerable<T> values)
-			where T : struct
-			=> GetEnum(default, values.Max(value => value.To<long>()).To<T>());
-
-		/// <summary>
-		/// Returns a random enum value between the specified minimum and maximum enum values.
-		/// </summary>
-		/// <typeparam name="T">The enum type.</typeparam>
-		/// <param name="min">The minimum enum value.</param>
-		/// <param name="max">The maximum enum value.</param>
-		/// <returns>A random enum value between min and max.</returns>
-		public static T GetEnum<T>(T min, T max)
-			where T : struct
-			=> GetLong(min.To<long>(), max.To<long>()).To<T>();
-
-		/// <summary>
-		/// Returns a random element from the specified collection.
-		/// </summary>
-		/// <typeparam name="T">The type of elements in the collection.</typeparam>
-		/// <param name="array">The collection of elements.</param>
-		/// <returns>A random element from the collection.</returns>
-		public static T GetElement<T>(IEnumerable<T> array)
-			=> array.ElementAt(GetInt(0, array.Count() - 1));
-
-		/// <summary>
-		/// Returns a random Base64 encoded string generated from a random salt.
-		/// </summary>
-		/// <param name="min">The minimum length for generating the salt.</param>
-		/// <param name="max">The maximum length for generating the salt.</param>
-		/// <returns>A random Base64 encoded string.</returns>
-		public static string GetString(int min, int max)
-			=> TypeHelper.GenerateSalt(GetInt(min, max)).Base64();
-
-		/// <summary>
-		/// Returns a random DateTime value between DateTime.MinValue and DateTime.MaxValue.
-		/// </summary>
-		/// <returns>A random DateTime.</returns>
-		public static DateTime GetDate()
-			=> GetDate(DateTime.MinValue, DateTime.MaxValue);
-
-		/// <summary>
-		/// Returns a random DateTime value between the specified minimum and maximum values.
-		/// </summary>
-		/// <param name="min">The minimum DateTime value.</param>
-		/// <param name="max">The maximum DateTime value.</param>
-		/// <returns>A random DateTime between min and max.</returns>
-		public static DateTime GetDate(DateTime min, DateTime max)
-			=> min + GetTime(default, max - min);
-
-		/// <summary>
-		/// Returns a random TimeSpan value between TimeSpan.MinValue and TimeSpan.MaxValue.
-		/// </summary>
-		/// <returns>A random TimeSpan.</returns>
-		public static TimeSpan GetTime()
-			=> GetTime(TimeSpan.MinValue, TimeSpan.MaxValue);
-
-		/// <summary>
-		/// Returns a random TimeSpan value between the specified minimum and maximum values.
-		/// </summary>
-		/// <param name="min">The minimum TimeSpan value.</param>
-		/// <param name="max">The maximum TimeSpan value.</param>
-		/// <returns>A random TimeSpan between min and max.</returns>
-		public static TimeSpan GetTime(TimeSpan min, TimeSpan max)
-			=> GetLong(min.Ticks, max.Ticks).To<TimeSpan>();
-
-		/// <summary>
-		/// Returns a random non-zero decimal value with a specified number of integer and fractional digits.
-		/// Tries up to 10 times to generate a valid number.
-		/// </summary>
-		/// <param name="integer">The maximum number of digits in the integer part. Default is 8.</param>
-		/// <param name="fractional">The maximum number of digits in the fractional part. Default is 8.</param>
-		/// <returns>A random decimal value.</returns>
-		/// <exception cref="InvalidOperationException">Thrown when a valid decimal value cannot be generated in 10 attempts.</exception>
-		public static decimal GetDecimal(int integer = 8, int fractional = 8)
-		{
-			for (var k = 0; k < 10; k++)
-			{
-				var i1 = Enumerable.Repeat(9, GetInt(1, integer)).Select(i => GetInt(9).ToString()).Join(string.Empty).To<long>();
-				var i2 = Enumerable.Repeat(9, GetInt(1, fractional)).Select(i => GetInt(9).ToString()).Join(string.Empty).To<long>();
-				var value = decimal.Parse(i1 + "." + i2, CultureInfo.InvariantCulture);
+	/// <summary>
+	/// Returns a random DateTime value between the specified minimum and maximum values.
+	/// </summary>
+	/// <param name="min">The minimum DateTime value.</param>
+	/// <param name="max">The maximum DateTime value.</param>
+	/// <returns>A random DateTime between min and max.</returns>
+	public static DateTime GetDate(DateTime min, DateTime max)
+		=> min + GetTime(default, max - min);
 
-				if (value != 0)
-					return value;
-			}
+	/// <summary>
+	/// Returns a random TimeSpan value between TimeSpan.MinValue and TimeSpan.MaxValue.
+	/// </summary>
+	/// <returns>A random TimeSpan.</returns>
+	public static TimeSpan GetTime()
+		=> GetTime(TimeSpan.MinValue, TimeSpan.MaxValue);
 
-			throw new InvalidOperationException();
-		}
+	/// <summary>
+	/// Returns a random TimeSpan value between the specified minimum and maximum values.
+	/// </summary>
+	/// <param name="min">The minimum TimeSpan value.</param>
+	/// <param name="max">The maximum TimeSpan value.</param>
+	/// <returns>A random TimeSpan between min and max.</returns>
+	public static TimeSpan GetTime(TimeSpan min, TimeSpan max)
+		=> GetLong(min.Ticks, max.Ticks).To<TimeSpan>();
 
-		/// <summary>
-		/// Returns a random decimal value between the specified minimum and maximum values with the given precision.
-		/// </summary>
-		/// <param name="min">The minimum decimal value.</param>
-		/// <param name="max">The maximum decimal value.</param>
-		/// <param name="precision">The number of decimal places to round the value to.</param>
-		/// <returns>A random decimal value between min and max rounded to the specified precision.</returns>
-		public static decimal GetDecimal(decimal min, decimal max, int precision)
+	/// <summary>
+	/// Returns a random non-zero decimal value with a specified number of integer and fractional digits.
+	/// Tries up to 10 times to generate a valid number.
+	/// </summary>
+	/// <param name="integer">The maximum number of digits in the integer part. Default is 8.</param>
+	/// <param name="fractional">The maximum number of digits in the fractional part. Default is 8.</param>
+	/// <returns>A random decimal value.</returns>
+	/// <exception cref="InvalidOperationException">Thrown when a valid decimal value cannot be generated in 10 attempts.</exception>
+	public static decimal GetDecimal(int integer = 8, int fractional = 8)
+	{
+		for (var k = 0; k < 10; k++)
 		{
-			var value = GetDouble() * ((double)max - (double)min) + (double)min;
-			return (decimal)value.Round(precision);
+			var i1 = Enumerable.Repeat(9, GetInt(1, integer)).Select(i => GetInt(9).ToString()).Join(string.Empty).To<long>();
+			var i2 = Enumerable.Repeat(9, GetInt(1, fractional)).Select(i => GetInt(9).ToString()).Join(string.Empty).To<long>();
+			var value = decimal.Parse(i1 + "." + i2, CultureInfo.InvariantCulture);
+
+			if (value != 0)
+				return value;
 		}
+
+		throw new InvalidOperationException();
+	}
+
+	/// <summary>
+	/// Returns a random decimal value between the specified minimum and maximum values with the given precision.
+	/// </summary>
+	/// <param name="min">The minimum decimal value.</param>
+	/// <param name="max">The maximum decimal value.</param>
+	/// <param name="precision">The number of decimal places to round the value to.</param>
+	/// <returns>A random decimal value between min and max rounded to the specified precision.</returns>
+	public static decimal GetDecimal(decimal min, decimal max, int precision)
+	{
+		var value = GetDouble() * ((double)max - (double)min) + (double)min;
+		return (decimal)value.Round(precision);
 	}
 }
\ No newline at end of file
diff --git a/Common/Ref Tuples.cs b/Common/Ref Tuples.cs
index 666c8583..15bed52b 100644
--- a/Common/Ref Tuples.cs	
+++ b/Common/Ref Tuples.cs	
@@ -1,335 +1,334 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+using System;
+using System.Linq;
+using System.Collections.Generic;
+
+/// <summary>
+/// Represents a reference tuple with enumerable object values.
+/// </summary>
+public interface IRefTuple
 {
-	using System;
-	using System.Linq;
-	using System.Collections.Generic;
+	/// <summary>
+	/// Gets or sets the values of the tuple.
+	/// </summary>
+	IEnumerable<object> Values { get; set; }
+}
 
+/// <summary>
+/// Represents a pair of reference values.
+/// </summary>
+/// <typeparam name="TFirst">Type of the first element.</typeparam>
+/// <typeparam name="TSecond">Type of the second element.</typeparam>
+public class RefPair<TFirst, TSecond> : IRefTuple
+{
 	/// <summary>
-	/// Represents a reference tuple with enumerable object values.
+	/// Initializes a new instance of the <see cref="RefPair{TFirst, TSecond}"/> class.
 	/// </summary>
-	public interface IRefTuple
+	public RefPair()
 	{
-		/// <summary>
-		/// Gets or sets the values of the tuple.
-		/// </summary>
-		IEnumerable<object> Values { get; set; }
 	}
 
 	/// <summary>
-	/// Represents a pair of reference values.
+	/// Initializes a new instance of the <see cref="RefPair{TFirst, TSecond}"/> class with specified values.
 	/// </summary>
-	/// <typeparam name="TFirst">Type of the first element.</typeparam>
-	/// <typeparam name="TSecond">Type of the second element.</typeparam>
-	public class RefPair<TFirst, TSecond> : IRefTuple
+	/// <param name="first">The first element.</param>
+	/// <param name="second">The second element.</param>
+	public RefPair(TFirst first, TSecond second)
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="RefPair{TFirst, TSecond}"/> class.
-		/// </summary>
-		public RefPair()
-		{
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="RefPair{TFirst, TSecond}"/> class with specified values.
-		/// </summary>
-		/// <param name="first">The first element.</param>
-		/// <param name="second">The second element.</param>
-		public RefPair(TFirst first, TSecond second)
-		{
-			First = first;
-			Second = second;
-		}
+		First = first;
+		Second = second;
+	}
 
-		/// <summary>
-		/// Gets or sets the first element.
-		/// </summary>
-		public TFirst First { get; set; }
+	/// <summary>
+	/// Gets or sets the first element.
+	/// </summary>
+	public TFirst First { get; set; }
 
-		/// <summary>
-		/// Gets or sets the second element.
-		/// </summary>
-		public TSecond Second { get; set; }
+	/// <summary>
+	/// Gets or sets the second element.
+	/// </summary>
+	public TSecond Second { get; set; }
 
-		/// <summary>
-		/// Gets or sets the tuple values.
-		/// </summary>
-		public virtual IEnumerable<object> Values
+	/// <summary>
+	/// Gets or sets the tuple values.
+	/// </summary>
+	public virtual IEnumerable<object> Values
+	{
+		get => [First, Second];
+		set
 		{
-			get => [First, Second];
-			set
-			{
-				First = (TFirst)value.ElementAt(0);
-				Second = (TSecond)value.ElementAt(1);
-			}
+			First = (TFirst)value.ElementAt(0);
+			Second = (TSecond)value.ElementAt(1);
 		}
+	}
 
-		/// <summary>
-		/// Returns a string that represents the tuple.
-		/// </summary>
-		/// <returns>A string representation of the tuple.</returns>
-		public override string ToString()
-			=> "[" + GetValuesString() + "]";
+	/// <summary>
+	/// Returns a string that represents the tuple.
+	/// </summary>
+	/// <returns>A string representation of the tuple.</returns>
+	public override string ToString()
+		=> "[" + GetValuesString() + "]";
 
-		/// <summary>
-		/// Gets a string that represents the tuple values.
-		/// </summary>
-		/// <returns>A string representation of the tuple values.</returns>
-		protected virtual string GetValuesString()
-			=> First + ", " + Second;
+	/// <summary>
+	/// Gets a string that represents the tuple values.
+	/// </summary>
+	/// <returns>A string representation of the tuple values.</returns>
+	protected virtual string GetValuesString()
+		=> First + ", " + Second;
 
-		/// <summary>
-		/// Converts the tuple to a KeyValuePair.
-		/// </summary>
-		/// <returns>A KeyValuePair containing the first and second elements.</returns>
-		public KeyValuePair<TFirst, TSecond> ToValuePair()
-			=> new(First, Second);
-	}
+	/// <summary>
+	/// Converts the tuple to a KeyValuePair.
+	/// </summary>
+	/// <returns>A KeyValuePair containing the first and second elements.</returns>
+	public KeyValuePair<TFirst, TSecond> ToValuePair()
+		=> new(First, Second);
+}
 
+/// <summary>
+/// Represents a triple of reference values.
+/// </summary>
+/// <typeparam name="TFirst">Type of the first element.</typeparam>
+/// <typeparam name="TSecond">Type of the second element.</typeparam>
+/// <typeparam name="TThird">Type of the third element.</typeparam>
+public class RefTriple<TFirst, TSecond, TThird> : RefPair<TFirst, TSecond>
+{
 	/// <summary>
-	/// Represents a triple of reference values.
+	/// Initializes a new instance of the <see cref="RefTriple{TFirst, TSecond, TThird}"/> class.
 	/// </summary>
-	/// <typeparam name="TFirst">Type of the first element.</typeparam>
-	/// <typeparam name="TSecond">Type of the second element.</typeparam>
-	/// <typeparam name="TThird">Type of the third element.</typeparam>
-	public class RefTriple<TFirst, TSecond, TThird> : RefPair<TFirst, TSecond>
+	public RefTriple()
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="RefTriple{TFirst, TSecond, TThird}"/> class.
-		/// </summary>
-		public RefTriple()
-		{
-		}
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="RefTriple{TFirst, TSecond, TThird}"/> class with specified values.
-		/// </summary>
-		/// <param name="first">The first element.</param>
-		/// <param name="second">The second element.</param>
-		/// <param name="third">The third element.</param>
-		public RefTriple(TFirst first, TSecond second, TThird third)
-			: base(first, second)
-		{
-			Third = third;
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="RefTriple{TFirst, TSecond, TThird}"/> class with specified values.
+	/// </summary>
+	/// <param name="first">The first element.</param>
+	/// <param name="second">The second element.</param>
+	/// <param name="third">The third element.</param>
+	public RefTriple(TFirst first, TSecond second, TThird third)
+		: base(first, second)
+	{
+		Third = third;
+	}
 
-		/// <summary>
-		/// Gets or sets the third element.
-		/// </summary>
-		public TThird Third { get; set; }
+	/// <summary>
+	/// Gets or sets the third element.
+	/// </summary>
+	public TThird Third { get; set; }
 
-		/// <summary>
-		/// Gets or sets the tuple values.
-		/// </summary>
-		public override IEnumerable<object> Values
+	/// <summary>
+	/// Gets or sets the tuple values.
+	/// </summary>
+	public override IEnumerable<object> Values
+	{
+		get => base.Values.Concat([Third]);
+		set
 		{
-			get => base.Values.Concat([Third]);
-			set
-			{
-				base.Values = value;
-				Third = (TThird)value.ElementAt(2);
-			}
+			base.Values = value;
+			Third = (TThird)value.ElementAt(2);
 		}
-
-		/// <summary>
-		/// Gets a string that represents the tuple values.
-		/// </summary>
-		/// <returns>A string representation of the tuple values.</returns>
-		protected override string GetValuesString()
-			=> base.GetValuesString() + ", " + Third;
 	}
 
 	/// <summary>
-	/// Represents a quadruple of reference values.
+	/// Gets a string that represents the tuple values.
 	/// </summary>
-	/// <typeparam name="TFirst">Type of the first element.</typeparam>
-	/// <typeparam name="TSecond">Type of the second element.</typeparam>
-	/// <typeparam name="TThird">Type of the third element.</typeparam>
-	/// <typeparam name="TFourth">Type of the fourth element.</typeparam>
-	public class RefQuadruple<TFirst, TSecond, TThird, TFourth> : RefTriple<TFirst, TSecond, TThird>
+	/// <returns>A string representation of the tuple values.</returns>
+	protected override string GetValuesString()
+		=> base.GetValuesString() + ", " + Third;
+}
+
+/// <summary>
+/// Represents a quadruple of reference values.
+/// </summary>
+/// <typeparam name="TFirst">Type of the first element.</typeparam>
+/// <typeparam name="TSecond">Type of the second element.</typeparam>
+/// <typeparam name="TThird">Type of the third element.</typeparam>
+/// <typeparam name="TFourth">Type of the fourth element.</typeparam>
+public class RefQuadruple<TFirst, TSecond, TThird, TFourth> : RefTriple<TFirst, TSecond, TThird>
+{
+	/// <summary>
+	/// Initializes a new instance of the <see cref="RefQuadruple{TFirst, TSecond, TThird, TFourth}"/> class.
+	/// </summary>
+	public RefQuadruple()
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="RefQuadruple{TFirst, TSecond, TThird, TFourth}"/> class.
-		/// </summary>
-		public RefQuadruple()
-		{
-		}
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="RefQuadruple{TFirst, TSecond, TThird, TFourth}"/> class with specified values.
-		/// </summary>
-		/// <param name="first">The first element.</param>
-		/// <param name="second">The second element.</param>
-		/// <param name="third">The third element.</param>
-		/// <param name="fourth">The fourth element.</param>
-		public RefQuadruple(TFirst first, TSecond second, TThird third, TFourth fourth)
-			: base(first, second, third)
-		{
-			Fourth = fourth;
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="RefQuadruple{TFirst, TSecond, TThird, TFourth}"/> class with specified values.
+	/// </summary>
+	/// <param name="first">The first element.</param>
+	/// <param name="second">The second element.</param>
+	/// <param name="third">The third element.</param>
+	/// <param name="fourth">The fourth element.</param>
+	public RefQuadruple(TFirst first, TSecond second, TThird third, TFourth fourth)
+		: base(first, second, third)
+	{
+		Fourth = fourth;
+	}
 
-		/// <summary>
-		/// Gets or sets the fourth element.
-		/// </summary>
-		public TFourth Fourth { get; set; }
+	/// <summary>
+	/// Gets or sets the fourth element.
+	/// </summary>
+	public TFourth Fourth { get; set; }
 
-		/// <summary>
-		/// Gets or sets the tuple values.
-		/// </summary>
-		public override IEnumerable<object> Values
+	/// <summary>
+	/// Gets or sets the tuple values.
+	/// </summary>
+	public override IEnumerable<object> Values
+	{
+		get => base.Values.Concat([Fourth]);
+		set
 		{
-			get => base.Values.Concat([Fourth]);
-			set
-			{
-				base.Values = value;
-				Fourth = (TFourth)value.ElementAt(3);
-			}
+			base.Values = value;
+			Fourth = (TFourth)value.ElementAt(3);
 		}
-
-		/// <summary>
-		/// Gets a string that represents the tuple values.
-		/// </summary>
-		/// <returns>A string representation of the tuple values.</returns>
-		protected override string GetValuesString()
-			=> base.GetValuesString() + ", " + Fourth;
 	}
 
 	/// <summary>
-	/// Represents a quintuple of reference values.
+	/// Gets a string that represents the tuple values.
 	/// </summary>
-	/// <typeparam name="TFirst">Type of the first element.</typeparam>
-	/// <typeparam name="TSecond">Type of the second element.</typeparam>
-	/// <typeparam name="TThird">Type of the third element.</typeparam>
-	/// <typeparam name="TFourth">Type of the fourth element.</typeparam>
-	/// <typeparam name="TFifth">Type of the fifth element.</typeparam>
-	public class RefFive<TFirst, TSecond, TThird, TFourth, TFifth> : RefQuadruple<TFirst, TSecond, TThird, TFourth>
+	/// <returns>A string representation of the tuple values.</returns>
+	protected override string GetValuesString()
+		=> base.GetValuesString() + ", " + Fourth;
+}
+
+/// <summary>
+/// Represents a quintuple of reference values.
+/// </summary>
+/// <typeparam name="TFirst">Type of the first element.</typeparam>
+/// <typeparam name="TSecond">Type of the second element.</typeparam>
+/// <typeparam name="TThird">Type of the third element.</typeparam>
+/// <typeparam name="TFourth">Type of the fourth element.</typeparam>
+/// <typeparam name="TFifth">Type of the fifth element.</typeparam>
+public class RefFive<TFirst, TSecond, TThird, TFourth, TFifth> : RefQuadruple<TFirst, TSecond, TThird, TFourth>
+{
+	/// <summary>
+	/// Initializes a new instance of the <see cref="RefFive{TFirst, TSecond, TThird, TFourth, TFifth}"/> class.
+	/// </summary>
+	public RefFive()
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="RefFive{TFirst, TSecond, TThird, TFourth, TFifth}"/> class.
-		/// </summary>
-		public RefFive()
-		{
-		}
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="RefFive{TFirst, TSecond, TThird, TFourth, TFifth}"/> class with specified values.
-		/// </summary>
-		/// <param name="first">The first element.</param>
-		/// <param name="second">The second element.</param>
-		/// <param name="third">The third element.</param>
-		/// <param name="fourth">The fourth element.</param>
-		/// <param name="fifth">The fifth element.</param>
-		public RefFive(TFirst first, TSecond second, TThird third, TFourth fourth, TFifth fifth)
-			: base(first, second, third, fourth)
-		{
-			Fifth = fifth;
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="RefFive{TFirst, TSecond, TThird, TFourth, TFifth}"/> class with specified values.
+	/// </summary>
+	/// <param name="first">The first element.</param>
+	/// <param name="second">The second element.</param>
+	/// <param name="third">The third element.</param>
+	/// <param name="fourth">The fourth element.</param>
+	/// <param name="fifth">The fifth element.</param>
+	public RefFive(TFirst first, TSecond second, TThird third, TFourth fourth, TFifth fifth)
+		: base(first, second, third, fourth)
+	{
+		Fifth = fifth;
+	}
 
-		/// <summary>
-		/// Gets or sets the fifth element.
-		/// </summary>
-		public TFifth Fifth { get; set; }
+	/// <summary>
+	/// Gets or sets the fifth element.
+	/// </summary>
+	public TFifth Fifth { get; set; }
 
-		/// <summary>
-		/// Gets or sets the tuple values.
-		/// </summary>
-		public override IEnumerable<object> Values
+	/// <summary>
+	/// Gets or sets the tuple values.
+	/// </summary>
+	public override IEnumerable<object> Values
+	{
+		get => base.Values.Concat([Fifth]);
+		set
 		{
-			get => base.Values.Concat([Fifth]);
-			set
-			{
-				base.Values = value;
-				Fifth = (TFifth)value.ElementAt(4);
-			}
+			base.Values = value;
+			Fifth = (TFifth)value.ElementAt(4);
 		}
-
-		/// <summary>
-		/// Gets a string that represents the tuple values.
-		/// </summary>
-		/// <returns>A string representation of the tuple values.</returns>
-		protected override string GetValuesString()
-			=> base.GetValuesString() + ", " + Fifth;
 	}
 
 	/// <summary>
-	/// Provides factory methods to create reference tuples.
+	/// Gets a string that represents the tuple values.
 	/// </summary>
-	public static class RefTuple
-	{
-		/// <summary>
-		/// Creates a new pair of reference values.
-		/// </summary>
-		/// <typeparam name="TFirst">Type of the first element.</typeparam>
-		/// <typeparam name="TSecond">Type of the second element.</typeparam>
-		/// <param name="first">The first element.</param>
-		/// <param name="second">The second element.</param>
-		/// <returns>A new instance of <see cref="RefPair{TFirst, TSecond}"/>.</returns>
-		public static RefPair<TFirst, TSecond> Create<TFirst, TSecond>(TFirst first, TSecond second)
-			=> new(first, second);
+	/// <returns>A string representation of the tuple values.</returns>
+	protected override string GetValuesString()
+		=> base.GetValuesString() + ", " + Fifth;
+}
 
-		/// <summary>
-		/// Creates a new triple of reference values.
-		/// </summary>
-		/// <typeparam name="TFirst">Type of the first element.</typeparam>
-		/// <typeparam name="TSecond">Type of the second element.</typeparam>
-		/// <typeparam name="TThird">Type of the third element.</typeparam>
-		/// <param name="first">The first element.</param>
-		/// <param name="second">The second element.</param>
-		/// <param name="third">The third element.</param>
-		/// <returns>A new instance of <see cref="RefTriple{TFirst, TSecond, TThird}"/>.</returns>
-		public static RefTriple<TFirst, TSecond, TThird> Create<TFirst, TSecond, TThird>(TFirst first, TSecond second, TThird third)
-			=> new(first, second, third);
+/// <summary>
+/// Provides factory methods to create reference tuples.
+/// </summary>
+public static class RefTuple
+{
+	/// <summary>
+	/// Creates a new pair of reference values.
+	/// </summary>
+	/// <typeparam name="TFirst">Type of the first element.</typeparam>
+	/// <typeparam name="TSecond">Type of the second element.</typeparam>
+	/// <param name="first">The first element.</param>
+	/// <param name="second">The second element.</param>
+	/// <returns>A new instance of <see cref="RefPair{TFirst, TSecond}"/>.</returns>
+	public static RefPair<TFirst, TSecond> Create<TFirst, TSecond>(TFirst first, TSecond second)
+		=> new(first, second);
 
-		/// <summary>
-		/// Creates a new quadruple of reference values.
-		/// </summary>
-		/// <typeparam name="TFirst">Type of the first element.</typeparam>
-		/// <typeparam name="TSecond">Type of the second element.</typeparam>
-		/// <typeparam name="TThird">Type of the third element.</typeparam>
-		/// <typeparam name="TFourth">Type of the fourth element.</typeparam>
-		/// <param name="first">The first element.</param>
-		/// <param name="second">The second element.</param>
-		/// <param name="third">The third element.</param>
-		/// <param name="fourth">The fourth element.</param>
-		/// <returns>A new instance of <see cref="RefQuadruple{TFirst, TSecond, TThird, TFourth}"/>.</returns>
-		public static RefQuadruple<TFirst, TSecond, TThird, TFourth> Create<TFirst, TSecond, TThird, TFourth>(TFirst first, TSecond second, TThird third, TFourth fourth)
-			=> new(first, second, third, fourth);
+	/// <summary>
+	/// Creates a new triple of reference values.
+	/// </summary>
+	/// <typeparam name="TFirst">Type of the first element.</typeparam>
+	/// <typeparam name="TSecond">Type of the second element.</typeparam>
+	/// <typeparam name="TThird">Type of the third element.</typeparam>
+	/// <param name="first">The first element.</param>
+	/// <param name="second">The second element.</param>
+	/// <param name="third">The third element.</param>
+	/// <returns>A new instance of <see cref="RefTriple{TFirst, TSecond, TThird}"/>.</returns>
+	public static RefTriple<TFirst, TSecond, TThird> Create<TFirst, TSecond, TThird>(TFirst first, TSecond second, TThird third)
+		=> new(first, second, third);
+
+	/// <summary>
+	/// Creates a new quadruple of reference values.
+	/// </summary>
+	/// <typeparam name="TFirst">Type of the first element.</typeparam>
+	/// <typeparam name="TSecond">Type of the second element.</typeparam>
+	/// <typeparam name="TThird">Type of the third element.</typeparam>
+	/// <typeparam name="TFourth">Type of the fourth element.</typeparam>
+	/// <param name="first">The first element.</param>
+	/// <param name="second">The second element.</param>
+	/// <param name="third">The third element.</param>
+	/// <param name="fourth">The fourth element.</param>
+	/// <returns>A new instance of <see cref="RefQuadruple{TFirst, TSecond, TThird, TFourth}"/>.</returns>
+	public static RefQuadruple<TFirst, TSecond, TThird, TFourth> Create<TFirst, TSecond, TThird, TFourth>(TFirst first, TSecond second, TThird third, TFourth fourth)
+		=> new(first, second, third, fourth);
 
-		/// <summary>
-		/// Creates a new quintuple of reference values.
-		/// </summary>
-		/// <typeparam name="TFirst">Type of the first element.</typeparam>
-		/// <typeparam name="TSecond">Type of the second element.</typeparam>
-		/// <typeparam name="TThird">Type of the third element.</typeparam>
-		/// <typeparam name="TFourth">Type of the fourth element.</typeparam>
-		/// <typeparam name="TFifth">Type of the fifth element.</typeparam>
-		/// <param name="first">The first element.</param>
-		/// <param name="second">The second element.</param>
-		/// <param name="third">The third element.</param>
-		/// <param name="fourth">The fourth element.</param>
-		/// <param name="fifth">The fifth element.</param>
-		/// <returns>A new instance of <see cref="RefFive{TFirst, TSecond, TThird, TFourth, TFifth}"/>.</returns>
-		public static RefFive<TFirst, TSecond, TThird, TFourth, TFifth> Create<TFirst, TSecond, TThird, TFourth, TFifth>(TFirst first, TSecond second, TThird third, TFourth fourth, TFifth fifth)
-			=> new(first, second, third, fourth, fifth);
+	/// <summary>
+	/// Creates a new quintuple of reference values.
+	/// </summary>
+	/// <typeparam name="TFirst">Type of the first element.</typeparam>
+	/// <typeparam name="TSecond">Type of the second element.</typeparam>
+	/// <typeparam name="TThird">Type of the third element.</typeparam>
+	/// <typeparam name="TFourth">Type of the fourth element.</typeparam>
+	/// <typeparam name="TFifth">Type of the fifth element.</typeparam>
+	/// <param name="first">The first element.</param>
+	/// <param name="second">The second element.</param>
+	/// <param name="third">The third element.</param>
+	/// <param name="fourth">The fourth element.</param>
+	/// <param name="fifth">The fifth element.</param>
+	/// <returns>A new instance of <see cref="RefFive{TFirst, TSecond, TThird, TFourth, TFifth}"/>.</returns>
+	public static RefFive<TFirst, TSecond, TThird, TFourth, TFifth> Create<TFirst, TSecond, TThird, TFourth, TFifth>(TFirst first, TSecond second, TThird third, TFourth fourth, TFifth fifth)
+		=> new(first, second, third, fourth, fifth);
 
-		private static readonly RefFive<int, int, int, int, int> _t = new();
+	private static readonly RefFive<int, int, int, int, int> _t = new();
 
-		/// <summary>
-		/// Gets the name of the member at the specified index.
-		/// </summary>
-		/// <param name="idx">The index of the member.</param>
-		/// <returns>The name of the corresponding member.</returns>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown when the index is out of range.</exception>
-		public static string GetName(int idx)
+	/// <summary>
+	/// Gets the name of the member at the specified index.
+	/// </summary>
+	/// <param name="idx">The index of the member.</param>
+	/// <returns>The name of the corresponding member.</returns>
+	/// <exception cref="ArgumentOutOfRangeException">Thrown when the index is out of range.</exception>
+	public static string GetName(int idx)
+	{
+		return idx switch
 		{
-			return idx switch
-			{
-				0 => nameof(_t.First),
-				1 => nameof(_t.Second),
-				2 => nameof(_t.Third),
-				3 => nameof(_t.Fourth),
-				4 => nameof(_t.Fifth),
-				_ => throw new ArgumentOutOfRangeException(nameof(idx)),
-			};
-		}
+			0 => nameof(_t.First),
+			1 => nameof(_t.Second),
+			2 => nameof(_t.Third),
+			3 => nameof(_t.Fourth),
+			4 => nameof(_t.Fifth),
+			_ => throw new ArgumentOutOfRangeException(nameof(idx)),
+		};
 	}
 }
\ No newline at end of file
diff --git a/Common/ResettableTimer.cs b/Common/ResettableTimer.cs
index 5e4449a4..c858a474 100644
--- a/Common/ResettableTimer.cs
+++ b/Common/ResettableTimer.cs
@@ -1,122 +1,121 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+using System;
+
+/// <summary>
+/// Represents a timer that can be reset and activated repeatedly.
+/// The timer executes the Elapsed event periodically based on the specified period.
+/// </summary>
+public class ResettableTimer(TimeSpan period, string name) : Disposable
 {
-	using System;
+	private readonly SyncObject _sync = new();
+	private readonly SyncObject _finish = new();
+	private bool _isActivated;
+	private bool _isFinished = true;
+	private bool _isCancelled;
+
+	private readonly TimeSpan _period = period;
+	private readonly string _name = name;
 
 	/// <summary>
-	/// Represents a timer that can be reset and activated repeatedly.
-	/// The timer executes the Elapsed event periodically based on the specified period.
+	/// Occurs when the timer interval has elapsed.
+	/// The event receives a function that determines if processing can be executed.
 	/// </summary>
-	public class ResettableTimer(TimeSpan period, string name) : Disposable
-	{
-		private readonly SyncObject _sync = new();
-		private readonly SyncObject _finish = new();
-		private bool _isActivated;
-		private bool _isFinished = true;
-		private bool _isCancelled;
-
-		private readonly TimeSpan _period = period;
-		private readonly string _name = name;
-
-		/// <summary>
-		/// Occurs when the timer interval has elapsed.
-		/// The event receives a function that determines if processing can be executed.
-		/// </summary>
-		public event Action<Func<bool>> Elapsed;
+	public event Action<Func<bool>> Elapsed;
 
-		/// <summary>
-		/// Activates the timer. 
-		/// If the timer is not already running, starts a new thread that periodically raises the Elapsed event.
-		/// </summary>
-		public void Activate()
+	/// <summary>
+	/// Activates the timer. 
+	/// If the timer is not already running, starts a new thread that periodically raises the Elapsed event.
+	/// </summary>
+	public void Activate()
+	{
+		lock (_sync)
 		{
-			lock (_sync)
-			{
-				_isActivated = true;
+			_isActivated = true;
 
-				if (!_isFinished)
-					return;
+			if (!_isFinished)
+				return;
 
-				_isFinished = false;
-				_isCancelled = false;
-			}
+			_isFinished = false;
+			_isCancelled = false;
+		}
 
-			ThreadingHelper.Thread(() =>
+		ThreadingHelper.Thread(() =>
+		{
+			try
 			{
-				try
+				while (!IsDisposed)
 				{
-					while (!IsDisposed)
+					lock (_sync)
 					{
-						lock (_sync)
-						{
-							_isCancelled = false;
+						_isCancelled = false;
 
-							if (_isActivated)
-								_isActivated = false;
-							else
-							{
-								_isFinished = true;
-								break;
-							}
+						if (_isActivated)
+							_isActivated = false;
+						else
+						{
+							_isFinished = true;
+							break;
 						}
-
-						Elapsed?.Invoke(CanProcess);
-						_period.Sleep();
 					}
-				}
-				finally
-				{
-					_finish.PulseAll();
-				}
-			}).Name(_name).Launch();
-		}
-
-		/// <summary>
-		/// Cancels the current timer operation.
-		/// If the timer is running, this method signals that the current cycle should not process further.
-		/// </summary>
-		public void Cancel()
-		{
-			lock (_sync)
-			{
-				if (_isFinished)
-					return;
 
-				_isActivated = false;
-				_isCancelled = true;
+					Elapsed?.Invoke(CanProcess);
+					_period.Sleep();
+				}
 			}
-		}
-
-		/// <summary>
-		/// Flushes the timer by activating it and then waiting for the ongoing timer cycle to finish.
-		/// </summary>
-		public void Flush()
-		{
-			lock (_finish)
+			finally
 			{
-				Activate();
-				_finish.Wait();
+				_finish.PulseAll();
 			}
-		}
+		}).Name(_name).Launch();
+	}
 
-		/// <summary>
-		/// Determines if the timer can process the Elapsed event based on its cancellation or disposal state.
-		/// </summary>
-		/// <returns>
-		/// True if the timer is not cancelled and not disposed; otherwise, false.
-		/// </returns>
-		private bool CanProcess()
+	/// <summary>
+	/// Cancels the current timer operation.
+	/// If the timer is running, this method signals that the current cycle should not process further.
+	/// </summary>
+	public void Cancel()
+	{
+		lock (_sync)
 		{
-			return !_isCancelled && !IsDisposed;
+			if (_isFinished)
+				return;
+
+			_isActivated = false;
+			_isCancelled = true;
 		}
+	}
 
-		/// <summary>
-		/// Releases the managed resources used by the timer.
-		/// Cancels the timer operation before disposing.
-		/// </summary>
-		protected override void DisposeManaged()
+	/// <summary>
+	/// Flushes the timer by activating it and then waiting for the ongoing timer cycle to finish.
+	/// </summary>
+	public void Flush()
+	{
+		lock (_finish)
 		{
-			Cancel();
-			base.DisposeManaged();
+			Activate();
+			_finish.Wait();
 		}
 	}
+
+	/// <summary>
+	/// Determines if the timer can process the Elapsed event based on its cancellation or disposal state.
+	/// </summary>
+	/// <returns>
+	/// True if the timer is not cancelled and not disposed; otherwise, false.
+	/// </returns>
+	private bool CanProcess()
+	{
+		return !_isCancelled && !IsDisposed;
+	}
+
+	/// <summary>
+	/// Releases the managed resources used by the timer.
+	/// Cancels the timer operation before disposing.
+	/// </summary>
+	protected override void DisposeManaged()
+	{
+		Cancel();
+		base.DisposeManaged();
+	}
 }
\ No newline at end of file
diff --git a/Common/Scope.cs b/Common/Scope.cs
index 71188fb3..848392c7 100644
--- a/Common/Scope.cs
+++ b/Common/Scope.cs
@@ -1,145 +1,144 @@
-namespace Ecng.Common
-{
-	#region Using Directives
+namespace Ecng.Common;
 
-	using System;
-	using System.Collections.Generic;
-	using System.Security;
-	using System.Threading;
+#region Using Directives
 
-	#endregion
+using System;
+using System.Collections.Generic;
+using System.Security;
+using System.Threading;
+
+#endregion
+
+/// <summary>
+/// Provides a scope for managing a resource with automatic disposal.
+/// </summary>
+/// <typeparam name="T">The type of the resource to be managed.</typeparam>
+public sealed class Scope<T> : Disposable
+	//where T : class
+{
+	#region Scope.ctor()
 
 	/// <summary>
-	/// Provides a scope for managing a resource with automatic disposal.
+	/// Initializes a new instance of the <see cref="Scope{T}"/> class with a new instance of T.
 	/// </summary>
-	/// <typeparam name="T">The type of the resource to be managed.</typeparam>
-	public sealed class Scope<T> : Disposable
-		//where T : class
+	public Scope()
+		: this(Activator.CreateInstance<T>(), true)
 	{
-		#region Scope.ctor()
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="Scope{T}"/> class with a new instance of T.
-		/// </summary>
-		public Scope()
-			: this(Activator.CreateInstance<T>(), true)
-		{
-		}
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="Scope{T}"/> class with the specified value.
-		/// </summary>
-		/// <param name="value">The instance of T to be managed.</param>
-		public Scope(T value)
-			: this(value, true)
-		{
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="Scope{T}"/> class with the specified value.
+	/// </summary>
+	/// <param name="value">The instance of T to be managed.</param>
+	public Scope(T value)
+		: this(value, true)
+	{
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="Scope{T}"/> class with the specified value and ownership.
-		/// </summary>
-		/// <param name="value">The instance of T to be managed.</param>
-		/// <param name="ownInstance">Indicates whether the scope owns the instance and is responsible for disposing it.</param>
-		public Scope(T value, bool ownInstance)
-		{
-			if (value.IsNull())
-				throw new ArgumentNullException(nameof(value));
+	/// <summary>
+	/// Initializes a new instance of the <see cref="Scope{T}"/> class with the specified value and ownership.
+	/// </summary>
+	/// <param name="value">The instance of T to be managed.</param>
+	/// <param name="ownInstance">Indicates whether the scope owns the instance and is responsible for disposing it.</param>
+	public Scope(T value, bool ownInstance)
+	{
+		if (value.IsNull())
+			throw new ArgumentNullException(nameof(value));
 
-			Value = value;
-			OwnInstance = ownInstance;
+		Value = value;
+		OwnInstance = ownInstance;
 
-			Parent = _current.Value;
-			_current.Value = this;
+		Parent = _current.Value;
+		_current.Value = this;
 
-			//_all.Add(this);
-		}
+		//_all.Add(this);
+	}
 
-		#endregion
+	#endregion
 
-		#region Parent
+	#region Parent
 
-		/// <summary>
-		/// Gets the parent scope of the current scope.
-		/// </summary>
-		public Scope<T> Parent { get; }
+	/// <summary>
+	/// Gets the parent scope of the current scope.
+	/// </summary>
+	public Scope<T> Parent { get; }
 
-		#region Current
+	#region Current
 
-		// ReSharper disable once InconsistentNaming
-		private static readonly AsyncLocal<Scope<T>> _current = new();
+	// ReSharper disable once InconsistentNaming
+	private static readonly AsyncLocal<Scope<T>> _current = new();
 
-		/// <summary>
-		/// Gets the current scope.
-		/// </summary>
-		public static Scope<T> Current => _current.Value;
+	/// <summary>
+	/// Gets the current scope.
+	/// </summary>
+	public static Scope<T> Current => _current.Value;
 
-		/// <summary>
-		/// Gets a value indicating whether a current scope is defined.
-		/// </summary>
-		public static bool IsDefined => Current != null;
+	/// <summary>
+	/// Gets a value indicating whether a current scope is defined.
+	/// </summary>
+	public static bool IsDefined => Current != null;
 
-		#endregion
+	#endregion
 
-		/// <summary>
-		/// Gets all scopes in the current hierarchy as a collection.
-		/// </summary>
-		public static ICollection<Scope<T>> All
+	/// <summary>
+	/// Gets all scopes in the current hierarchy as a collection.
+	/// </summary>
+	public static ICollection<Scope<T>> All
+	{
+		get
 		{
-			get
-			{
-				var all = new List<Scope<T>>();
-
-				var current = Current;
-				while (current != null)
-				{
-					all.Add(current);
-					current = current.Parent;
-				}
+			var all = new List<Scope<T>>();
 
-				all.Reverse();
-
-				return all;
+			var current = Current;
+			while (current != null)
+			{
+				all.Add(current);
+				current = current.Parent;
 			}
-		}
 
-		/// <summary>
-		/// Gets a value indicating whether the scope owns the managed instance.
-		/// </summary>
-		public bool OwnInstance { get; }
+			all.Reverse();
 
-		/// <summary>
-		/// Gets the value contained in the scope.
-		/// </summary>
-		public T Value { get; }
+			return all;
+		}
+	}
 
-		#endregion
+	/// <summary>
+	/// Gets a value indicating whether the scope owns the managed instance.
+	/// </summary>
+	public bool OwnInstance { get; }
 
-		#region Disposable Members
+	/// <summary>
+	/// Gets the value contained in the scope.
+	/// </summary>
+	public T Value { get; }
 
-		/// <summary>
-		/// Disposes the managed resources used by the <see cref="Scope{T}"/> class.
-		/// </summary>
-		/// <remarks>
-		/// Throws an <see cref="InvalidOperationException"/> if disposed out of order.
-		/// </remarks>
-		[SecuritySafeCritical]
-		protected override void DisposeManaged()
-		{
-			if (this != _current.Value)
-				throw new InvalidOperationException("Disposed out of order.");
+	#endregion
 
-			_current.Value = Parent;
+	#region Disposable Members
 
-			if (OwnInstance)
-			{
-				Value.DoDispose();
-			}
+	/// <summary>
+	/// Disposes the managed resources used by the <see cref="Scope{T}"/> class.
+	/// </summary>
+	/// <remarks>
+	/// Throws an <see cref="InvalidOperationException"/> if disposed out of order.
+	/// </remarks>
+	[SecuritySafeCritical]
+	protected override void DisposeManaged()
+	{
+		if (this != _current.Value)
+			throw new InvalidOperationException("Disposed out of order.");
 
-			//_all.Remove(this);
+		_current.Value = Parent;
 
-			base.DisposeManaged();
+		if (OwnInstance)
+		{
+			Value.DoDispose();
 		}
 
-		#endregion
+		//_all.Remove(this);
+
+		base.DisposeManaged();
 	}
+
+	#endregion
 }
diff --git a/Common/SimpleResettableTimer.cs b/Common/SimpleResettableTimer.cs
index bbfc4b94..5ceb1677 100644
--- a/Common/SimpleResettableTimer.cs
+++ b/Common/SimpleResettableTimer.cs
@@ -1,99 +1,98 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+using System;
+using System.Threading;
+
+/// <summary>
+/// Represents a simple timer that can be reset.
+/// When the timer period elapses without a reset, the <see cref="Elapsed"/> event is invoked.
+/// </summary>
+public class SimpleResettableTimer(TimeSpan period) : IDisposable
 {
-	using System;
-	using System.Threading;
+	private readonly SyncObject _sync = new();
+	private readonly TimeSpan _period = period;
+
+	private Timer _timer;
+	private bool _changed;
 
 	/// <summary>
-	/// Represents a simple timer that can be reset.
-	/// When the timer period elapses without a reset, the <see cref="Elapsed"/> event is invoked.
+	/// Occurs when the timer elapses without being reset.
 	/// </summary>
-	public class SimpleResettableTimer(TimeSpan period) : IDisposable
-	{
-		private readonly SyncObject _sync = new();
-		private readonly TimeSpan _period = period;
-
-		private Timer _timer;
-		private bool _changed;
+	public event Action Elapsed;
 
-		/// <summary>
-		/// Occurs when the timer elapses without being reset.
-		/// </summary>
-		public event Action Elapsed;
-
-		/// <summary>
-		/// Resets the timer. If the timer is not already running, it starts the timer with the specified period.
-		/// If it is running, it marks that the timer should restart the count.
-		/// </summary>
-		public void Reset()
+	/// <summary>
+	/// Resets the timer. If the timer is not already running, it starts the timer with the specified period.
+	/// If it is running, it marks that the timer should restart the count.
+	/// </summary>
+	public void Reset()
+	{
+		lock (_sync)
 		{
-			lock (_sync)
+			if (_timer is null)
 			{
-				if (_timer is null)
-				{
-					_timer = ThreadingHelper
-						.Timer(OnTimer)
-						.Interval(_period);
-				}
-				else
-					_changed = true;
+				_timer = ThreadingHelper
+					.Timer(OnTimer)
+					.Interval(_period);
 			}
+			else
+				_changed = true;
 		}
+	}
 
-		private void OnTimer()
-		{
-			var elapsed = false;
+	private void OnTimer()
+	{
+		var elapsed = false;
 
-			lock (_sync)
+		lock (_sync)
+		{
+			if (!_changed)
 			{
-				if (!_changed)
+				if (_timer != null)
 				{
-					if (_timer != null)
-					{
-						_timer.Dispose();
-						_timer = null;
-					}
-
-					elapsed = true;
+					_timer.Dispose();
+					_timer = null;
 				}
-				else
-					_changed = false;
-			}
 
-			if (elapsed)
-				Elapsed?.Invoke();
+				elapsed = true;
+			}
+			else
+				_changed = false;
 		}
 
-		/// <summary>
-		/// Forces the timer to immediately run its elapsed logic if it is running,
-		/// effectively flushing the timer cycle.
-		/// </summary>
-		public void Flush()
+		if (elapsed)
+			Elapsed?.Invoke();
+	}
+
+	/// <summary>
+	/// Forces the timer to immediately run its elapsed logic if it is running,
+	/// effectively flushing the timer cycle.
+	/// </summary>
+	public void Flush()
+	{
+		lock (_sync)
 		{
-			lock (_sync)
-			{
-				if (_timer is null)
-					return;
+			if (_timer is null)
+				return;
 
-				_changed = false;
-				_timer.Change(TimeSpan.Zero, _period);
-			}
+			_changed = false;
+			_timer.Change(TimeSpan.Zero, _period);
 		}
+	}
 
-		/// <summary>
-		/// Disposes the timer and stops any further executions.
-		/// </summary>
-		public void Dispose()
+	/// <summary>
+	/// Disposes the timer and stops any further executions.
+	/// </summary>
+	public void Dispose()
+	{
+		lock (_sync)
 		{
-			lock (_sync)
-			{
-				if (_timer is null)
-					return;
+			if (_timer is null)
+				return;
 
-				_changed = true;
-				
-				_timer.Dispose();
-				_timer = null;
-			}
+			_changed = true;
+			
+			_timer.Dispose();
+			_timer = null;
 		}
 	}
 }
\ No newline at end of file
diff --git a/Common/StringHelper.cs b/Common/StringHelper.cs
index 3798151c..4bd9dde5 100644
--- a/Common/StringHelper.cs
+++ b/Common/StringHelper.cs
@@ -1,1838 +1,1838 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Security;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Collections;
+using System.Reflection;
+
+using SmartFormat;
+using SmartFormat.Core.Extensions;
+
+/// <summary>
+/// Provides helper methods for string operations.
+/// </summary>
+public static class StringHelper
 {
-	using System;
-	using System.Collections.Generic;
-	using System.Globalization;
-	using System.IO;
-	using System.Linq;
-	using System.Runtime.InteropServices;
-	using System.Security;
-	using System.Text;
-	using System.Text.RegularExpressions;
-	using System.Threading;
-	using System.Threading.Tasks;
-	using System.Collections;
-	using System.Reflection;
-
-	using SmartFormat;
-	using SmartFormat.Core.Extensions;
-
-	/// <summary>
-	/// Provides helper methods for string operations.
-	/// </summary>
-	public static class StringHelper
+	private class DictionarySourceEx : ISource
 	{
-		private class DictionarySourceEx : ISource
-		{
-			private readonly SyncObject _sync = new();
-			private readonly Dictionary<Type, Type> _genericTypes = [];
-			private readonly Dictionary<string, object> _keys = [];
+		private readonly SyncObject _sync = new();
+		private readonly Dictionary<Type, Type> _genericTypes = [];
+		private readonly Dictionary<string, object> _keys = [];
 
-			bool ISource.TryEvaluateSelector(ISelectorInfo selectorInfo)
-			{
-				if (selectorInfo.CurrentValue is not IDictionary dictionary)
-					return false;
+		bool ISource.TryEvaluateSelector(ISelectorInfo selectorInfo)
+		{
+			if (selectorInfo.CurrentValue is not IDictionary dictionary)
+				return false;
 
-				var dictType = dictionary.GetType();
+			var dictType = dictionary.GetType();
 
-				Type type;
+			Type type;
 
-				lock (_sync)
+			lock (_sync)
+			{
+				if (!_genericTypes.TryGetValue(dictType, out type))
 				{
-					if (!_genericTypes.TryGetValue(dictType, out type))
-					{
-						type = dictType.GetGenericType(typeof(IDictionary<,>));
-						_genericTypes.Add(dictType, type);
-					}
+					type = dictType.GetGenericType(typeof(IDictionary<,>));
+					_genericTypes.Add(dictType, type);
 				}
+			}
 
-				if (type is null)
-					return false;
+			if (type is null)
+				return false;
 
-				object key;
-				var text = selectorInfo.SelectorText;
+			object key;
+			var text = selectorInfo.SelectorText;
 
-				lock (_sync)
+			lock (_sync)
+			{
+				if (!_keys.TryGetValue(text, out key))
 				{
-					if (!_keys.TryGetValue(text, out key))
-					{
-						key = text.To(type.GetGenericArguments()[0]);
-						_keys.Add(text, key);
-					}
+					key = text.To(type.GetGenericArguments()[0]);
+					_keys.Add(text, key);
 				}
-
-				selectorInfo.Result = dictionary[key];
-				return true;
 			}
+
+			selectorInfo.Result = dictionary[key];
+			return true;
 		}
+	}
 
-		static StringHelper()
-		{
-			Smart.Default.AddExtensions(new DictionarySourceEx());
+	static StringHelper()
+	{
+		Smart.Default.AddExtensions(new DictionarySourceEx());
 
-			// https://stackoverflow.com/a/47017180
-			Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
-		}
+		// https://stackoverflow.com/a/47017180
+		Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+	}
 
-		/// <summary>
-		/// Checks if the string is null or empty.
-		/// </summary>
-		/// <param name="str">The string to check.</param>
-		/// <returns>True if the string is null or empty; otherwise, false.</returns>
-		public static bool IsEmpty(this string str)
-		{
-			return string.IsNullOrEmpty(str);
-		}
+	/// <summary>
+	/// Checks if the string is null or empty.
+	/// </summary>
+	/// <param name="str">The string to check.</param>
+	/// <returns>True if the string is null or empty; otherwise, false.</returns>
+	public static bool IsEmpty(this string str)
+	{
+		return string.IsNullOrEmpty(str);
+	}
 
-		/// <summary>
-		/// Returns default value if the string is null or empty; otherwise, returns the original string.
-		/// </summary>
-		/// <param name="str">The string to check.</param>
-		/// <param name="defaultValue">The value to return if string is null or empty.</param>
-		/// <returns>Default value or original string.</returns>
-		public static string IsEmpty(this string str, string defaultValue)
-		{
-			return str.IsEmpty() ? defaultValue : str;
-		}
+	/// <summary>
+	/// Returns default value if the string is null or empty; otherwise, returns the original string.
+	/// </summary>
+	/// <param name="str">The string to check.</param>
+	/// <param name="defaultValue">The value to return if string is null or empty.</param>
+	/// <returns>Default value or original string.</returns>
+	public static string IsEmpty(this string str, string defaultValue)
+	{
+		return str.IsEmpty() ? defaultValue : str;
+	}
 
-		/// <summary>
-		/// Throws ArgumentNullException if the string is null or empty.
-		/// </summary>
-		/// <param name="str">The string to check.</param>
-		/// <param name="paramName">The parameter name to use in the exception.</param>
-		/// <returns>The original string if not empty.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when string is null or empty.</exception>
-		public static string ThrowIfEmpty(this string str, string paramName)
-			=> str.IsEmpty() ? throw new ArgumentNullException(paramName) : str;
-
-		/// <summary>
-		/// Checks if the string is null, empty, or consists only of white-space characters.
-		/// </summary>
-		/// <param name="str">The string to check.</param>
-		/// <returns>True if the string is null, empty, or whitespace; otherwise, false.</returns>
-		public static bool IsEmptyOrWhiteSpace(this string str)
-		{
-			return string.IsNullOrWhiteSpace(str);
-		}
+	/// <summary>
+	/// Throws ArgumentNullException if the string is null or empty.
+	/// </summary>
+	/// <param name="str">The string to check.</param>
+	/// <param name="paramName">The parameter name to use in the exception.</param>
+	/// <returns>The original string if not empty.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when string is null or empty.</exception>
+	public static string ThrowIfEmpty(this string str, string paramName)
+		=> str.IsEmpty() ? throw new ArgumentNullException(paramName) : str;
 
-		/// <summary>
-		/// Returns default value if the string is null, empty, or whitespace; otherwise, returns the original string.
-		/// </summary>
-		/// <param name="str">The string to check.</param>
-		/// <param name="defaultValue">The value to return if string is null, empty, or whitespace.</param>
-		/// <returns>Default value or original string.</returns>
-		public static string IsEmptyOrWhiteSpace(this string str, string defaultValue)
-		{
-			return str.IsEmptyOrWhiteSpace() ? defaultValue : str;
-		}
+	/// <summary>
+	/// Checks if the string is null, empty, or consists only of white-space characters.
+	/// </summary>
+	/// <param name="str">The string to check.</param>
+	/// <returns>True if the string is null, empty, or whitespace; otherwise, false.</returns>
+	public static bool IsEmptyOrWhiteSpace(this string str)
+	{
+		return string.IsNullOrWhiteSpace(str);
+	}
 
-		/// <summary>
-		/// Formats the string using standard string.Format with the provided arguments.
-		/// </summary>
-		/// <param name="str">The format string.</param>
-		/// <param name="args">The arguments to format the string with.</param>
-		/// <returns>A formatted string.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when args is null.</exception>
-		public static string Put(this string str, params object[] args)
-		{
-			if (args is null)
-				throw new ArgumentNullException(nameof(args));
-			return args.Length == 0 ? str : string.Format(str, args);
-		}
+	/// <summary>
+	/// Returns default value if the string is null, empty, or whitespace; otherwise, returns the original string.
+	/// </summary>
+	/// <param name="str">The string to check.</param>
+	/// <param name="defaultValue">The value to return if string is null, empty, or whitespace.</param>
+	/// <returns>Default value or original string.</returns>
+	public static string IsEmptyOrWhiteSpace(this string str, string defaultValue)
+	{
+		return str.IsEmptyOrWhiteSpace() ? defaultValue : str;
+	}
 
-		/// <summary>
-		/// Formats the string using Smart.Format with the provided arguments.
-		/// </summary>
-		/// <param name="str">The format string.</param>
-		/// <param name="args">The arguments to format the string with.</param>
-		/// <returns>A formatted string.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when args is null.</exception>
-		public static string PutEx(this string str, params object[] args)
-		{
-			if (args is null)
-				throw new ArgumentNullException(nameof(args));
+	/// <summary>
+	/// Formats the string using standard string.Format with the provided arguments.
+	/// </summary>
+	/// <param name="str">The format string.</param>
+	/// <param name="args">The arguments to format the string with.</param>
+	/// <returns>A formatted string.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when args is null.</exception>
+	public static string Put(this string str, params object[] args)
+	{
+		if (args is null)
+			throw new ArgumentNullException(nameof(args));
+		return args.Length == 0 ? str : string.Format(str, args);
+	}
 
-			return args.Length == 0 ? str : Smart.Format(str, args);
-		}
+	/// <summary>
+	/// Formats the string using Smart.Format with the provided arguments.
+	/// </summary>
+	/// <param name="str">The format string.</param>
+	/// <param name="args">The arguments to format the string with.</param>
+	/// <returns>A formatted string.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when args is null.</exception>
+	public static string PutEx(this string str, params object[] args)
+	{
+		if (args is null)
+			throw new ArgumentNullException(nameof(args));
 
-		/// <summary>
-		/// Asynchronously formats the string using Smart.Format with the provided arguments.
-		/// </summary>
-		/// <param name="str">The format string.</param>
-		/// <param name="args">The arguments to format the string with.</param>
-		/// <param name="cancellationToken">A token to cancel the asynchronous operation.</param>
-		/// <returns>A ValueTask containing the formatted string.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when args is null.</exception>
-		public static ValueTask<string> PutExAsync(this string str, object[] args, CancellationToken cancellationToken)
-		{
-			if (args is null)
-				throw new ArgumentNullException(nameof(args));
+		return args.Length == 0 ? str : Smart.Format(str, args);
+	}
 
-			return args.Length == 0 ? new(str) : Smart.FormatAsync(str, args, cancellationToken);
-		}
+	/// <summary>
+	/// Asynchronously formats the string using Smart.Format with the provided arguments.
+	/// </summary>
+	/// <param name="str">The format string.</param>
+	/// <param name="args">The arguments to format the string with.</param>
+	/// <param name="cancellationToken">A token to cancel the asynchronous operation.</param>
+	/// <returns>A ValueTask containing the formatted string.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when args is null.</exception>
+	public static ValueTask<string> PutExAsync(this string str, object[] args, CancellationToken cancellationToken)
+	{
+		if (args is null)
+			throw new ArgumentNullException(nameof(args));
 
-		private static Type GetGenericType(this Type targetType, Type genericType)
-		{
-			if (targetType is null)
-				throw new ArgumentNullException(nameof(targetType));
+		return args.Length == 0 ? new(str) : Smart.FormatAsync(str, args, cancellationToken);
+	}
+
+	private static Type GetGenericType(this Type targetType, Type genericType)
+	{
+		if (targetType is null)
+			throw new ArgumentNullException(nameof(targetType));
 
-			if (genericType is null)
-				throw new ArgumentNullException(nameof(genericType));
+		if (genericType is null)
+			throw new ArgumentNullException(nameof(genericType));
 
-			if (!genericType.IsGenericTypeDefinition)
-				throw new ArgumentException(nameof(genericType));
+		if (!genericType.IsGenericTypeDefinition)
+			throw new ArgumentException(nameof(genericType));
 
-			if (targetType.IsGenericType && targetType.GetGenericTypeDefinition() == genericType)
-				return targetType;
-			else
+		if (targetType.IsGenericType && targetType.GetGenericTypeDefinition() == genericType)
+			return targetType;
+		else
+		{
+			if (genericType.IsInterface)
 			{
-				if (genericType.IsInterface)
-				{
-					var findedInterfaces = targetType.GetInterfaces()
-						.Where(@interface => @interface.IsGenericType && @interface.GetGenericTypeDefinition() == genericType)
-						.ToList();
-
-					if (findedInterfaces.Count > 1)
-						throw new AmbiguousMatchException("Too many interfaces were found.");
-					else if (findedInterfaces.Count == 1)
-						return findedInterfaces[0];
-					else
-						return null;
-				}
+				var findedInterfaces = targetType.GetInterfaces()
+					.Where(@interface => @interface.IsGenericType && @interface.GetGenericTypeDefinition() == genericType)
+					.ToList();
+
+				if (findedInterfaces.Count > 1)
+					throw new AmbiguousMatchException("Too many interfaces were found.");
+				else if (findedInterfaces.Count == 1)
+					return findedInterfaces[0];
 				else
-				{
-					return targetType.BaseType != null ? GetGenericType(targetType.BaseType, genericType) : null;
-				}
+					return null;
+			}
+			else
+			{
+				return targetType.BaseType != null ? GetGenericType(targetType.BaseType, genericType) : null;
 			}
 		}
+	}
 
 
-		/// <summary>
-		/// Represents the newline character "\n".
-		/// </summary>
-		public const string N = "\n";
-
-		/// <summary>
-		/// Represents the carriage return character "\r".
-		/// </summary>
-		public const string R = "\r";
-
-		/// <summary>
-		/// Represents the carriage return and newline characters "\r\n".
-		/// </summary>
-		public const string RN = "\r\n";
-
-		/// <summary>
-		/// Splits the string by line separators (RN, R, or N).
-		/// </summary>
-		/// <param name="str">The string to split.</param>
-		/// <param name="removeEmptyEntries">If true, removes empty entries from the result.</param>
-		/// <returns>An array of substrings.</returns>
-		public static string[] SplitByLineSeps(this string str, bool removeEmptyEntries = true)
-			// https://stackoverflow.com/a/1547483/8029915
-			=> str.Split(
-				new[] { RN, R, N },
-				removeEmptyEntries ? StringSplitOptions.RemoveEmptyEntries : StringSplitOptions.None
-			);
-
-		/// <summary>
-		/// Splits the string using the carriage return as the separator.
-		/// </summary>
-		/// <param name="str">The string to split.</param>
-		/// <param name="removeEmptyEntries">If true, removes empty entries.</param>
-		/// <returns>An array of substrings.</returns>
-		public static string[] SplitByR(this string str, bool removeEmptyEntries = true)
-			=> str.SplitBySep(R, removeEmptyEntries);
-
-		/// <summary>
-		/// Splits the string using the carriage return and newline as the separator.
-		/// </summary>
-		/// <param name="str">The string to split.</param>
-		/// <param name="removeEmptyEntries">If true, removes empty entries.</param>
-		/// <returns>An array of substrings.</returns>
-		public static string[] SplitByRN(this string str, bool removeEmptyEntries = true)
-			=> str.SplitBySep(RN, removeEmptyEntries);
-
-		/// <summary>
-		/// Splits the string using the newline character as the separator.
-		/// </summary>
-		/// <param name="str">The string to split.</param>
-		/// <param name="removeEmptyEntries">If true, removes empty entries.</param>
-		/// <returns>An array of substrings.</returns>
-		public static string[] SplitByN(this string str, bool removeEmptyEntries = true)
-			=> str.SplitBySep(N, removeEmptyEntries);
-
-		/// <summary>
-		/// Splits the string by Environment.NewLine.
-		/// </summary>
-		/// <param name="str">The string to split.</param>
-		/// <param name="removeEmptyEntries">If true, removes empty entries.</param>
-		/// <returns>An array of substrings.</returns>
-		[Obsolete("Use SplitByRN or SplitByN methods.")]
-		public static string[] SplitLines(this string str, bool removeEmptyEntries = true)
-		{
-			return str.SplitBySep(Environment.NewLine, removeEmptyEntries);
-		}
+	/// <summary>
+	/// Represents the newline character "\n".
+	/// </summary>
+	public const string N = "\n";
 
-		/// <summary>
-		/// Splits the string by the specified separator.
-		/// </summary>
-		/// <param name="str">The string to split.</param>
-		/// <param name="separator">The separator string.</param>
-		/// <param name="removeEmptyEntries">If true, removes empty entries.</param>
-		/// <returns>An array of substrings.</returns>
-		[Obsolete("Use SplitBySep method.")]
-		public static string[] Split(this string str, string separator, bool removeEmptyEntries = true)
-		{
-			return str.SplitBySep(separator, removeEmptyEntries);
-		}
+	/// <summary>
+	/// Represents the carriage return character "\r".
+	/// </summary>
+	public const string R = "\r";
 
-		/// <summary>
-		/// Splits the string by the specified separator.
-		/// </summary>
-		/// <param name="str">The string to split.</param>
-		/// <param name="separator">The separator string.</param>
-		/// <param name="removeEmptyEntries">If true, removes empty entries.</param>
-		/// <returns>An array of substrings.</returns>
-		public static string[] SplitBySep(this string str, string separator, bool removeEmptyEntries = true)
-		{
-			if (str is null)
-				throw new ArgumentNullException(nameof(str));
+	/// <summary>
+	/// Represents the carriage return and newline characters "\r\n".
+	/// </summary>
+	public const string RN = "\r\n";
 
-			if (str.Length == 0)
-				return [];
+	/// <summary>
+	/// Splits the string by line separators (RN, R, or N).
+	/// </summary>
+	/// <param name="str">The string to split.</param>
+	/// <param name="removeEmptyEntries">If true, removes empty entries from the result.</param>
+	/// <returns>An array of substrings.</returns>
+	public static string[] SplitByLineSeps(this string str, bool removeEmptyEntries = true)
+		// https://stackoverflow.com/a/1547483/8029915
+		=> str.Split(
+			new[] { RN, R, N },
+			removeEmptyEntries ? StringSplitOptions.RemoveEmptyEntries : StringSplitOptions.None
+		);
 
-			return str.Split(new[] { separator }, removeEmptyEntries ? StringSplitOptions.RemoveEmptyEntries : StringSplitOptions.None);
-		}
+	/// <summary>
+	/// Splits the string using the carriage return as the separator.
+	/// </summary>
+	/// <param name="str">The string to split.</param>
+	/// <param name="removeEmptyEntries">If true, removes empty entries.</param>
+	/// <returns>An array of substrings.</returns>
+	public static string[] SplitByR(this string str, bool removeEmptyEntries = true)
+		=> str.SplitBySep(R, removeEmptyEntries);
 
-		/// <summary>
-		/// Splits the string using a comma as the separator.
-		/// </summary>
-		/// <param name="str">The string to split.</param>
-		/// <param name="removeEmptyEntries">If true, removes empty entries.</param>
-		/// <returns>An array of substrings.</returns>
-		public static string[] SplitByComma(this string str, bool removeEmptyEntries = false)
-			=> str.SplitBySep(",", removeEmptyEntries);
-
-		/// <summary>
-		/// Splits the string using a dot as the separator.
-		/// </summary>
-		/// <param name="str">The string to split.</param>
-		/// <param name="removeEmptyEntries">If true, removes empty entries.</param>
-		/// <returns>An array of substrings.</returns>
-		public static string[] SplitByDot(this string str, bool removeEmptyEntries = false)
-			=> str.SplitBySep(".", removeEmptyEntries);
-
-		/// <summary>
-		/// Splits the string using a semicolon as the separator.
-		/// </summary>
-		/// <param name="str">The string to split.</param>
-		/// <param name="removeEmptyEntries">If true, removes empty entries.</param>
-		/// <returns>An array of substrings.</returns>
-		public static string[] SplitByDotComma(this string str, bool removeEmptyEntries = false)
-			=> str.SplitBySep(";", removeEmptyEntries);
-
-		/// <summary>
-		/// Splits the string using a colon as the separator.
-		/// </summary>
-		/// <param name="str">The string to split.</param>
-		/// <param name="removeEmptyEntries">If true, removes empty entries.</param>
-		/// <returns>An array of substrings.</returns>
-		public static string[] SplitByColon(this string str, bool removeEmptyEntries = true)
-			=> str.SplitBySep(":", removeEmptyEntries);
-
-		/// <summary>
-		/// Splits the string using a space as the separator.
-		/// </summary>
-		/// <param name="str">The string to split.</param>
-		/// <param name="removeEmptyEntries">If true, removes empty entries.</param>
-		/// <returns>An array of substrings.</returns>
-		public static string[] SplitBySpace(this string str, bool removeEmptyEntries = true)
-			=> str.SplitBySep(" ", removeEmptyEntries);
-
-		/// <summary>
-		/// Splits the string using the equal sign as the separator.
-		/// </summary>
-		/// <param name="str">The string to split.</param>
-		/// <param name="removeEmptyEntries">If true, removes empty entries.</param>
-		/// <returns>An array of substrings.</returns>
-		public static string[] SplitByEqual(this string str, bool removeEmptyEntries = true)
-			=> str.SplitBySep("=", removeEmptyEntries);
-
-		/// <summary>
-		/// Splits the string using a tab character as the separator.
-		/// </summary>
-		/// <param name="str">The string to split.</param>
-		/// <param name="removeEmptyEntries">If true, removes empty entries.</param>
-		/// <returns>An array of substrings.</returns>
-		public static string[] SplitByTab(this string str, bool removeEmptyEntries = true)
-			=> str.SplitBySep("\t", removeEmptyEntries);
-
-		/// <summary>
-		/// Splits the string using the "@" symbol as the separator.
-		/// </summary>
-		/// <param name="str">The string to split.</param>
-		/// <param name="removeEmptyEntries">If true, removes empty entries.</param>
-		/// <returns>An array of substrings.</returns>
-		public static string[] SplitByAt(this string str, bool removeEmptyEntries = true)
-			=> str.SplitBySep("@", removeEmptyEntries);
-
-		/// <summary>
-		/// Splits the string using newline as the separator.
-		/// </summary>
-		/// <param name="str">The string to split.</param>
-		/// <param name="removeEmptyEntries">If true, removes empty entries.</param>
-		/// <returns>An array of substrings.</returns>
-		[Obsolete("Use SplitByN methods.")]
-		public static string[] SplitByLine(this string str, bool removeEmptyEntries = false)
-			=> str.SplitByN(removeEmptyEntries);
-
-		/// <summary>
-		/// Finds the last index of a specified character in a StringBuilder.
-		/// </summary>
-		/// <param name="builder">The StringBuilder to search.</param>
-		/// <param name="value">The character to locate.</param>
-		/// <returns>The zero-based index position of the character if found; otherwise, -1.</returns>
-		public static int LastIndexOf(this StringBuilder builder, char value)
-		{
-			if (builder is null)
-				throw new ArgumentNullException(nameof(builder));
+	/// <summary>
+	/// Splits the string using the carriage return and newline as the separator.
+	/// </summary>
+	/// <param name="str">The string to split.</param>
+	/// <param name="removeEmptyEntries">If true, removes empty entries.</param>
+	/// <returns>An array of substrings.</returns>
+	public static string[] SplitByRN(this string str, bool removeEmptyEntries = true)
+		=> str.SplitBySep(RN, removeEmptyEntries);
 
-			for (var i = builder.Length - 1; i > 0; i--)
-			{
-				if (builder[i] == value)
-					return i;
-			}
+	/// <summary>
+	/// Splits the string using the newline character as the separator.
+	/// </summary>
+	/// <param name="str">The string to split.</param>
+	/// <param name="removeEmptyEntries">If true, removes empty entries.</param>
+	/// <returns>An array of substrings.</returns>
+	public static string[] SplitByN(this string str, bool removeEmptyEntries = true)
+		=> str.SplitBySep(N, removeEmptyEntries);
 
-			return -1;
-		}
+	/// <summary>
+	/// Splits the string by Environment.NewLine.
+	/// </summary>
+	/// <param name="str">The string to split.</param>
+	/// <param name="removeEmptyEntries">If true, removes empty entries.</param>
+	/// <returns>An array of substrings.</returns>
+	[Obsolete("Use SplitByRN or SplitByN methods.")]
+	public static string[] SplitLines(this string str, bool removeEmptyEntries = true)
+	{
+		return str.SplitBySep(Environment.NewLine, removeEmptyEntries);
+	}
 
-		/// <summary>
-		/// Determines whether the specified string is a valid email address.
-		/// </summary>
-		/// <param name="email">The email address to test.</param>
-		/// <returns>True if the email address is valid; otherwise, false.</returns>
-		public static bool IsValidEmailAddress(this string email)
-		{
-			return new Regex(@"^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$").IsMatch(email);
-		}
+	/// <summary>
+	/// Splits the string by the specified separator.
+	/// </summary>
+	/// <param name="str">The string to split.</param>
+	/// <param name="separator">The separator string.</param>
+	/// <param name="removeEmptyEntries">If true, removes empty entries.</param>
+	/// <returns>An array of substrings.</returns>
+	[Obsolete("Use SplitBySep method.")]
+	public static string[] Split(this string str, string separator, bool removeEmptyEntries = true)
+	{
+		return str.SplitBySep(separator, removeEmptyEntries);
+	}
 
-		/// <summary>
-		/// Determines whether the specified string is a valid URL.
-		/// </summary>
-		/// <param name="url">The URL to test.</param>
-		/// <returns>True if the URL is valid; otherwise, false.</returns>
-		public static bool IsValidUrl(this string url)
-		{
-			const string strRegex = "^(https?://)"
-									+ "?(([0-9a-z_!~*'().&=+$%-]+: )?[0-9a-z_!~*'().&=+$%-]+@)?" //user@
-									+ @"(([0-9]{1,3}\.){3}[0-9]{1,3}" // IP- 199.194.52.184
-									+ "|" // allows either IP or domain
-									+ @"([0-9a-z_!~*'()-]+\.)*" // tertiary domain(s)- www.
-									+ @"([0-9a-z][0-9a-z-]{0,61})?[0-9a-z]" // second level domain
-									+ @"(\.[a-z]{2,6})?)" // first level domain- .com or .museum is optional
-									+ "(:[0-9]{1,5})?" // port number- :80
-									+ "((/?)|" // a slash isn't required if there is no file name
-									+ "(/[0-9a-z_!~*'().;?:@&=+$,%#-]+)+/?)$";
-			return new Regex(strRegex).IsMatch(url);
-		}
+	/// <summary>
+	/// Splits the string by the specified separator.
+	/// </summary>
+	/// <param name="str">The string to split.</param>
+	/// <param name="separator">The separator string.</param>
+	/// <param name="removeEmptyEntries">If true, removes empty entries.</param>
+	/// <returns>An array of substrings.</returns>
+	public static string[] SplitBySep(this string str, string separator, bool removeEmptyEntries = true)
+	{
+		if (str is null)
+			throw new ArgumentNullException(nameof(str));
 
-		/// <summary>
-		/// Reverses the specified string.
-		/// </summary>
-		/// <param name="input">The string to reverse.</param>
-		/// <returns>The reversed string.</returns>
-		public static string Reverse(this string input)
-		{
-			var chars = input.ToCharArray();
-			Array.Reverse(chars);
-			return new string(chars);
-		}
+		if (str.Length == 0)
+			return [];
 
-		/// <summary>
-		/// Reduces the string to a specified length and appends the specified ending.
-		/// </summary>
-		/// <param name="s">The string to reduce.</param>
-		/// <param name="count">The total length of the returned string including the ending.</param>
-		/// <param name="endings">The ending to append.</param>
-		/// <returns>A reduced version of the string.</returns>
-		public static string Reduce(this string s, int count, string endings)
-		{
-			if (endings.IsEmpty())
-				throw new ArgumentNullException(nameof(endings));
+		return str.Split(new[] { separator }, removeEmptyEntries ? StringSplitOptions.RemoveEmptyEntries : StringSplitOptions.None);
+	}
 
-			if (count < endings.Length || count >= endings.Length)
-				throw new ArgumentOutOfRangeException(nameof(count));
+	/// <summary>
+	/// Splits the string using a comma as the separator.
+	/// </summary>
+	/// <param name="str">The string to split.</param>
+	/// <param name="removeEmptyEntries">If true, removes empty entries.</param>
+	/// <returns>An array of substrings.</returns>
+	public static string[] SplitByComma(this string str, bool removeEmptyEntries = false)
+		=> str.SplitBySep(",", removeEmptyEntries);
 
-			return s.Substring(0, count - endings.Length) + endings;
-		}
+	/// <summary>
+	/// Splits the string using a dot as the separator.
+	/// </summary>
+	/// <param name="str">The string to split.</param>
+	/// <param name="removeEmptyEntries">If true, removes empty entries.</param>
+	/// <returns>An array of substrings.</returns>
+	public static string[] SplitByDot(this string str, bool removeEmptyEntries = false)
+		=> str.SplitBySep(".", removeEmptyEntries);
 
-		/// <summary>
-		/// Replaces all white space characters in the string with a single space.
-		/// </summary>
-		/// <param name="s">The string in which to replace white spaces.</param>
-		/// <returns>The modified string.</returns>
-		public static string ReplaceWhiteSpaces(this string s)
-		{
-			return s.ReplaceWhiteSpaces(' ');
-		}
+	/// <summary>
+	/// Splits the string using a semicolon as the separator.
+	/// </summary>
+	/// <param name="str">The string to split.</param>
+	/// <param name="removeEmptyEntries">If true, removes empty entries.</param>
+	/// <returns>An array of substrings.</returns>
+	public static string[] SplitByDotComma(this string str, bool removeEmptyEntries = false)
+		=> str.SplitBySep(";", removeEmptyEntries);
 
-		/// <summary>
-		/// Replaces all white space characters in the string with the specified character.
-		/// </summary>
-		/// <param name="s">The string in which to replace white spaces.</param>
-		/// <param name="c">The character to replace white spaces with.</param>
-		/// <returns>The modified string.</returns>
-		public static string ReplaceWhiteSpaces(this string s, char c)
-		{
-			if (s is null)
-				return null;
+	/// <summary>
+	/// Splits the string using a colon as the separator.
+	/// </summary>
+	/// <param name="str">The string to split.</param>
+	/// <param name="removeEmptyEntries">If true, removes empty entries.</param>
+	/// <returns>An array of substrings.</returns>
+	public static string[] SplitByColon(this string str, bool removeEmptyEntries = true)
+		=> str.SplitBySep(":", removeEmptyEntries);
 
-			var sb = new StringBuilder(s);
+	/// <summary>
+	/// Splits the string using a space as the separator.
+	/// </summary>
+	/// <param name="str">The string to split.</param>
+	/// <param name="removeEmptyEntries">If true, removes empty entries.</param>
+	/// <returns>An array of substrings.</returns>
+	public static string[] SplitBySpace(this string str, bool removeEmptyEntries = true)
+		=> str.SplitBySep(" ", removeEmptyEntries);
 
-			for (var i = 0; i < sb.Length; i++)
-			{
-				if (char.IsWhiteSpace(sb[i]))
-					sb[i] = c;
-			}
+	/// <summary>
+	/// Splits the string using the equal sign as the separator.
+	/// </summary>
+	/// <param name="str">The string to split.</param>
+	/// <param name="removeEmptyEntries">If true, removes empty entries.</param>
+	/// <returns>An array of substrings.</returns>
+	public static string[] SplitByEqual(this string str, bool removeEmptyEntries = true)
+		=> str.SplitBySep("=", removeEmptyEntries);
 
-			return sb.ToString();
-		}
+	/// <summary>
+	/// Splits the string using a tab character as the separator.
+	/// </summary>
+	/// <param name="str">The string to split.</param>
+	/// <param name="removeEmptyEntries">If true, removes empty entries.</param>
+	/// <returns>An array of substrings.</returns>
+	public static string[] SplitByTab(this string str, bool removeEmptyEntries = true)
+		=> str.SplitBySep("\t", removeEmptyEntries);
 
-		/// <summary>
-		/// Removes all spaces from the string.
-		/// </summary>
-		/// <param name="s">The string from which to remove spaces.</param>
-		/// <returns>The string without spaces.</returns>
-		public static string RemoveSpaces(this string s)
-		{
-			return s.Remove(" ");
-		}
+	/// <summary>
+	/// Splits the string using the "@" symbol as the separator.
+	/// </summary>
+	/// <param name="str">The string to split.</param>
+	/// <param name="removeEmptyEntries">If true, removes empty entries.</param>
+	/// <returns>An array of substrings.</returns>
+	public static string[] SplitByAt(this string str, bool removeEmptyEntries = true)
+		=> str.SplitBySep("@", removeEmptyEntries);
 
-		/// <summary>
-		/// Removes all occurrences of the specified substring from the string.
-		/// </summary>
-		/// <param name="s">The string from which to remove.</param>
-		/// <param name="what">The substring to remove.</param>
-		/// <param name="ignoreCase">If true, performs a case-insensitive removal.</param>
-		/// <returns>The modified string.</returns>
-		public static string Remove(this string s, string what, bool ignoreCase = false)
-		{
-			if (ignoreCase)
-				return s.ReplaceIgnoreCase(what, string.Empty);
-			else
-				return s.Replace(what, string.Empty);
-		}
+	/// <summary>
+	/// Splits the string using newline as the separator.
+	/// </summary>
+	/// <param name="str">The string to split.</param>
+	/// <param name="removeEmptyEntries">If true, removes empty entries.</param>
+	/// <returns>An array of substrings.</returns>
+	[Obsolete("Use SplitByN methods.")]
+	public static string[] SplitByLine(this string str, bool removeEmptyEntries = false)
+		=> str.SplitByN(removeEmptyEntries);
 
-		/// <summary>
-		/// Determines whether the string represents a number.
-		/// </summary>
-		/// <param name="s">The string to test.</param>
-		/// <param name="floatPoint">If true, considers floating point numbers; otherwise, integers.</param>
-		/// <returns>True if the string can be parsed as a number; otherwise, false.</returns>
-		public static bool IsNumber(this string s, bool floatPoint)
-		{
-			var withoutWhiteSpace = s.RemoveSpaces();
+	/// <summary>
+	/// Finds the last index of a specified character in a StringBuilder.
+	/// </summary>
+	/// <param name="builder">The StringBuilder to search.</param>
+	/// <param name="value">The character to locate.</param>
+	/// <returns>The zero-based index position of the character if found; otherwise, -1.</returns>
+	public static int LastIndexOf(this StringBuilder builder, char value)
+	{
+		if (builder is null)
+			throw new ArgumentNullException(nameof(builder));
 
-			if (floatPoint)
-			{
-				return double.TryParse(withoutWhiteSpace, NumberStyles.Any, CultureInfo.InvariantCulture, out _);
-			}
-			else
-			{
-				return int.TryParse(withoutWhiteSpace, out _);
-			}
+		for (var i = builder.Length - 1; i > 0; i--)
+		{
+			if (builder[i] == value)
+				return i;
 		}
 
-		/// <summary>
-		/// Determines whether the string contains only numeric characters (and optionally a decimal separator).
-		/// </summary>
-		/// <param name="s">The string to test.</param>
-		/// <param name="floatPoint">If true, allows decimal points or commas.</param>
-		/// <returns>True if the string contains only numbers; otherwise, false.</returns>
-		public static bool IsNumberOnly(this string s, bool floatPoint)
-		{
-			s = s.RemoveSpaces();
+		return -1;
+	}
 
-			if (s.Length == 0)
-				return false;
+	/// <summary>
+	/// Determines whether the specified string is a valid email address.
+	/// </summary>
+	/// <param name="email">The email address to test.</param>
+	/// <returns>True if the email address is valid; otherwise, false.</returns>
+	public static bool IsValidEmailAddress(this string email)
+	{
+		return new Regex(@"^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$").IsMatch(email);
+	}
 
-			foreach (var c in s)
-			{
-				if (c.IsDigit())
-					continue;
+	/// <summary>
+	/// Determines whether the specified string is a valid URL.
+	/// </summary>
+	/// <param name="url">The URL to test.</param>
+	/// <returns>True if the URL is valid; otherwise, false.</returns>
+	public static bool IsValidUrl(this string url)
+	{
+		const string strRegex = "^(https?://)"
+								+ "?(([0-9a-z_!~*'().&=+$%-]+: )?[0-9a-z_!~*'().&=+$%-]+@)?" //user@
+								+ @"(([0-9]{1,3}\.){3}[0-9]{1,3}" // IP- 199.194.52.184
+								+ "|" // allows either IP or domain
+								+ @"([0-9a-z_!~*'()-]+\.)*" // tertiary domain(s)- www.
+								+ @"([0-9a-z][0-9a-z-]{0,61})?[0-9a-z]" // second level domain
+								+ @"(\.[a-z]{2,6})?)" // first level domain- .com or .museum is optional
+								+ "(:[0-9]{1,5})?" // port number- :80
+								+ "((/?)|" // a slash isn't required if there is no file name
+								+ "(/[0-9a-z_!~*'().;?:@&=+$,%#-]+)+/?)$";
+		return new Regex(strRegex).IsMatch(url);
+	}
 
-				if (floatPoint && (c == '.' || c == ','))
-					continue;
+	/// <summary>
+	/// Reverses the specified string.
+	/// </summary>
+	/// <param name="input">The string to reverse.</param>
+	/// <returns>The reversed string.</returns>
+	public static string Reverse(this string input)
+	{
+		var chars = input.ToCharArray();
+		Array.Reverse(chars);
+		return new string(chars);
+	}
 
-				return false;
-			}
+	/// <summary>
+	/// Reduces the string to a specified length and appends the specified ending.
+	/// </summary>
+	/// <param name="s">The string to reduce.</param>
+	/// <param name="count">The total length of the returned string including the ending.</param>
+	/// <param name="endings">The ending to append.</param>
+	/// <returns>A reduced version of the string.</returns>
+	public static string Reduce(this string s, int count, string endings)
+	{
+		if (endings.IsEmpty())
+			throw new ArgumentNullException(nameof(endings));
 
-			return true;
-		}
+		if (count < endings.Length || count >= endings.Length)
+			throw new ArgumentOutOfRangeException(nameof(count));
 
-		/// <summary>
-		/// Determines whether the specified character is a digit.
-		/// </summary>
-		/// <param name="c">The character to test.</param>
-		/// <returns>True if the character is a digit; otherwise, false.</returns>
-		public static bool IsDigit(this char c)
-			=> char.IsDigit(c);
-
-		/// <summary>
-		/// Removes diacritical marks from the string.
-		/// </summary>
-		/// <param name="s">The string from which to remove diacritics.</param>
-		/// <returns>The modified string without accents.</returns>
-		public static string RemoveDiacritics(this string s)
-		{
-			var stFormD = s.Normalize(NormalizationForm.FormD);
-			var sb = new StringBuilder();
+		return s.Substring(0, count - endings.Length) + endings;
+	}
 
-			foreach (var t in from t in stFormD let uc = CharUnicodeInfo.GetUnicodeCategory(t) where uc != UnicodeCategory.NonSpacingMark select t)
-			{
-				sb.Append(t);
-			}
+	/// <summary>
+	/// Replaces all white space characters in the string with a single space.
+	/// </summary>
+	/// <param name="s">The string in which to replace white spaces.</param>
+	/// <returns>The modified string.</returns>
+	public static string ReplaceWhiteSpaces(this string s)
+	{
+		return s.ReplaceWhiteSpaces(' ');
+	}
 
-			return sb.ToString().Normalize(NormalizationForm.FormC);
-		}
+	/// <summary>
+	/// Replaces all white space characters in the string with the specified character.
+	/// </summary>
+	/// <param name="s">The string in which to replace white spaces.</param>
+	/// <param name="c">The character to replace white spaces with.</param>
+	/// <returns>The modified string.</returns>
+	public static string ReplaceWhiteSpaces(this string s, char c)
+	{
+		if (s is null)
+			return null;
 
-		/// <summary>
-		/// Replaces newline characters in the string with HTML line breaks.
-		/// </summary>
-		/// <param name="s">The string to modify.</param>
-		/// <returns>The modified string with HTML &lt;br /&gt; tags in place of newlines.</returns>
-		public static string Nl2Br(this string s)
+		var sb = new StringBuilder(s);
+
+		for (var i = 0; i < sb.Length; i++)
 		{
-			return s.Replace(RN, "<br />").Replace(N, "<br />");
+			if (char.IsWhiteSpace(sb[i]))
+				sb[i] = c;
 		}
 
-		/// <summary>
-		/// Trims the string to the specified maximum length and appends "..." if it exceeds that length.
-		/// </summary>
-		/// <param name="value">The string to trim.</param>
-		/// <param name="maxLength">The maximum length of the returned string.</param>
-		/// <returns>A trimmed version of the string.</returns>
-		public static string Trim(this string value, int maxLength)
+		return sb.ToString();
+	}
+
+	/// <summary>
+	/// Removes all spaces from the string.
+	/// </summary>
+	/// <param name="s">The string from which to remove spaces.</param>
+	/// <returns>The string without spaces.</returns>
+	public static string RemoveSpaces(this string s)
+	{
+		return s.Remove(" ");
+	}
+
+	/// <summary>
+	/// Removes all occurrences of the specified substring from the string.
+	/// </summary>
+	/// <param name="s">The string from which to remove.</param>
+	/// <param name="what">The substring to remove.</param>
+	/// <param name="ignoreCase">If true, performs a case-insensitive removal.</param>
+	/// <returns>The modified string.</returns>
+	public static string Remove(this string s, string what, bool ignoreCase = false)
+	{
+		if (ignoreCase)
+			return s.ReplaceIgnoreCase(what, string.Empty);
+		else
+			return s.Replace(what, string.Empty);
+	}
+
+	/// <summary>
+	/// Determines whether the string represents a number.
+	/// </summary>
+	/// <param name="s">The string to test.</param>
+	/// <param name="floatPoint">If true, considers floating point numbers; otherwise, integers.</param>
+	/// <returns>True if the string can be parsed as a number; otherwise, false.</returns>
+	public static bool IsNumber(this string s, bool floatPoint)
+	{
+		var withoutWhiteSpace = s.RemoveSpaces();
+
+		if (floatPoint)
 		{
-			if (value != null && value.Length > maxLength)
-				return value.Substring(0, maxLength) + "...";
-			else
-				return value;
+			return double.TryParse(withoutWhiteSpace, NumberStyles.Any, CultureInfo.InvariantCulture, out _);
 		}
-
-		/// <summary>
-		/// Joins the collection of strings using "@" as the separator.
-		/// </summary>
-		/// <param name="parts">The collection of strings to join.</param>
-		/// <returns>A string resulting from the join.</returns>
-		public static string JoinAt(this IEnumerable<string> parts)
-			=> parts.Join("@");
-
-		/// <summary>
-		/// Joins the collection of strings using a tab character as the separator.
-		/// </summary>
-		/// <param name="parts">The collection of strings to join.</param>
-		/// <returns>A string resulting from the join.</returns>
-		public static string JoinTab(this IEnumerable<string> parts)
-			=> parts.Join("\t");
-
-		/// <summary>
-		/// Joins the collection of strings using a comma as the separator.
-		/// </summary>
-		/// <param name="parts">The collection of strings to join.</param>
-		/// <returns>A string resulting from the join.</returns>
-		public static string JoinComma(this IEnumerable<string> parts)
-			=> parts.Join(",");
-
-		/// <summary>
-		/// Joins the collection of strings using a semicolon as the separator.
-		/// </summary>
-		/// <param name="parts">The collection of strings to join.</param>
-		/// <returns>A string resulting from the join.</returns>
-		public static string JoinDotComma(this IEnumerable<string> parts)
-			=> parts.Join(";");
-
-		/// <summary>
-		/// Joins the collection of strings using a dot as the separator.
-		/// </summary>
-		/// <param name="parts">The collection of strings to join.</param>
-		/// <returns>A string resulting from the join.</returns>
-		public static string JoinDot(this IEnumerable<string> parts)
-			=> parts.Join(".");
-
-		/// <summary>
-		/// Joins the collection of strings using a comma and a space as the separator.
-		/// </summary>
-		/// <param name="parts">The collection of strings to join.</param>
-		/// <returns>A string resulting from the join.</returns>
-		public static string JoinCommaSpace(this IEnumerable<string> parts)
-			=> parts.Join(", ");
-
-		/// <summary>
-		/// Joins the collection of strings using a space as the separator.
-		/// </summary>
-		/// <param name="parts">The collection of strings to join.</param>
-		/// <returns>A string resulting from the join.</returns>
-		public static string JoinSpace(this IEnumerable<string> parts)
-			=> parts.Join(" ");
-
-		/// <summary>
-		/// Joins the collection of strings using the pipe character as the separator.
-		/// </summary>
-		/// <param name="parts">The collection of strings to join.</param>
-		/// <returns>A string resulting from the join.</returns>
-		public static string JoinPipe(this IEnumerable<string> parts)
-			=> parts.Join("|");
-
-		/// <summary>
-		/// Joins the collection of strings using a colon as the separator.
-		/// </summary>
-		/// <param name="parts">The collection of strings to join.</param>
-		/// <returns>A string resulting from the join.</returns>
-		public static string JoinColon(this IEnumerable<string> parts)
-			=> parts.Join(":");
-
-		/// <summary>
-		/// Joins the collection of strings using an equal sign as the separator.
-		/// </summary>
-		/// <param name="parts">The collection of strings to join.</param>
-		/// <returns>A string resulting from the join.</returns>
-		public static string JoinEqual(this IEnumerable<string> parts)
-			=> parts.Join("=");
-
-		/// <summary>
-		/// Joins the collection of strings using the ampersand as the separator.
-		/// </summary>
-		/// <param name="parts">The collection of strings to join.</param>
-		/// <returns>A string resulting from the join.</returns>
-		public static string JoinAnd(this IEnumerable<string> parts)
-			=> parts.Join("&");
-
-		/// <summary>
-		/// Joins the collection of strings using the newline character as the separator.
-		/// </summary>
-		/// <param name="parts">The collection of strings to join.</param>
-		/// <returns>A string resulting from the join.</returns>
-		public static string JoinN(this IEnumerable<string> parts)
-			=> parts.Join(N);
-
-		/// <summary>
-		/// Joins the collection of strings using the carriage return and newline as the separator.
-		/// </summary>
-		/// <param name="parts">The collection of strings to join.</param>
-		/// <returns>A string resulting from the join.</returns>
-		public static string JoinRN(this IEnumerable<string> parts)
-			=> parts.Join(RN);
-
-		/// <summary>
-		/// Joins the collection of strings using the system's newline as the separator.
-		/// </summary>
-		/// <param name="parts">The collection of strings to join.</param>
-		/// <returns>A string resulting from the join.</returns>
-		public static string JoinNL(this IEnumerable<string> parts)
-			=> parts.Join(Environment.NewLine);
-
-		/// <summary>
-		/// Joins the collection of strings using the specified separator.
-		/// </summary>
-		/// <param name="parts">The collection of strings to join.</param>
-		/// <param name="separator">The separator string.</param>
-		/// <returns>A string resulting from the join.</returns>
-		public static string Join(this IEnumerable<string> parts, string separator)
+		else
 		{
-			return string.Join(separator, [.. parts]);
+			return int.TryParse(withoutWhiteSpace, out _);
 		}
+	}
+
+	/// <summary>
+	/// Determines whether the string contains only numeric characters (and optionally a decimal separator).
+	/// </summary>
+	/// <param name="s">The string to test.</param>
+	/// <param name="floatPoint">If true, allows decimal points or commas.</param>
+	/// <returns>True if the string contains only numbers; otherwise, false.</returns>
+	public static bool IsNumberOnly(this string s, bool floatPoint)
+	{
+		s = s.RemoveSpaces();
+
+		if (s.Length == 0)
+			return false;
 
-		/// <summary>
-		/// Determines whether two strings are equal, ignoring case.
-		/// </summary>
-		/// <param name="str1">The first string to compare.</param>
-		/// <param name="str2">The second string to compare.</param>
-		/// <returns>True if the strings are equal ignoring case; otherwise, false.</returns>
-		public static bool EqualsIgnoreCase(this string str1, string str2)
+		foreach (var c in s)
 		{
-			return string.Equals(str1, str2, StringComparison.InvariantCultureIgnoreCase);
+			if (c.IsDigit())
+				continue;
+
+			if (floatPoint && (c == '.' || c == ','))
+				continue;
+
+			return false;
 		}
 
-		/// <summary>
-		/// Compares two strings for equality, ignoring case.
-		/// </summary>
-		/// <param name="str1">The first string to compare.</param>
-		/// <param name="str2">The second string to compare.</param>
-		/// <returns>True if the strings are equal ignoring case; otherwise, false.</returns>
-		[Obsolete("Use EqualsIgnoreCase.")]
-		public static bool CompareIgnoreCase(this string str1, string str2)
+		return true;
+	}
+
+	/// <summary>
+	/// Determines whether the specified character is a digit.
+	/// </summary>
+	/// <param name="c">The character to test.</param>
+	/// <returns>True if the character is a digit; otherwise, false.</returns>
+	public static bool IsDigit(this char c)
+		=> char.IsDigit(c);
+
+	/// <summary>
+	/// Removes diacritical marks from the string.
+	/// </summary>
+	/// <param name="s">The string from which to remove diacritics.</param>
+	/// <returns>The modified string without accents.</returns>
+	public static string RemoveDiacritics(this string s)
+	{
+		var stFormD = s.Normalize(NormalizationForm.FormD);
+		var sb = new StringBuilder();
+
+		foreach (var t in from t in stFormD let uc = CharUnicodeInfo.GetUnicodeCategory(t) where uc != UnicodeCategory.NonSpacingMark select t)
 		{
-			return string.Compare(str1, str2, StringComparison.InvariantCultureIgnoreCase) == 0;
+			sb.Append(t);
 		}
 
-		/// <summary>
-		/// Determines whether the first string contains the second string, ignoring case.
-		/// </summary>
-		/// <param name="str1">The string to search.</param>
-		/// <param name="str2">The string to locate.</param>
-		/// <returns>True if str1 contains str2 when ignoring case; otherwise, false.</returns>
-		public static bool ContainsIgnoreCase(this string str1, string str2)
+		return sb.ToString().Normalize(NormalizationForm.FormC);
+	}
+
+	/// <summary>
+	/// Replaces newline characters in the string with HTML line breaks.
+	/// </summary>
+	/// <param name="s">The string to modify.</param>
+	/// <returns>The modified string with HTML &lt;br /&gt; tags in place of newlines.</returns>
+	public static string Nl2Br(this string s)
+	{
+		return s.Replace(RN, "<br />").Replace(N, "<br />");
+	}
+
+	/// <summary>
+	/// Trims the string to the specified maximum length and appends "..." if it exceeds that length.
+	/// </summary>
+	/// <param name="value">The string to trim.</param>
+	/// <param name="maxLength">The maximum length of the returned string.</param>
+	/// <returns>A trimmed version of the string.</returns>
+	public static string Trim(this string value, int maxLength)
+	{
+		if (value != null && value.Length > maxLength)
+			return value.Substring(0, maxLength) + "...";
+		else
+			return value;
+	}
+
+	/// <summary>
+	/// Joins the collection of strings using "@" as the separator.
+	/// </summary>
+	/// <param name="parts">The collection of strings to join.</param>
+	/// <returns>A string resulting from the join.</returns>
+	public static string JoinAt(this IEnumerable<string> parts)
+		=> parts.Join("@");
+
+	/// <summary>
+	/// Joins the collection of strings using a tab character as the separator.
+	/// </summary>
+	/// <param name="parts">The collection of strings to join.</param>
+	/// <returns>A string resulting from the join.</returns>
+	public static string JoinTab(this IEnumerable<string> parts)
+		=> parts.Join("\t");
+
+	/// <summary>
+	/// Joins the collection of strings using a comma as the separator.
+	/// </summary>
+	/// <param name="parts">The collection of strings to join.</param>
+	/// <returns>A string resulting from the join.</returns>
+	public static string JoinComma(this IEnumerable<string> parts)
+		=> parts.Join(",");
+
+	/// <summary>
+	/// Joins the collection of strings using a semicolon as the separator.
+	/// </summary>
+	/// <param name="parts">The collection of strings to join.</param>
+	/// <returns>A string resulting from the join.</returns>
+	public static string JoinDotComma(this IEnumerable<string> parts)
+		=> parts.Join(";");
+
+	/// <summary>
+	/// Joins the collection of strings using a dot as the separator.
+	/// </summary>
+	/// <param name="parts">The collection of strings to join.</param>
+	/// <returns>A string resulting from the join.</returns>
+	public static string JoinDot(this IEnumerable<string> parts)
+		=> parts.Join(".");
+
+	/// <summary>
+	/// Joins the collection of strings using a comma and a space as the separator.
+	/// </summary>
+	/// <param name="parts">The collection of strings to join.</param>
+	/// <returns>A string resulting from the join.</returns>
+	public static string JoinCommaSpace(this IEnumerable<string> parts)
+		=> parts.Join(", ");
+
+	/// <summary>
+	/// Joins the collection of strings using a space as the separator.
+	/// </summary>
+	/// <param name="parts">The collection of strings to join.</param>
+	/// <returns>A string resulting from the join.</returns>
+	public static string JoinSpace(this IEnumerable<string> parts)
+		=> parts.Join(" ");
+
+	/// <summary>
+	/// Joins the collection of strings using the pipe character as the separator.
+	/// </summary>
+	/// <param name="parts">The collection of strings to join.</param>
+	/// <returns>A string resulting from the join.</returns>
+	public static string JoinPipe(this IEnumerable<string> parts)
+		=> parts.Join("|");
+
+	/// <summary>
+	/// Joins the collection of strings using a colon as the separator.
+	/// </summary>
+	/// <param name="parts">The collection of strings to join.</param>
+	/// <returns>A string resulting from the join.</returns>
+	public static string JoinColon(this IEnumerable<string> parts)
+		=> parts.Join(":");
+
+	/// <summary>
+	/// Joins the collection of strings using an equal sign as the separator.
+	/// </summary>
+	/// <param name="parts">The collection of strings to join.</param>
+	/// <returns>A string resulting from the join.</returns>
+	public static string JoinEqual(this IEnumerable<string> parts)
+		=> parts.Join("=");
+
+	/// <summary>
+	/// Joins the collection of strings using the ampersand as the separator.
+	/// </summary>
+	/// <param name="parts">The collection of strings to join.</param>
+	/// <returns>A string resulting from the join.</returns>
+	public static string JoinAnd(this IEnumerable<string> parts)
+		=> parts.Join("&");
+
+	/// <summary>
+	/// Joins the collection of strings using the newline character as the separator.
+	/// </summary>
+	/// <param name="parts">The collection of strings to join.</param>
+	/// <returns>A string resulting from the join.</returns>
+	public static string JoinN(this IEnumerable<string> parts)
+		=> parts.Join(N);
+
+	/// <summary>
+	/// Joins the collection of strings using the carriage return and newline as the separator.
+	/// </summary>
+	/// <param name="parts">The collection of strings to join.</param>
+	/// <returns>A string resulting from the join.</returns>
+	public static string JoinRN(this IEnumerable<string> parts)
+		=> parts.Join(RN);
+
+	/// <summary>
+	/// Joins the collection of strings using the system's newline as the separator.
+	/// </summary>
+	/// <param name="parts">The collection of strings to join.</param>
+	/// <returns>A string resulting from the join.</returns>
+	public static string JoinNL(this IEnumerable<string> parts)
+		=> parts.Join(Environment.NewLine);
+
+	/// <summary>
+	/// Joins the collection of strings using the specified separator.
+	/// </summary>
+	/// <param name="parts">The collection of strings to join.</param>
+	/// <param name="separator">The separator string.</param>
+	/// <returns>A string resulting from the join.</returns>
+	public static string Join(this IEnumerable<string> parts, string separator)
+	{
+		return string.Join(separator, [.. parts]);
+	}
+
+	/// <summary>
+	/// Determines whether two strings are equal, ignoring case.
+	/// </summary>
+	/// <param name="str1">The first string to compare.</param>
+	/// <param name="str2">The second string to compare.</param>
+	/// <returns>True if the strings are equal ignoring case; otherwise, false.</returns>
+	public static bool EqualsIgnoreCase(this string str1, string str2)
+	{
+		return string.Equals(str1, str2, StringComparison.InvariantCultureIgnoreCase);
+	}
+
+	/// <summary>
+	/// Compares two strings for equality, ignoring case.
+	/// </summary>
+	/// <param name="str1">The first string to compare.</param>
+	/// <param name="str2">The second string to compare.</param>
+	/// <returns>True if the strings are equal ignoring case; otherwise, false.</returns>
+	[Obsolete("Use EqualsIgnoreCase.")]
+	public static bool CompareIgnoreCase(this string str1, string str2)
+	{
+		return string.Compare(str1, str2, StringComparison.InvariantCultureIgnoreCase) == 0;
+	}
+
+	/// <summary>
+	/// Determines whether the first string contains the second string, ignoring case.
+	/// </summary>
+	/// <param name="str1">The string to search.</param>
+	/// <param name="str2">The string to locate.</param>
+	/// <returns>True if str1 contains str2 when ignoring case; otherwise, false.</returns>
+	public static bool ContainsIgnoreCase(this string str1, string str2)
+	{
+		if (str1 is null)
 		{
-			if (str1 is null)
-			{
-				return false;
-				//throw new ArgumentNullException(nameof(str1));
-			}
+			return false;
+			//throw new ArgumentNullException(nameof(str1));
+		}
 
-			if (str2 is null)
-				return false;
+		if (str2 is null)
+			return false;
 
 #if NETSTANDARD2_0
-			return str1.IndexOf(str2, StringComparison.InvariantCultureIgnoreCase) >= 0;
+		return str1.IndexOf(str2, StringComparison.InvariantCultureIgnoreCase) >= 0;
 #else
-			return str1.Contains(str2, StringComparison.InvariantCultureIgnoreCase);
+		return str1.Contains(str2, StringComparison.InvariantCultureIgnoreCase);
 #endif
-		}
+	}
 
-		/// <summary>
-		/// Replaces occurrences of a specified substring with another string, ignoring case.
-		/// </summary>
-		/// <param name="original">The original string.</param>
-		/// <param name="oldValue">The substring to replace.</param>
-		/// <param name="newValue">The replacement string.</param>
-		/// <returns>The modified string.</returns>
-		public static string ReplaceIgnoreCase(this string original, string oldValue, string newValue)
-		{
-			if (oldValue is null)
-				throw new ArgumentNullException(nameof(oldValue));
+	/// <summary>
+	/// Replaces occurrences of a specified substring with another string, ignoring case.
+	/// </summary>
+	/// <param name="original">The original string.</param>
+	/// <param name="oldValue">The substring to replace.</param>
+	/// <param name="newValue">The replacement string.</param>
+	/// <returns>The modified string.</returns>
+	public static string ReplaceIgnoreCase(this string original, string oldValue, string newValue)
+	{
+		if (oldValue is null)
+			throw new ArgumentNullException(nameof(oldValue));
 
-			if (newValue is null)
-				throw new ArgumentNullException(nameof(newValue));
+		if (newValue is null)
+			throw new ArgumentNullException(nameof(newValue));
 
-			if (original is null)
-			{
-				return null;
-				//throw new ArgumentNullException(nameof(original));
-			}
+		if (original is null)
+		{
+			return null;
+			//throw new ArgumentNullException(nameof(original));
+		}
 
-			if (oldValue.Length == 0)
-				return original.IsEmpty() ? newValue : original;
+		if (oldValue.Length == 0)
+			return original.IsEmpty() ? newValue : original;
 
 #if NETSTANDARD2_0
-			return Regex.Replace(original, oldValue, newValue, RegexOptions.IgnoreCase);
+		return Regex.Replace(original, oldValue, newValue, RegexOptions.IgnoreCase);
 #else
-			return original.Replace(oldValue, newValue, StringComparison.InvariantCultureIgnoreCase);
+		return original.Replace(oldValue, newValue, StringComparison.InvariantCultureIgnoreCase);
 #endif
-		}
+	}
 
-		/// <summary>
-		/// Replaces occurrences of a specified substring with another string in a StringBuilder, ignoring case.
-		/// </summary>
-		/// <param name="builder">The StringBuilder to modify.</param>
-		/// <param name="oldValue">The substring to replace.</param>
-		/// <param name="newValue">The replacement string.</param>
-		/// <returns>The modified StringBuilder.</returns>
-		public static StringBuilder ReplaceIgnoreCase(this StringBuilder builder, string oldValue, string newValue)
-		{
-			if (builder is null)
-				throw new ArgumentNullException(nameof(builder));
+	/// <summary>
+	/// Replaces occurrences of a specified substring with another string in a StringBuilder, ignoring case.
+	/// </summary>
+	/// <param name="builder">The StringBuilder to modify.</param>
+	/// <param name="oldValue">The substring to replace.</param>
+	/// <param name="newValue">The replacement string.</param>
+	/// <returns>The modified StringBuilder.</returns>
+	public static StringBuilder ReplaceIgnoreCase(this StringBuilder builder, string oldValue, string newValue)
+	{
+		if (builder is null)
+			throw new ArgumentNullException(nameof(builder));
 
-			var str = builder.ToString().ReplaceIgnoreCase(oldValue, newValue);
-			return builder
-				.Clear()
-				.Append(str);
-		}
+		var str = builder.ToString().ReplaceIgnoreCase(oldValue, newValue);
+		return builder
+			.Clear()
+			.Append(str);
+	}
 
-		/// <summary>
-		/// Determines whether the string starts with the specified substring, ignoring case.
-		/// </summary>
-		/// <param name="str1">The string to test.</param>
-		/// <param name="str2">The substring to compare.</param>
-		/// <returns>True if str1 starts with str2 ignoring case; otherwise, false.</returns>
-		public static bool StartsWithIgnoreCase(this string str1, string str2)
+	/// <summary>
+	/// Determines whether the string starts with the specified substring, ignoring case.
+	/// </summary>
+	/// <param name="str1">The string to test.</param>
+	/// <param name="str2">The substring to compare.</param>
+	/// <returns>True if str1 starts with str2 ignoring case; otherwise, false.</returns>
+	public static bool StartsWithIgnoreCase(this string str1, string str2)
+	{
+		if (str1 is null)
 		{
-			if (str1 is null)
-			{
-				return false;
-				//throw new ArgumentNullException(nameof(str1));
-			}
+			return false;
+			//throw new ArgumentNullException(nameof(str1));
+		}
 
-			if (str2 is null)
-				return false;
+		if (str2 is null)
+			return false;
 
-			return str1.StartsWith(str2, StringComparison.InvariantCultureIgnoreCase);
-		}
+		return str1.StartsWith(str2, StringComparison.InvariantCultureIgnoreCase);
+	}
 
-		/// <summary>
-		/// Determines whether the string ends with the specified substring, ignoring case.
-		/// </summary>
-		/// <param name="str1">The string to test.</param>
-		/// <param name="str2">The substring to compare.</param>
-		/// <returns>True if str1 ends with str2 ignoring case; otherwise, false.</returns>
-		public static bool EndsWithIgnoreCase(this string str1, string str2)
+	/// <summary>
+	/// Determines whether the string ends with the specified substring, ignoring case.
+	/// </summary>
+	/// <param name="str1">The string to test.</param>
+	/// <param name="str2">The substring to compare.</param>
+	/// <returns>True if str1 ends with str2 ignoring case; otherwise, false.</returns>
+	public static bool EndsWithIgnoreCase(this string str1, string str2)
+	{
+		if (str1 is null)
 		{
-			if (str1 is null)
-			{
-				return false;
-				//throw new ArgumentNullException(nameof(str1));
-			}
+			return false;
+			//throw new ArgumentNullException(nameof(str1));
+		}
 
-			if (str2 is null)
-				return false;
+		if (str2 is null)
+			return false;
 
-			return str1.EndsWith(str2, StringComparison.InvariantCultureIgnoreCase);
-		}
+		return str1.EndsWith(str2, StringComparison.InvariantCultureIgnoreCase);
+	}
 
-		/// <summary>
-		/// Returns the zero-based index of the first occurrence of the specified substring, ignoring case.
-		/// </summary>
-		/// <param name="str1">The string to search.</param>
-		/// <param name="str2">The substring to locate.</param>
-		/// <param name="index">The starting index for the search. Defaults to -1 for beginning.</param>
-		/// <returns>The index of the first occurrence, or -1 if not found.</returns>
-		public static int IndexOfIgnoreCase(this string str1, string str2, int index = -1)
+	/// <summary>
+	/// Returns the zero-based index of the first occurrence of the specified substring, ignoring case.
+	/// </summary>
+	/// <param name="str1">The string to search.</param>
+	/// <param name="str2">The substring to locate.</param>
+	/// <param name="index">The starting index for the search. Defaults to -1 for beginning.</param>
+	/// <returns>The index of the first occurrence, or -1 if not found.</returns>
+	public static int IndexOfIgnoreCase(this string str1, string str2, int index = -1)
+	{
+		if (str1 is null)
 		{
-			if (str1 is null)
-			{
-				return -1;
-				//throw new ArgumentNullException(nameof(str1));
-			}
+			return -1;
+			//throw new ArgumentNullException(nameof(str1));
+		}
 
-			if (str2 is null)
-				return -1;
+		if (str2 is null)
+			return -1;
 
-			if (index == -1)
-				return str1.IndexOf(str2, StringComparison.InvariantCultureIgnoreCase);
-			else
-				return str1.IndexOf(str2, index, StringComparison.InvariantCultureIgnoreCase);
-		}
+		if (index == -1)
+			return str1.IndexOf(str2, StringComparison.InvariantCultureIgnoreCase);
+		else
+			return str1.IndexOf(str2, index, StringComparison.InvariantCultureIgnoreCase);
+	}
 
-		/// <summary>
-		/// Searches for the last occurrence of a specified string, ignoring case.
-		/// </summary>
-		/// <param name="str1">The string to search within.</param>
-		/// <param name="str2">The string to search for.</param>
-		/// <param name="index">The starting position of the search. The search is conducted from this position to the beginning. Default is -1 (entire string).</param>
-		/// <returns>The index of the last occurrence of str2 in str1, or -1 if not found or if either string is null.</returns>
-		public static int LastIndexOfIgnoreCase(this string str1, string str2, int index = -1)
+	/// <summary>
+	/// Searches for the last occurrence of a specified string, ignoring case.
+	/// </summary>
+	/// <param name="str1">The string to search within.</param>
+	/// <param name="str2">The string to search for.</param>
+	/// <param name="index">The starting position of the search. The search is conducted from this position to the beginning. Default is -1 (entire string).</param>
+	/// <returns>The index of the last occurrence of str2 in str1, or -1 if not found or if either string is null.</returns>
+	public static int LastIndexOfIgnoreCase(this string str1, string str2, int index = -1)
+	{
+		if (str1 is null)
 		{
-			if (str1 is null)
-			{
-				return -1;
-				//throw new ArgumentNullException(nameof(str1));
-			}
+			return -1;
+			//throw new ArgumentNullException(nameof(str1));
+		}
 
-			if (str2 is null)
-				return -1;
+		if (str2 is null)
+			return -1;
 
-			if (index == -1)
-				return str1.LastIndexOf(str2, StringComparison.InvariantCultureIgnoreCase);
-			else
-				return str1.LastIndexOf(str2, index, StringComparison.InvariantCultureIgnoreCase);
-		}
+		if (index == -1)
+			return str1.LastIndexOf(str2, StringComparison.InvariantCultureIgnoreCase);
+		else
+			return str1.LastIndexOf(str2, index, StringComparison.InvariantCultureIgnoreCase);
+	}
 
-		//
-		// http://ppetrov.wordpress.com/2008/06/30/useful-method-8-of-n-string-capitalize-firsttotitlecase/
-		//
+	//
+	// http://ppetrov.wordpress.com/2008/06/30/useful-method-8-of-n-string-capitalize-firsttotitlecase/
+	//
 
-		/// <summary>
-		/// Converts the string to title case using the current culture.
-		/// </summary>
-		/// <param name="value">The string to convert.</param>
-		/// <returns>The string converted to title case.</returns>
-		public static string ToTitleCase(this string value)
-		{
-			var ti = Thread.CurrentThread.CurrentCulture.TextInfo;
-			return ti.ToTitleCase(value);
-		}
+	/// <summary>
+	/// Converts the string to title case using the current culture.
+	/// </summary>
+	/// <param name="value">The string to convert.</param>
+	/// <returns>The string converted to title case.</returns>
+	public static string ToTitleCase(this string value)
+	{
+		var ti = Thread.CurrentThread.CurrentCulture.TextInfo;
+		return ti.ToTitleCase(value);
+	}
 
-		//
-		// http://ppetrov.wordpress.com/2008/06/13/useful-method-1-of-n/
-		//
-
-		/// <summary>
-		/// Repeats the string a specified number of times.
-		/// </summary>
-		/// <param name="value">The string to repeat.</param>
-		/// <param name="n">The number of times to repeat the string.</param>
-		/// <returns>A new string containing the original string repeated n times.</returns>
-		public static string Times(this string value, int n)
-		{
-			return value.Times(n, string.Empty);
-		}
+	//
+	// http://ppetrov.wordpress.com/2008/06/13/useful-method-1-of-n/
+	//
 
-		/// <summary>
-		/// Repeats the string a specified number of times with a separator between each repetition.
-		/// </summary>
-		/// <param name="value">The string to repeat.</param>
-		/// <param name="n">The number of times to repeat the string.</param>
-		/// <param name="separator">The string to use as a separator between repetitions.</param>
-		/// <returns>A new string containing the original string repeated n times with the specified separator.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when value is null.</exception>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown when n is less than 1.</exception>
-		public static string Times(this string value, int n, string separator)
-		{
-			if (value is null)
-				throw new ArgumentNullException(nameof(value));
+	/// <summary>
+	/// Repeats the string a specified number of times.
+	/// </summary>
+	/// <param name="value">The string to repeat.</param>
+	/// <param name="n">The number of times to repeat the string.</param>
+	/// <returns>A new string containing the original string repeated n times.</returns>
+	public static string Times(this string value, int n)
+	{
+		return value.Times(n, string.Empty);
+	}
 
-			if (n < 1)
-				throw new ArgumentOutOfRangeException(nameof(n), n, "Must be a positive number.");
+	/// <summary>
+	/// Repeats the string a specified number of times with a separator between each repetition.
+	/// </summary>
+	/// <param name="value">The string to repeat.</param>
+	/// <param name="n">The number of times to repeat the string.</param>
+	/// <param name="separator">The string to use as a separator between repetitions.</param>
+	/// <returns>A new string containing the original string repeated n times with the specified separator.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when value is null.</exception>
+	/// <exception cref="ArgumentOutOfRangeException">Thrown when n is less than 1.</exception>
+	public static string Times(this string value, int n, string separator)
+	{
+		if (value is null)
+			throw new ArgumentNullException(nameof(value));
 
-			if (value.Length > 0 && n > 0)
-				return Enumerable.Repeat(value, n).Join(separator);
+		if (n < 1)
+			throw new ArgumentOutOfRangeException(nameof(n), n, "Must be a positive number.");
 
-			return value;
-		}
+		if (value.Length > 0 && n > 0)
+			return Enumerable.Repeat(value, n).Join(separator);
+
+		return value;
+	}
+
+	//
+	// http://www.extensionmethod.net/Details.aspx?ID=123
+	//
+
+	/// <summary>
+	/// Truncates the string to a specified length and appends "..." if truncated.
+	/// </summary>
+	/// <param name="text">The string to truncate.</param>
+	/// <param name="maxLength">The maximum length of the resulting string.</param>
+	/// <returns>The truncated string.</returns>
+	public static string Truncate(this string text, int maxLength)
+	{
+		return text.Truncate(maxLength, "...");
+	}
+
+	/// <summary>
+	/// Truncates the string to a specified length and appends a custom suffix if truncated.
+	/// </summary>
+	/// <param name="text">The string to truncate.</param>
+	/// <param name="maxLength">The maximum length of the resulting string before adding the suffix.</param>
+	/// <param name="suffix">The string to append if truncation occurs.</param>
+	/// <returns>The truncated string with the suffix if truncation occurred.</returns>
+	/// <exception cref="ArgumentOutOfRangeException">Thrown when maxLength is negative.</exception>
+	public static string Truncate(this string text, int maxLength, string suffix)
+	{
+		if (maxLength < 0)
+			throw new ArgumentOutOfRangeException(nameof(maxLength), nameof(maxLength), "maxLength is negative.");
+		else if (maxLength == 0)
+			return suffix;
+		else if (maxLength >= text.Length)
+			return text;
+		else
+			return text.Substring(0, maxLength) + suffix;
+	}
+
+	/// <summary>
+	/// Truncates a string in the middle, preserving the start and end portions while adding an ellipsis in between.
+	/// </summary>
+	/// <param name="input">The string to truncate.</param>
+	/// <param name="limit">The maximum length of the resulting string including the ellipsis.</param>
+	/// <returns>The truncated string with ellipsis in the middle if truncation was necessary, otherwise the original string.</returns>
+	public static string TruncateMiddle(this string input, int limit)
+	{
+		if (input.IsEmpty())
+			return input;
+
+		var output = input;
+		const string middle = "...";
+
+		// Check if the string is longer than the allowed amount
+		// otherwise do nothing
+		if (output.Length <= limit || limit <= 0)
+			return output;
 
-		//
-		// http://www.extensionmethod.net/Details.aspx?ID=123
-		//
-
-		/// <summary>
-		/// Truncates the string to a specified length and appends "..." if truncated.
-		/// </summary>
-		/// <param name="text">The string to truncate.</param>
-		/// <param name="maxLength">The maximum length of the resulting string.</param>
-		/// <returns>The truncated string.</returns>
-		public static string Truncate(this string text, int maxLength)
+		// figure out how much to make it fit...
+		var left = (limit / 2) - (middle.Length / 2);
+		var right = limit - left - (middle.Length / 2);
+
+		if ((left + right + middle.Length) < limit)
 		{
-			return text.Truncate(maxLength, "...");
+			right++;
 		}
-
-		/// <summary>
-		/// Truncates the string to a specified length and appends a custom suffix if truncated.
-		/// </summary>
-		/// <param name="text">The string to truncate.</param>
-		/// <param name="maxLength">The maximum length of the resulting string before adding the suffix.</param>
-		/// <param name="suffix">The string to append if truncation occurs.</param>
-		/// <returns>The truncated string with the suffix if truncation occurred.</returns>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown when maxLength is negative.</exception>
-		public static string Truncate(this string text, int maxLength, string suffix)
+		else if ((left + right + middle.Length) > limit)
 		{
-			if (maxLength < 0)
-				throw new ArgumentOutOfRangeException(nameof(maxLength), nameof(maxLength), "maxLength is negative.");
-			else if (maxLength == 0)
-				return suffix;
-			else if (maxLength >= text.Length)
-				return text;
-			else
-				return text.Substring(0, maxLength) + suffix;
+			right--;
 		}
 
-		/// <summary>
-		/// Truncates a string in the middle, preserving the start and end portions while adding an ellipsis in between.
-		/// </summary>
-		/// <param name="input">The string to truncate.</param>
-		/// <param name="limit">The maximum length of the resulting string including the ellipsis.</param>
-		/// <returns>The truncated string with ellipsis in the middle if truncation was necessary, otherwise the original string.</returns>
-		public static string TruncateMiddle(this string input, int limit)
-		{
-			if (input.IsEmpty())
-				return input;
+		// cut the left side
+		output = input.Substring(0, left);
 
-			var output = input;
-			const string middle = "...";
+		// add the middle
+		output += middle;
 
-			// Check if the string is longer than the allowed amount
-			// otherwise do nothing
-			if (output.Length <= limit || limit <= 0)
-				return output;
+		// add the right side...
+		output += input.Substring(input.Length - right, right);
 
-			// figure out how much to make it fit...
-			var left = (limit / 2) - (middle.Length / 2);
-			var right = limit - left - (middle.Length / 2);
+		return output;
+	}
 
-			if ((left + right + middle.Length) < limit)
-			{
-				right++;
-			}
-			else if ((left + right + middle.Length) > limit)
-			{
-				right--;
-			}
+	/// <summary>
+	/// Removes trailing zeros from the string using the current thread's number format decimal separator.
+	/// </summary>
+	/// <param name="s">The input string.</param>
+	/// <returns>A string with trailing zeros removed.</returns>
+	public static string RemoveTrailingZeros(this string s)
+	{
+		return s.RemoveTrailingZeros(Thread.CurrentThread.CurrentCulture.NumberFormat.NumberDecimalSeparator);
+	}
 
-			// cut the left side
-			output = input.Substring(0, left);
+	/// <summary>
+	/// Removes trailing zeros from the string based on the specified separator.
+	/// </summary>
+	/// <param name="s">The input string.</param>
+	/// <param name="separator">The separator to consider while removing zeros.</param>
+	/// <returns>A string with trailing zeros removed.</returns>
+	public static string RemoveTrailingZeros(this string s, string separator)
+	{
+		if (s.IsEmpty())
+			throw new ArgumentNullException(nameof(s));
 
-			// add the middle
-			output += middle;
+		if (separator.IsEmpty())
+			throw new ArgumentNullException(nameof(separator));
 
-			// add the right side...
-			output += input.Substring(input.Length - right, right);
+		s = s.TrimStart('0').TrimEnd('0');
 
-			return output;
-		}
+		//var index = s.IndexOf(separator);
+
+		//if (index == -1)
+		//    index = s.Length;
+
+		//var endIndex = 0;
+
+		//for (var i = 0; i < index; i++)
+		//{
+		//    if (s[i] == '0')
+		//        endIndex = i + 1;
+		//    else
+		//        break;
+		//}
 
-		/// <summary>
-		/// Removes trailing zeros from the string using the current thread's number format decimal separator.
-		/// </summary>
-		/// <param name="s">The input string.</param>
-		/// <returns>A string with trailing zeros removed.</returns>
-		public static string RemoveTrailingZeros(this string s)
+		//if (endIndex > 0)
+		//    s = s.Substring(endIndex);
+
+		//for (var i = s.Length - 1; i > index; i--)
+		//{
+		//    if (s[i] == '0')
+		//        endIndex = i - 1;
+		//    else
+		//        break;
+		//}
+
+		//s = s.TrimStart('0').TrimEnd('0', separator[0]);
+
+		if (s.StartsWith(separator))
+			s = "0" + s;
+
+		if (s.EndsWith(separator))
+			s = s.Substring(0, s.Length - 1);
+
+		if (s.IsEmpty())
+			s = "0";
+
+		return s;
+	}
+
+	/// <summary>
+	/// Converts a base64 encoded string to a byte array.
+	/// </summary>
+	/// <param name="value">The base64 encoded string.</param>
+	/// <returns>The byte array representation.</returns>
+	public static byte[] Base64(this string value)
+	{
+		return Convert.FromBase64String(value);
+	}
+
+	/// <summary>
+	/// Converts a byte array to a base64 encoded string.
+	/// </summary>
+	/// <param name="value">The byte array.</param>
+	/// <returns>The base64 encoded string.</returns>
+	public static string Base64(this byte[] value)
+	{
+		return Convert.ToBase64String(value);
+	}
+
+	/// <summary>
+	/// Splits the specified string into substrings of the given length.
+	/// </summary>
+	/// <param name="stringToSplit">The string to split.</param>
+	/// <param name="length">The maximum length of each substring.</param>
+	/// <returns>An enumerable collection of substrings.</returns>
+	public static IEnumerable<string> SplitByLength(this string stringToSplit, int length)
+	{
+		while (stringToSplit.Length > length)
 		{
-			return s.RemoveTrailingZeros(Thread.CurrentThread.CurrentCulture.NumberFormat.NumberDecimalSeparator);
+			yield return stringToSplit.Substring(0, length);
+			stringToSplit = stringToSplit.Substring(length);
 		}
 
-		/// <summary>
-		/// Removes trailing zeros from the string based on the specified separator.
-		/// </summary>
-		/// <param name="s">The input string.</param>
-		/// <param name="separator">The separator to consider while removing zeros.</param>
-		/// <returns>A string with trailing zeros removed.</returns>
-		public static string RemoveTrailingZeros(this string s, string separator)
-		{
-			if (s.IsEmpty())
-				throw new ArgumentNullException(nameof(s));
+		if (stringToSplit.Length > 0)
+			yield return stringToSplit;
+	}
 
-			if (separator.IsEmpty())
-				throw new ArgumentNullException(nameof(separator));
+	/// <summary>
+	/// Trims the specified start value from the beginning of the string if present.
+	/// </summary>
+	/// <param name="str">The input string.</param>
+	/// <param name="sStartValue">The starting substring to remove.</param>
+	/// <returns>The trimmed string.</returns>
+	public static string TrimStart(this string str, string sStartValue)
+	{
+		return str.StartsWith(sStartValue) ? str.Remove(0, sStartValue.Length) : str;
+	}
 
-			s = s.TrimStart('0').TrimEnd('0');
+	/// <summary>
+	/// Trims the specified end value from the end of the string if present.
+	/// </summary>
+	/// <param name="str">The input string.</param>
+	/// <param name="sEndValue">The ending substring to remove.</param>
+	/// <returns>The trimmed string.</returns>
+	public static string TrimEnd(this string str, string sEndValue)
+	{
+		return str.EndsWith(sEndValue) ? str.Remove(str.Length - sEndValue.Length, sEndValue.Length) : str;
+	}
+
+	/// <summary>
+	/// Checks whether the string starts with the specified start string and ends with the specified end string.
+	/// </summary>
+	/// <param name="str">The input string.</param>
+	/// <param name="sStart">The starting string.</param>
+	/// <param name="sEnd">The ending string.</param>
+	/// <returns>true if the string is enclosed by the specified brackets; otherwise, false.</returns>
+	public static bool CheckBrackets(this string str, string sStart, string sEnd)
+	{
+		return str.StartsWith(sStart) && str.EndsWith(sEnd);
+	}
+
+	/// <summary>
+	/// Removes the enclosing brackets from the string if present.
+	/// </summary>
+	/// <param name="str">The input string.</param>
+	/// <param name="sStart">The starting bracket string.</param>
+	/// <param name="sEnd">The ending bracket string.</param>
+	/// <returns>The string with brackets removed, if they were present.</returns>
+	public static string StripBrackets(this string str, string sStart, string sEnd)
+	{
+		return str.CheckBrackets(sStart, sEnd)
+			       ? str.Substring(sStart.Length, (str.Length - sStart.Length) - sEnd.Length)
+			       : str;
+	}
+
+	private static readonly Dictionary<char, string> _charMap = new()
+	{
+		{ 'а', "a" },
+		{ 'б', "b" },
+		{ 'в', "v" },
+		{ 'г', "g" },
+		{ 'д', "d" },
+		{ 'е', "e" },
+		{ 'ё', "yo" },
+		{ 'ж', "zh" },
+		{ 'з', "z" },
+		{ 'и', "i" },
+		{ 'й', "i" },
+		{ 'к', "k" },
+		{ 'л', "l" },
+		{ 'м', "m" },
+		{ 'н', "n" },
+		{ 'о', "o" },
+		{ 'п', "p" },
+		{ 'р', "r" },
+		{ 'с', "s" },
+		{ 'т', "t" },
+		{ 'у', "u" },
+		{ 'ф', "f" },
+		{ 'х', "h" },
+		{ 'ц', "ts" },
+		{ 'ч', "ch" },
+		{ 'ш', "sh" },
+		{ 'щ', "shsh" },
+		{ 'ы', "y" },
+		{ 'э', "eh" },
+		{ 'ю', "yu" },
+		{ 'я', "ya" },
+		{ 'ь', "'" },
+		{ 'ъ', "'" },
+	};
+
+	/// <summary>
+	/// Transliterates the Russian title to Latin characters.
+	/// </summary>
+	/// <param name="russianTitle">The Russian string.</param>
+	/// <returns>The transliterated string in Latin.</returns>
+	public static string ToLatin(this string russianTitle)
+	{
+		if (russianTitle.IsEmpty())
+			return russianTitle;
+
+		var transliter = string.Empty;
 
-			//var index = s.IndexOf(separator);
+		foreach (var letter in russianTitle.ToLower())
+		{
+			if (_charMap.TryGetValue(letter, out var mappedLetter))
+				transliter += mappedLetter;
+			else
+				transliter += letter;
+		}
 
-			//if (index == -1)
-			//    index = s.Length;
+		return transliter;
+	}
+
+	/// <summary>
+	/// Performs light screening on the input text by replacing spaces with hyphens and removing certain characters.
+	/// </summary>
+	/// <param name="text">The input text.</param>
+	/// <returns>The screened text.</returns>
+	public static string LightScreening(this string text)
+		=> text?.Replace(' ', '-').Remove(".").Remove("#").Remove("?").Remove(":");
+
+	/// <summary>
+	/// Compares two file paths for equality after normalizing them.
+	/// </summary>
+	/// <param name="path1">The first file path.</param>
+	/// <param name="path2">The second file path.</param>
+	/// <returns>true if the paths are equal; otherwise, false.</returns>
+	public static bool ComparePaths(this string path1, string path2)
+	{
+		// http://stackoverflow.com/questions/2281531/how-can-i-compare-directory-paths-in-c
+		return Path.GetFullPath(path1).TrimEnd('\\').EqualsIgnoreCase(Path.GetFullPath(path2).TrimEnd('\\'));
+	}
 
-			//var endIndex = 0;
+	/// <summary>
+	/// Determines if the current string matches the specified pattern using SQL-like wildcards.
+	/// </summary>
+	/// <param name="toSearch">The string to search in.</param>
+	/// <param name="toFind">The pattern to search for. Use '_' for single character and '%' for multiple characters.</param>
+	/// <param name="ignoreCase">if set to true, the comparison ignores case.</param>
+	/// <returns>true if the string matches the pattern; otherwise, false.</returns>
+	public static bool Like(this string toSearch, string toFind, bool ignoreCase = true)
+	{
+		var option = RegexOptions.Singleline;
 
-			//for (var i = 0; i < index; i++)
-			//{
-			//    if (s[i] == '0')
-			//        endIndex = i + 1;
-			//    else
-			//        break;
-			//}
+		if (ignoreCase)
+			option = RegexOptions.IgnoreCase;
 
-			//if (endIndex > 0)
-			//    s = s.Substring(endIndex);
+		return new Regex(@"\A" + new Regex(@"\.|\$|\^|\{|\[|\(|\||\)|\*|\+|\?|\\").Replace(toFind, ch => @"\" + ch).Replace('_', '.').Replace("%", ".*") + @"\z", option).IsMatch(toSearch);
+	}
 
-			//for (var i = s.Length - 1; i > index; i--)
-			//{
-			//    if (s[i] == '0')
-			//        endIndex = i - 1;
-			//    else
-			//        break;
-			//}
+	/// <summary>
+	/// Determines whether the specified secure string is empty.
+	/// </summary>
+	/// <param name="secureString">The secure string to check.</param>
+	/// <returns>true if the secure string is null or empty; otherwise, false.</returns>
+	public static bool IsEmpty(this SecureString secureString)
+		=> secureString is null	|| secureString.Length == 0;
 
-			//s = s.TrimStart('0').TrimEnd('0', separator[0]);
+	/// <summary>
+	/// Throws an ArgumentNullException if the secure string is empty.
+	/// </summary>
+	/// <param name="str">The secure string.</param>
+	/// <param name="paramName">The name of the parameter.</param>
+	/// <returns>The original secure string if not empty.</returns>
+	public static SecureString ThrowIfEmpty(this SecureString str, string paramName)
+		=> str.IsEmpty() ? throw new ArgumentNullException(paramName) : str;
 
-			if (s.StartsWith(separator))
-				s = "0" + s;
+	/// <summary>
+	/// Determines whether two secure strings are equal.
+	/// </summary>
+	/// <param name="value1">The first secure string.</param>
+	/// <param name="value2">The second secure string.</param>
+	/// <returns>true if both secure strings are equal; otherwise, false.</returns>
+	public static bool IsEqualTo(this SecureString value1, SecureString value2)
+	{
+		if (value1 is null)
+			return value2 is null;
 
-			if (s.EndsWith(separator))
-				s = s.Substring(0, s.Length - 1);
+		if (value2 is null)
+			return false;
 
-			if (s.IsEmpty())
-				s = "0";
+		if (value1.Length != value2.Length)
+			return false;
 
-			return s;
-		}
+		var bstr1 = IntPtr.Zero;
+		var bstr2 = IntPtr.Zero;
 
-		/// <summary>
-		/// Converts a base64 encoded string to a byte array.
-		/// </summary>
-		/// <param name="value">The base64 encoded string.</param>
-		/// <returns>The byte array representation.</returns>
-		public static byte[] Base64(this string value)
+		try
 		{
-			return Convert.FromBase64String(value);
-		}
+			bstr1 = Marshal.SecureStringToBSTR(value1);
+			bstr2 = Marshal.SecureStringToBSTR(value2);
 
-		/// <summary>
-		/// Converts a byte array to a base64 encoded string.
-		/// </summary>
-		/// <param name="value">The byte array.</param>
-		/// <returns>The base64 encoded string.</returns>
-		public static string Base64(this byte[] value)
-		{
-			return Convert.ToBase64String(value);
-		}
+			var length = Marshal.ReadInt32(bstr1, -4);
 
-		/// <summary>
-		/// Splits the specified string into substrings of the given length.
-		/// </summary>
-		/// <param name="stringToSplit">The string to split.</param>
-		/// <param name="length">The maximum length of each substring.</param>
-		/// <returns>An enumerable collection of substrings.</returns>
-		public static IEnumerable<string> SplitByLength(this string stringToSplit, int length)
-		{
-			while (stringToSplit.Length > length)
+			for (var x = 0; x < length; ++x)
 			{
-				yield return stringToSplit.Substring(0, length);
-				stringToSplit = stringToSplit.Substring(length);
-			}
-
-			if (stringToSplit.Length > 0)
-				yield return stringToSplit;
-		}
+				var byte1 = Marshal.ReadByte(bstr1, x);
+				var byte2 = Marshal.ReadByte(bstr2, x);
 
-		/// <summary>
-		/// Trims the specified start value from the beginning of the string if present.
-		/// </summary>
-		/// <param name="str">The input string.</param>
-		/// <param name="sStartValue">The starting substring to remove.</param>
-		/// <returns>The trimmed string.</returns>
-		public static string TrimStart(this string str, string sStartValue)
-		{
-			return str.StartsWith(sStartValue) ? str.Remove(0, sStartValue.Length) : str;
-		}
+				if (byte1 != byte2)
+					return false;
+			}
 
-		/// <summary>
-		/// Trims the specified end value from the end of the string if present.
-		/// </summary>
-		/// <param name="str">The input string.</param>
-		/// <param name="sEndValue">The ending substring to remove.</param>
-		/// <returns>The trimmed string.</returns>
-		public static string TrimEnd(this string str, string sEndValue)
-		{
-			return str.EndsWith(sEndValue) ? str.Remove(str.Length - sEndValue.Length, sEndValue.Length) : str;
+			return true;
 		}
-
-		/// <summary>
-		/// Checks whether the string starts with the specified start string and ends with the specified end string.
-		/// </summary>
-		/// <param name="str">The input string.</param>
-		/// <param name="sStart">The starting string.</param>
-		/// <param name="sEnd">The ending string.</param>
-		/// <returns>true if the string is enclosed by the specified brackets; otherwise, false.</returns>
-		public static bool CheckBrackets(this string str, string sStart, string sEnd)
+		finally
 		{
-			return str.StartsWith(sStart) && str.EndsWith(sEnd);
-		}
+			if (bstr2 != IntPtr.Zero)
+				Marshal.ZeroFreeBSTR(bstr2);
 
-		/// <summary>
-		/// Removes the enclosing brackets from the string if present.
-		/// </summary>
-		/// <param name="str">The input string.</param>
-		/// <param name="sStart">The starting bracket string.</param>
-		/// <param name="sEnd">The ending bracket string.</param>
-		/// <returns>The string with brackets removed, if they were present.</returns>
-		public static string StripBrackets(this string str, string sStart, string sEnd)
-		{
-			return str.CheckBrackets(sStart, sEnd)
-				       ? str.Substring(sStart.Length, (str.Length - sStart.Length) - sEnd.Length)
-				       : str;
+			if (bstr1 != IntPtr.Zero)
+				Marshal.ZeroFreeBSTR(bstr1);
 		}
+	}
 
-		private static readonly Dictionary<char, string> _charMap = new()
-		{
-			{ 'а', "a" },
-			{ 'б', "b" },
-			{ 'в', "v" },
-			{ 'г', "g" },
-			{ 'д', "d" },
-			{ 'е', "e" },
-			{ 'ё', "yo" },
-			{ 'ж', "zh" },
-			{ 'з', "z" },
-			{ 'и', "i" },
-			{ 'й', "i" },
-			{ 'к', "k" },
-			{ 'л', "l" },
-			{ 'м', "m" },
-			{ 'н', "n" },
-			{ 'о', "o" },
-			{ 'п', "p" },
-			{ 'р', "r" },
-			{ 'с', "s" },
-			{ 'т', "t" },
-			{ 'у', "u" },
-			{ 'ф', "f" },
-			{ 'х', "h" },
-			{ 'ц', "ts" },
-			{ 'ч', "ch" },
-			{ 'ш', "sh" },
-			{ 'щ', "shsh" },
-			{ 'ы', "y" },
-			{ 'э', "eh" },
-			{ 'ю', "yu" },
-			{ 'я', "ya" },
-			{ 'ь', "'" },
-			{ 'ъ', "'" },
-		};
-
-		/// <summary>
-		/// Transliterates the Russian title to Latin characters.
-		/// </summary>
-		/// <param name="russianTitle">The Russian string.</param>
-		/// <returns>The transliterated string in Latin.</returns>
-		public static string ToLatin(this string russianTitle)
-		{
-			if (russianTitle.IsEmpty())
-				return russianTitle;
-
-			var transliter = string.Empty;
-
-			foreach (var letter in russianTitle.ToLower())
-			{
-				if (_charMap.TryGetValue(letter, out var mappedLetter))
-					transliter += mappedLetter;
-				else
-					transliter += letter;
-			}
+	/// <summary>
+	/// Converts the byte array digest to its hexadecimal string representation.
+	/// </summary>
+	/// <param name="digest">The byte array digest.</param>
+	/// <returns>The hexadecimal string.</returns>
+	public static string Digest(this byte[] digest)
+	{
+		return digest.Digest(digest.Length);
+	}
 
-			return transliter;
-		}
+	/// <summary>
+	/// Converts a portion of the byte array digest to its hexadecimal string representation.
+	/// </summary>
+	/// <param name="digest">The byte array digest.</param>
+	/// <param name="length">The number of bytes to process.</param>
+	/// <param name="index">The starting index in the array.</param>
+	/// <returns>The hexadecimal string.</returns>
+	public static string Digest(this byte[] digest, int? length, int index = 0)
+	{
+		return BitConverter.ToString(digest, index, length ?? digest.Length).Remove("-");
+	}
 
-		/// <summary>
-		/// Performs light screening on the input text by replacing spaces with hyphens and removing certain characters.
-		/// </summary>
-		/// <param name="text">The input text.</param>
-		/// <returns>The screened text.</returns>
-		public static string LightScreening(this string text)
-			=> text?.Replace(' ', '-').Remove(".").Remove("#").Remove("?").Remove(":");
-
-		/// <summary>
-		/// Compares two file paths for equality after normalizing them.
-		/// </summary>
-		/// <param name="path1">The first file path.</param>
-		/// <param name="path2">The second file path.</param>
-		/// <returns>true if the paths are equal; otherwise, false.</returns>
-		public static bool ComparePaths(this string path1, string path2)
-		{
-			// http://stackoverflow.com/questions/2281531/how-can-i-compare-directory-paths-in-c
-			return Path.GetFullPath(path1).TrimEnd('\\').EqualsIgnoreCase(Path.GetFullPath(path2).TrimEnd('\\'));
-		}
+	//private static readonly byte[] _initVectorBytes = Encoding.ASCII.GetBytes("ss14fgty650h8u82");
+	//private const int _keysize = 256;
+
+	//public static string Encrypt(this string data, string password)
+	//{
+	//	using (var pwd = new Rfc2898DeriveBytes(password, _initVectorBytes))
+	//	{
+	//		var keyBytes = pwd.GetBytes(_keysize / 8);
+
+	//		using (var symmetricKey = new RijndaelManaged { Mode = CipherMode.CBC })
+	//		using (var encryptor = symmetricKey.CreateEncryptor(keyBytes, _initVectorBytes))
+	//		using (var memoryStream = new MemoryStream())
+	//		using (var cryptoStream = new CryptoStream(memoryStream, encryptor, CryptoStreamMode.Write))
+	//		{
+	//			var bytes = data.UTF8();
+
+	//			cryptoStream.Write(bytes, 0, bytes.Length);
+	//			cryptoStream.FlushFinalBlock();
+
+	//			return memoryStream.ToArray().Base64();
+	//		}
+	//	}
+	//}
+
+	//public static string Decrypt(this string data, string password)
+	//{
+	//	using (var pwd = new Rfc2898DeriveBytes(password, _initVectorBytes))
+	//	{
+	//		var cipherTextBytes = data.Base64();
+	//		var keyBytes = pwd.GetBytes(_keysize / 8);
+
+	//		using (var symmetricKey = new RijndaelManaged { Mode = CipherMode.CBC })
+	//		using (var decryptor = symmetricKey.CreateDecryptor(keyBytes, _initVectorBytes))
+	//		using (var memoryStream = new MemoryStream(cipherTextBytes))
+	//		using (var cryptoStream = new CryptoStream(memoryStream, decryptor, CryptoStreamMode.Read))
+	//		{
+	//			var plainTextBytes = new byte[cipherTextBytes.Length];
+	//			var decryptedByteCount = cryptoStream.Read(plainTextBytes, 0, plainTextBytes.Length);
+	//			return Encoding.UTF8.GetString(plainTextBytes, 0, decryptedByteCount);
+	//		}
+	//	}
+	//}
 
-		/// <summary>
-		/// Determines if the current string matches the specified pattern using SQL-like wildcards.
-		/// </summary>
-		/// <param name="toSearch">The string to search in.</param>
-		/// <param name="toFind">The pattern to search for. Use '_' for single character and '%' for multiple characters.</param>
-		/// <param name="ignoreCase">if set to true, the comparison ignores case.</param>
-		/// <returns>true if the string matches the pattern; otherwise, false.</returns>
-		public static bool Like(this string toSearch, string toFind, bool ignoreCase = true)
-		{
-			var option = RegexOptions.Singleline;
+	/// <summary>
+	/// Gets the Windows Cyrillic encoding (code page 1251).
+	/// </summary>
+	public static Encoding WindowsCyrillic => Encoding.GetEncoding(1251);
 
-			if (ignoreCase)
-				option = RegexOptions.IgnoreCase;
+	/// <summary>
+	/// Provides hexadecimal encoding functionality.
+	/// </summary>
+	public static readonly HexEncoding HexEncoding = new();
 
-			return new Regex(@"\A" + new Regex(@"\.|\$|\^|\{|\[|\(|\||\)|\*|\+|\?|\\").Replace(toFind, ch => @"\" + ch).Replace('_', '.').Replace("%", ".*") + @"\z", option).IsMatch(toSearch);
-		}
+	/// <summary>
+	/// Returns the duplicate strings from the provided collection, ignoring case.
+	/// </summary>
+	/// <param name="items">The collection of strings.</param>
+	/// <returns>An enumerable collection of duplicate strings.</returns>
+	public static IEnumerable<string> Duplicates(this IEnumerable<string> items)
+		=> items.GroupBy(s => s, s => StringComparer.InvariantCultureIgnoreCase).Where(g => g.Count() > 1).Select(g => g.Key);
 
-		/// <summary>
-		/// Determines whether the specified secure string is empty.
-		/// </summary>
-		/// <param name="secureString">The secure string to check.</param>
-		/// <returns>true if the secure string is null or empty; otherwise, false.</returns>
-		public static bool IsEmpty(this SecureString secureString)
-			=> secureString is null	|| secureString.Length == 0;
-
-		/// <summary>
-		/// Throws an ArgumentNullException if the secure string is empty.
-		/// </summary>
-		/// <param name="str">The secure string.</param>
-		/// <param name="paramName">The name of the parameter.</param>
-		/// <returns>The original secure string if not empty.</returns>
-		public static SecureString ThrowIfEmpty(this SecureString str, string paramName)
-			=> str.IsEmpty() ? throw new ArgumentNullException(paramName) : str;
-
-		/// <summary>
-		/// Determines whether two secure strings are equal.
-		/// </summary>
-		/// <param name="value1">The first secure string.</param>
-		/// <param name="value2">The second secure string.</param>
-		/// <returns>true if both secure strings are equal; otherwise, false.</returns>
-		public static bool IsEqualTo(this SecureString value1, SecureString value2)
-		{
-			if (value1 is null)
-				return value2 is null;
+	/// <summary>
+	/// Gets the default encoding bytes for the string.
+	/// </summary>
+	/// <param name="v">The input string.</param>
+	/// <returns>The byte array in default encoding.</returns>
+	public static byte[] Default(this string v) => Encoding.Default.GetBytes(v);
+	/// <summary>
+	/// Gets the string from a byte array using the default encoding.
+	/// </summary>
+	/// <param name="v">The byte array.</param>
+	/// <returns>The string decoded from the byte array.</returns>
+	public static string Default(this byte[] v) => Default(v, 0, v.Length);
+	/// <summary>
+	/// Gets the string from a portion of the byte array using the default encoding.
+	/// </summary>
+	/// <param name="v">The byte array.</param>
+	/// <param name="index">The starting index.</param>
+	/// <param name="count">The number of bytes to decode.</param>
+	/// <returns>The decoded string.</returns>
+	public static string Default(this byte[] v, int index, int count) => Encoding.Default.GetString(v, index, count);
+	/// <summary>
+	/// Gets the string from an ArraySegment using the default encoding.
+	/// </summary>
+	/// <param name="v">The ArraySegment of bytes.</param>
+	/// <returns>The decoded string.</returns>
+	public static string Default(this ArraySegment<byte> v) => v.Array.Default(v.Offset, v.Count);
+	/// <summary>
+	/// Gets the string from a byte array using the default encoding with a specified count.
+	/// </summary>
+	/// <param name="v">The byte array.</param>
+	/// <param name="count">The number of bytes to decode.</param>
+	/// <param name="index">The starting index.</param>
+	/// <returns>The decoded string.</returns>
+	[CLSCompliant(false)]
+	public static string Default(this byte[] v, uint count, int index = 0) => Default(v, index, (int)count);
 
-			if (value2 is null)
-				return false;
+	/// <summary>
+	/// Gets the ASCII encoded bytes for the string.
+	/// </summary>
+	/// <param name="v">The input string.</param>
+	/// <returns>The ASCII byte array.</returns>
+	public static byte[] ASCII(this string v) => Encoding.ASCII.GetBytes(v);
+	/// <summary>
+	/// Gets the string from a byte array using ASCII encoding.
+	/// </summary>
+	/// <param name="v">The byte array.</param>
+	/// <returns>The ASCII decoded string.</returns>
+	public static string ASCII(this byte[] v) => ASCII(v, 0, v.Length);
+	/// <summary>
+	/// Gets the string from a portion of the byte array using ASCII encoding.
+	/// </summary>
+	/// <param name="v">The byte array.</param>
+	/// <param name="index">The starting index.</param>
+	/// <param name="count">The number of bytes to decode.</param>
+	/// <returns>The decoded string.</returns>
+	public static string ASCII(this byte[] v, int index, int count) => Encoding.ASCII.GetString(v, index, count);
+	/// <summary>
+	/// Gets the string from an ArraySegment using ASCII encoding.
+	/// </summary>
+	/// <param name="v">The ArraySegment of bytes.</param>
+	/// <returns>The decoded string.</returns>
+	public static string ASCII(this ArraySegment<byte> v) => v.Array.ASCII(v.Offset, v.Count);
+	/// <summary>
+	/// Gets the string from a byte array using ASCII encoding with a specified count.
+	/// </summary>
+	/// <param name="v">The byte array.</param>
+	/// <param name="count">The number of bytes to decode.</param>
+	/// <param name="index">The starting index.</param>
+	/// <returns>The decoded string.</returns>
+	[CLSCompliant(false)]
+	public static string ASCII(this byte[] v, uint count, int index = 0) => ASCII(v, index, (int)count);
 
-			if (value1.Length != value2.Length)
-				return false;
+	/// <summary>
+	/// Gets the UTF8 encoded bytes for the string.
+	/// </summary>
+	/// <param name="v">The input string.</param>
+	/// <returns>The UTF8 byte array.</returns>
+	public static byte[] UTF8(this string v) => Encoding.UTF8.GetBytes(v);
+	/// <summary>
+	/// Gets the string from a byte array using UTF8 encoding.
+	/// </summary>
+	/// <param name="v">The byte array.</param>
+	/// <returns>The UTF8 decoded string.</returns>
+	public static string UTF8(this byte[] v) => UTF8(v, 0, v.Length);
+	/// <summary>
+	/// Gets the string from a portion of the byte array using UTF8 encoding.
+	/// </summary>
+	/// <param name="v">The byte array.</param>
+	/// <param name="index">The starting index.</param>
+	/// <param name="count">The number of bytes to decode.</param>
+	/// <returns>The decoded string.</returns>
+	public static string UTF8(this byte[] v, int index, int count) => Encoding.UTF8.GetString(v, index, count);
+	/// <summary>
+	/// Gets the string from an ArraySegment using UTF8 encoding.
+	/// </summary>
+	/// <param name="v">The ArraySegment of bytes.</param>
+	/// <returns>The decoded string.</returns>
+	public static string UTF8(this ArraySegment<byte> v) => v.Array.UTF8(v.Offset, v.Count);
+	/// <summary>
+	/// Gets the string from a byte array using UTF8 encoding with a specified count.
+	/// </summary>
+	/// <param name="v">The byte array.</param>
+	/// <param name="count">The number of bytes to decode.</param>
+	/// <param name="index">The starting index.</param>
+	/// <returns>The decoded string.</returns>
+	[CLSCompliant(false)]
+	public static string UTF8(this byte[] v, uint count, int index = 0) => UTF8(v, index, (int)count);
 
-			var bstr1 = IntPtr.Zero;
-			var bstr2 = IntPtr.Zero;
+	/// <summary>
+	/// Gets the Unicode encoded bytes for the string.
+	/// </summary>
+	/// <param name="v">The input string.</param>
+	/// <returns>The Unicode byte array.</returns>
+	public static byte[] Unicode(this string v) => Encoding.Unicode.GetBytes(v);
+	/// <summary>
+	/// Gets the string from a byte array using Unicode encoding.
+	/// </summary>
+	/// <param name="v">The byte array.</param>
+	/// <returns>The Unicode decoded string.</returns>
+	public static string Unicode(this byte[] v) => Unicode(v, 0, v.Length);
+	/// <summary>
+	/// Gets the string from a portion of the byte array using Unicode encoding.
+	/// </summary>
+	/// <param name="v">The byte array.</param>
+	/// <param name="index">The starting index.</param>
+	/// <param name="count">The number of bytes to decode.</param>
+	/// <returns>The decoded string.</returns>
+	public static string Unicode(this byte[] v, int index, int count) => Encoding.Unicode.GetString(v, index, count);
+	/// <summary>
+	/// Gets the string from an ArraySegment using Unicode encoding.
+	/// </summary>
+	/// <param name="v">The ArraySegment of bytes.</param>
+	/// <returns>The decoded string.</returns>
+	public static string Unicode(this ArraySegment<byte> v) => v.Array.Unicode(v.Offset, v.Count);
+	/// <summary>
+	/// Gets the string from a byte array using Unicode encoding with a specified count.
+	/// </summary>
+	/// <param name="v">The byte array.</param>
+	/// <param name="count">The number of bytes to decode.</param>
+	/// <param name="index">The starting index.</param>
+	/// <returns>The decoded string.</returns>
+	[CLSCompliant(false)]
+	public static string Unicode(this byte[] v, uint count, int index = 0) => Unicode(v, index, (int)count);
 
-			try
-			{
-				bstr1 = Marshal.SecureStringToBSTR(value1);
-				bstr2 = Marshal.SecureStringToBSTR(value2);
+	/// <summary>
+	/// Gets the Windows Cyrillic encoded bytes for the string.
+	/// </summary>
+	/// <param name="v">The input string.</param>
+	/// <returns>The Windows Cyrillic byte array.</returns>
+	public static byte[] Cyrillic(this string v) => WindowsCyrillic.GetBytes(v);
+	/// <summary>
+	/// Gets the string from a byte array using Windows Cyrillic encoding.
+	/// </summary>
+	/// <param name="v">The byte array.</param>
+	/// <returns>The decoded string.</returns>
+	public static string Cyrillic(this byte[] v) => Cyrillic(v, 0, v.Length);
+	/// <summary>
+	/// Gets the string from a portion of the byte array using Windows Cyrillic encoding.
+	/// </summary>
+	/// <param name="v">The byte array.</param>
+	/// <param name="index">The starting index.</param>
+	/// <param name="count">The number of bytes to decode.</param>
+	/// <returns>The decoded string.</returns>
+	public static string Cyrillic(this byte[] v, int index, int count) => WindowsCyrillic.GetString(v, index, count);
+	/// <summary>
+	/// Gets the string from an ArraySegment using Windows Cyrillic encoding.
+	/// </summary>
+	/// <param name="v">The ArraySegment of bytes.</param>
+	/// <returns>The decoded string.</returns>
+	public static string Cyrillic(this ArraySegment<byte> v) => v.Array.Cyrillic(v.Offset, v.Count);
+	/// <summary>
+	/// Gets the string from a byte array using Windows Cyrillic encoding with a specified count.
+	/// </summary>
+	/// <param name="v">The byte array.</param>
+	/// <param name="count">The number of bytes to decode.</param>
+	/// <param name="index">The starting index.</param>
+	/// <returns>The decoded string.</returns>
+	[CLSCompliant(false)]
+	public static string Cyrillic(this byte[] v, uint count, int index = 0) => Cyrillic(v, index, (int)count);
 
-				var length = Marshal.ReadInt32(bstr1, -4);
+	/// <summary>
+	/// Gets the hexadecimal encoded bytes for the string.
+	/// </summary>
+	/// <param name="v">The input string.</param>
+	/// <returns>The hexadecimal byte array.</returns>
+	public static byte[] Hex(this string v) => HexEncoding.GetBytes(v);
+	/// <summary>
+	/// Gets the string from a byte array using hexadecimal encoding.
+	/// </summary>
+	/// <param name="v">The byte array.</param>
+	/// <returns>The hexadecimal decoded string.</returns>
+	public static string Hex(this byte[] v) => Hex(v, 0, v.Length);
+	/// <summary>
+	/// Gets the string from a portion of the byte array using hexadecimal encoding.
+	/// </summary>
+	/// <param name="v">The byte array.</param>
+	/// <param name="index">The starting index.</param>
+	/// <param name="count">The number of bytes to decode.</param>
+	/// <returns>The decoded hexadecimal string.</returns>
+	public static string Hex(this byte[] v, int index, int count) => HexEncoding.GetString(v, index, count);
+	/// <summary>
+	/// Gets the string from an ArraySegment using hexadecimal encoding.
+	/// </summary>
+	/// <param name="v">The ArraySegment of bytes.</param>
+	/// <returns>The decoded hexadecimal string.</returns>
+	public static string Hex(this ArraySegment<byte> v) => v.Array.Hex(v.Offset, v.Count);
+	/// <summary>
+	/// Gets the string from a byte array using hexadecimal encoding with a specified count.
+	/// </summary>
+	/// <param name="v">The byte array.</param>
+	/// <param name="count">The number of bytes to decode.</param>
+	/// <param name="index">The starting index.</param>
+	/// <returns>The decoded hexadecimal string.</returns>
+	[CLSCompliant(false)]
+	public static string Hex(this byte[] v, uint count, int index = 0) => Hex(v, index, (int)count);
 
-				for (var x = 0; x < length; ++x)
-				{
-					var byte1 = Marshal.ReadByte(bstr1, x);
-					var byte2 = Marshal.ReadByte(bstr2, x);
+	/// <summary>
+	/// Decodes an ArraySegment of bytes into a string using the specified encoding.
+	/// </summary>
+	/// <param name="encoding">The encoding to use.</param>
+	/// <param name="buffer">The ArraySegment of bytes.</param>
+	/// <returns>The decoded string.</returns>
+	public static string GetString(this Encoding encoding, ArraySegment<byte> buffer)
+		=> encoding.CheckOnNull(nameof(encoding)).GetString(buffer.Array, buffer.Offset, buffer.Count);
 
-					if (byte1 != byte2)
-						return false;
-				}
+	/// <summary>
+	/// Converts the string to a SecureString.
+	/// </summary>
+	/// <param name="str">The input string.</param>
+	/// <returns>The SecureString equivalent of the input string.</returns>
+	public static SecureString Secure(this string str)
+		=> str?.ToCharArray().TypedTo<char[], SecureString>();
 
-				return true;
-			}
-			finally
-			{
-				if (bstr2 != IntPtr.Zero)
-					Marshal.ZeroFreeBSTR(bstr2);
+	/// <summary>
+	/// Converts the SecureString to an unsecured string.
+	/// </summary>
+	/// <param name="str">The SecureString.</param>
+	/// <returns>The unsecured string equivalent.</returns>
+	public static string UnSecure(this SecureString str)
+	{
+		if (str is null)
+			return null;
 
-				if (bstr1 != IntPtr.Zero)
-					Marshal.ZeroFreeBSTR(bstr1);
-			}
-		}
+		var bstr = Marshal.SecureStringToBSTR(str);
 
-		/// <summary>
-		/// Converts the byte array digest to its hexadecimal string representation.
-		/// </summary>
-		/// <param name="digest">The byte array digest.</param>
-		/// <returns>The hexadecimal string.</returns>
-		public static string Digest(this byte[] digest)
+		using (bstr.MakeDisposable(Marshal.ZeroFreeBSTR))
 		{
-			return digest.Digest(digest.Length);
+			return Marshal.PtrToStringBSTR(bstr);
 		}
+	}
 
-		/// <summary>
-		/// Converts a portion of the byte array digest to its hexadecimal string representation.
-		/// </summary>
-		/// <param name="digest">The byte array digest.</param>
-		/// <param name="length">The number of bytes to process.</param>
-		/// <param name="index">The starting index in the array.</param>
-		/// <returns>The hexadecimal string.</returns>
-		public static string Digest(this byte[] digest, int? length, int index = 0)
-		{
-			return BitConverter.ToString(digest, index, length ?? digest.Length).Remove("-");
-		}
+	/// <summary>
+	/// Converts a SecureString key to a numeric identifier.
+	/// </summary>
+	/// <param name="key">The secure key.</param>
+	/// <returns>A numeric identifier or null if the key is null.</returns>
+	public static int? ToId(this SecureString key) => key?.UnSecure().GetDeterministicHashCode();
 
-		//private static readonly byte[] _initVectorBytes = Encoding.ASCII.GetBytes("ss14fgty650h8u82");
-		//private const int _keysize = 256;
+	/// <summary>
+	/// Converts a character array to a string using the specified count and starting index.
+	/// </summary>
+	/// <param name="arr">The character array.</param>
+	/// <param name="count">The number of characters to convert.</param>
+	/// <param name="index">The starting index in the array.</param>
+	/// <returns>A new string constructed from the array.</returns>
+	[CLSCompliant(false)]
+	public static string ToString(this char[] arr, uint count, int index = 0)
+		=> arr.ToString((int)count, index);
 
-		//public static string Encrypt(this string data, string password)
-		//{
-		//	using (var pwd = new Rfc2898DeriveBytes(password, _initVectorBytes))
-		//	{
-		//		var keyBytes = pwd.GetBytes(_keysize / 8);
-
-		//		using (var symmetricKey = new RijndaelManaged { Mode = CipherMode.CBC })
-		//		using (var encryptor = symmetricKey.CreateEncryptor(keyBytes, _initVectorBytes))
-		//		using (var memoryStream = new MemoryStream())
-		//		using (var cryptoStream = new CryptoStream(memoryStream, encryptor, CryptoStreamMode.Write))
-		//		{
-		//			var bytes = data.UTF8();
-
-		//			cryptoStream.Write(bytes, 0, bytes.Length);
-		//			cryptoStream.FlushFinalBlock();
-
-		//			return memoryStream.ToArray().Base64();
-		//		}
-		//	}
-		//}
+	/// <summary>
+	/// Converts a character array to a string using the specified count and starting index.
+	/// </summary>
+	/// <param name="arr">The character array.</param>
+	/// <param name="count">The number of characters to convert.</param>
+	/// <param name="index">The starting index in the array.</param>
+	/// <returns>A new string constructed from the array.</returns>
+	public static string ToString(this char[] arr, int count, int index = 0)
+		=> count == 0 ? string.Empty : new string(arr, index, count);
 
-		//public static string Decrypt(this string data, string password)
-		//{
-		//	using (var pwd = new Rfc2898DeriveBytes(password, _initVectorBytes))
-		//	{
-		//		var cipherTextBytes = data.Base64();
-		//		var keyBytes = pwd.GetBytes(_keysize / 8);
-
-		//		using (var symmetricKey = new RijndaelManaged { Mode = CipherMode.CBC })
-		//		using (var decryptor = symmetricKey.CreateDecryptor(keyBytes, _initVectorBytes))
-		//		using (var memoryStream = new MemoryStream(cipherTextBytes))
-		//		using (var cryptoStream = new CryptoStream(memoryStream, decryptor, CryptoStreamMode.Read))
-		//		{
-		//			var plainTextBytes = new byte[cipherTextBytes.Length];
-		//			var decryptedByteCount = cryptoStream.Read(plainTextBytes, 0, plainTextBytes.Length);
-		//			return Encoding.UTF8.GetString(plainTextBytes, 0, decryptedByteCount);
-		//		}
-		//	}
-		//}
+	/// <summary>
+	/// Converts an ArraySegment of bytes to its bit string representation with a specified separator.
+	/// </summary>
+	/// <param name="buffer">The byte array segment.</param>
+	/// <param name="separator">The character separator between byte bits.</param>
+	/// <returns>A string representing the bits of the bytes.</returns>
+	public static string ToBitString(this ArraySegment<byte> buffer, char separator = ' ')
+		=> buffer.Array.ToBitString(buffer.Offset, buffer.Count, separator);
 
-		/// <summary>
-		/// Gets the Windows Cyrillic encoding (code page 1251).
-		/// </summary>
-		public static Encoding WindowsCyrillic => Encoding.GetEncoding(1251);
-
-		/// <summary>
-		/// Provides hexadecimal encoding functionality.
-		/// </summary>
-		public static readonly HexEncoding HexEncoding = new();
-
-		/// <summary>
-		/// Returns the duplicate strings from the provided collection, ignoring case.
-		/// </summary>
-		/// <param name="items">The collection of strings.</param>
-		/// <returns>An enumerable collection of duplicate strings.</returns>
-		public static IEnumerable<string> Duplicates(this IEnumerable<string> items)
-			=> items.GroupBy(s => s, s => StringComparer.InvariantCultureIgnoreCase).Where(g => g.Count() > 1).Select(g => g.Key);
-
-		/// <summary>
-		/// Gets the default encoding bytes for the string.
-		/// </summary>
-		/// <param name="v">The input string.</param>
-		/// <returns>The byte array in default encoding.</returns>
-		public static byte[] Default(this string v) => Encoding.Default.GetBytes(v);
-		/// <summary>
-		/// Gets the string from a byte array using the default encoding.
-		/// </summary>
-		/// <param name="v">The byte array.</param>
-		/// <returns>The string decoded from the byte array.</returns>
-		public static string Default(this byte[] v) => Default(v, 0, v.Length);
-		/// <summary>
-		/// Gets the string from a portion of the byte array using the default encoding.
-		/// </summary>
-		/// <param name="v">The byte array.</param>
-		/// <param name="index">The starting index.</param>
-		/// <param name="count">The number of bytes to decode.</param>
-		/// <returns>The decoded string.</returns>
-		public static string Default(this byte[] v, int index, int count) => Encoding.Default.GetString(v, index, count);
-		/// <summary>
-		/// Gets the string from an ArraySegment using the default encoding.
-		/// </summary>
-		/// <param name="v">The ArraySegment of bytes.</param>
-		/// <returns>The decoded string.</returns>
-		public static string Default(this ArraySegment<byte> v) => v.Array.Default(v.Offset, v.Count);
-		/// <summary>
-		/// Gets the string from a byte array using the default encoding with a specified count.
-		/// </summary>
-		/// <param name="v">The byte array.</param>
-		/// <param name="count">The number of bytes to decode.</param>
-		/// <param name="index">The starting index.</param>
-		/// <returns>The decoded string.</returns>
-		[CLSCompliant(false)]
-		public static string Default(this byte[] v, uint count, int index = 0) => Default(v, index, (int)count);
-
-		/// <summary>
-		/// Gets the ASCII encoded bytes for the string.
-		/// </summary>
-		/// <param name="v">The input string.</param>
-		/// <returns>The ASCII byte array.</returns>
-		public static byte[] ASCII(this string v) => Encoding.ASCII.GetBytes(v);
-		/// <summary>
-		/// Gets the string from a byte array using ASCII encoding.
-		/// </summary>
-		/// <param name="v">The byte array.</param>
-		/// <returns>The ASCII decoded string.</returns>
-		public static string ASCII(this byte[] v) => ASCII(v, 0, v.Length);
-		/// <summary>
-		/// Gets the string from a portion of the byte array using ASCII encoding.
-		/// </summary>
-		/// <param name="v">The byte array.</param>
-		/// <param name="index">The starting index.</param>
-		/// <param name="count">The number of bytes to decode.</param>
-		/// <returns>The decoded string.</returns>
-		public static string ASCII(this byte[] v, int index, int count) => Encoding.ASCII.GetString(v, index, count);
-		/// <summary>
-		/// Gets the string from an ArraySegment using ASCII encoding.
-		/// </summary>
-		/// <param name="v">The ArraySegment of bytes.</param>
-		/// <returns>The decoded string.</returns>
-		public static string ASCII(this ArraySegment<byte> v) => v.Array.ASCII(v.Offset, v.Count);
-		/// <summary>
-		/// Gets the string from a byte array using ASCII encoding with a specified count.
-		/// </summary>
-		/// <param name="v">The byte array.</param>
-		/// <param name="count">The number of bytes to decode.</param>
-		/// <param name="index">The starting index.</param>
-		/// <returns>The decoded string.</returns>
-		[CLSCompliant(false)]
-		public static string ASCII(this byte[] v, uint count, int index = 0) => ASCII(v, index, (int)count);
-
-		/// <summary>
-		/// Gets the UTF8 encoded bytes for the string.
-		/// </summary>
-		/// <param name="v">The input string.</param>
-		/// <returns>The UTF8 byte array.</returns>
-		public static byte[] UTF8(this string v) => Encoding.UTF8.GetBytes(v);
-		/// <summary>
-		/// Gets the string from a byte array using UTF8 encoding.
-		/// </summary>
-		/// <param name="v">The byte array.</param>
-		/// <returns>The UTF8 decoded string.</returns>
-		public static string UTF8(this byte[] v) => UTF8(v, 0, v.Length);
-		/// <summary>
-		/// Gets the string from a portion of the byte array using UTF8 encoding.
-		/// </summary>
-		/// <param name="v">The byte array.</param>
-		/// <param name="index">The starting index.</param>
-		/// <param name="count">The number of bytes to decode.</param>
-		/// <returns>The decoded string.</returns>
-		public static string UTF8(this byte[] v, int index, int count) => Encoding.UTF8.GetString(v, index, count);
-		/// <summary>
-		/// Gets the string from an ArraySegment using UTF8 encoding.
-		/// </summary>
-		/// <param name="v">The ArraySegment of bytes.</param>
-		/// <returns>The decoded string.</returns>
-		public static string UTF8(this ArraySegment<byte> v) => v.Array.UTF8(v.Offset, v.Count);
-		/// <summary>
-		/// Gets the string from a byte array using UTF8 encoding with a specified count.
-		/// </summary>
-		/// <param name="v">The byte array.</param>
-		/// <param name="count">The number of bytes to decode.</param>
-		/// <param name="index">The starting index.</param>
-		/// <returns>The decoded string.</returns>
-		[CLSCompliant(false)]
-		public static string UTF8(this byte[] v, uint count, int index = 0) => UTF8(v, index, (int)count);
-
-		/// <summary>
-		/// Gets the Unicode encoded bytes for the string.
-		/// </summary>
-		/// <param name="v">The input string.</param>
-		/// <returns>The Unicode byte array.</returns>
-		public static byte[] Unicode(this string v) => Encoding.Unicode.GetBytes(v);
-		/// <summary>
-		/// Gets the string from a byte array using Unicode encoding.
-		/// </summary>
-		/// <param name="v">The byte array.</param>
-		/// <returns>The Unicode decoded string.</returns>
-		public static string Unicode(this byte[] v) => Unicode(v, 0, v.Length);
-		/// <summary>
-		/// Gets the string from a portion of the byte array using Unicode encoding.
-		/// </summary>
-		/// <param name="v">The byte array.</param>
-		/// <param name="index">The starting index.</param>
-		/// <param name="count">The number of bytes to decode.</param>
-		/// <returns>The decoded string.</returns>
-		public static string Unicode(this byte[] v, int index, int count) => Encoding.Unicode.GetString(v, index, count);
-		/// <summary>
-		/// Gets the string from an ArraySegment using Unicode encoding.
-		/// </summary>
-		/// <param name="v">The ArraySegment of bytes.</param>
-		/// <returns>The decoded string.</returns>
-		public static string Unicode(this ArraySegment<byte> v) => v.Array.Unicode(v.Offset, v.Count);
-		/// <summary>
-		/// Gets the string from a byte array using Unicode encoding with a specified count.
-		/// </summary>
-		/// <param name="v">The byte array.</param>
-		/// <param name="count">The number of bytes to decode.</param>
-		/// <param name="index">The starting index.</param>
-		/// <returns>The decoded string.</returns>
-		[CLSCompliant(false)]
-		public static string Unicode(this byte[] v, uint count, int index = 0) => Unicode(v, index, (int)count);
-
-		/// <summary>
-		/// Gets the Windows Cyrillic encoded bytes for the string.
-		/// </summary>
-		/// <param name="v">The input string.</param>
-		/// <returns>The Windows Cyrillic byte array.</returns>
-		public static byte[] Cyrillic(this string v) => WindowsCyrillic.GetBytes(v);
-		/// <summary>
-		/// Gets the string from a byte array using Windows Cyrillic encoding.
-		/// </summary>
-		/// <param name="v">The byte array.</param>
-		/// <returns>The decoded string.</returns>
-		public static string Cyrillic(this byte[] v) => Cyrillic(v, 0, v.Length);
-		/// <summary>
-		/// Gets the string from a portion of the byte array using Windows Cyrillic encoding.
-		/// </summary>
-		/// <param name="v">The byte array.</param>
-		/// <param name="index">The starting index.</param>
-		/// <param name="count">The number of bytes to decode.</param>
-		/// <returns>The decoded string.</returns>
-		public static string Cyrillic(this byte[] v, int index, int count) => WindowsCyrillic.GetString(v, index, count);
-		/// <summary>
-		/// Gets the string from an ArraySegment using Windows Cyrillic encoding.
-		/// </summary>
-		/// <param name="v">The ArraySegment of bytes.</param>
-		/// <returns>The decoded string.</returns>
-		public static string Cyrillic(this ArraySegment<byte> v) => v.Array.Cyrillic(v.Offset, v.Count);
-		/// <summary>
-		/// Gets the string from a byte array using Windows Cyrillic encoding with a specified count.
-		/// </summary>
-		/// <param name="v">The byte array.</param>
-		/// <param name="count">The number of bytes to decode.</param>
-		/// <param name="index">The starting index.</param>
-		/// <returns>The decoded string.</returns>
-		[CLSCompliant(false)]
-		public static string Cyrillic(this byte[] v, uint count, int index = 0) => Cyrillic(v, index, (int)count);
-
-		/// <summary>
-		/// Gets the hexadecimal encoded bytes for the string.
-		/// </summary>
-		/// <param name="v">The input string.</param>
-		/// <returns>The hexadecimal byte array.</returns>
-		public static byte[] Hex(this string v) => HexEncoding.GetBytes(v);
-		/// <summary>
-		/// Gets the string from a byte array using hexadecimal encoding.
-		/// </summary>
-		/// <param name="v">The byte array.</param>
-		/// <returns>The hexadecimal decoded string.</returns>
-		public static string Hex(this byte[] v) => Hex(v, 0, v.Length);
-		/// <summary>
-		/// Gets the string from a portion of the byte array using hexadecimal encoding.
-		/// </summary>
-		/// <param name="v">The byte array.</param>
-		/// <param name="index">The starting index.</param>
-		/// <param name="count">The number of bytes to decode.</param>
-		/// <returns>The decoded hexadecimal string.</returns>
-		public static string Hex(this byte[] v, int index, int count) => HexEncoding.GetString(v, index, count);
-		/// <summary>
-		/// Gets the string from an ArraySegment using hexadecimal encoding.
-		/// </summary>
-		/// <param name="v">The ArraySegment of bytes.</param>
-		/// <returns>The decoded hexadecimal string.</returns>
-		public static string Hex(this ArraySegment<byte> v) => v.Array.Hex(v.Offset, v.Count);
-		/// <summary>
-		/// Gets the string from a byte array using hexadecimal encoding with a specified count.
-		/// </summary>
-		/// <param name="v">The byte array.</param>
-		/// <param name="count">The number of bytes to decode.</param>
-		/// <param name="index">The starting index.</param>
-		/// <returns>The decoded hexadecimal string.</returns>
-		[CLSCompliant(false)]
-		public static string Hex(this byte[] v, uint count, int index = 0) => Hex(v, index, (int)count);
-
-		/// <summary>
-		/// Decodes an ArraySegment of bytes into a string using the specified encoding.
-		/// </summary>
-		/// <param name="encoding">The encoding to use.</param>
-		/// <param name="buffer">The ArraySegment of bytes.</param>
-		/// <returns>The decoded string.</returns>
-		public static string GetString(this Encoding encoding, ArraySegment<byte> buffer)
-			=> encoding.CheckOnNull(nameof(encoding)).GetString(buffer.Array, buffer.Offset, buffer.Count);
-
-		/// <summary>
-		/// Converts the string to a SecureString.
-		/// </summary>
-		/// <param name="str">The input string.</param>
-		/// <returns>The SecureString equivalent of the input string.</returns>
-		public static SecureString Secure(this string str)
-			=> str?.ToCharArray().TypedTo<char[], SecureString>();
-
-		/// <summary>
-		/// Converts the SecureString to an unsecured string.
-		/// </summary>
-		/// <param name="str">The SecureString.</param>
-		/// <returns>The unsecured string equivalent.</returns>
-		public static string UnSecure(this SecureString str)
-		{
-			if (str is null)
-				return null;
+	/// <summary>
+	/// Converts a byte array to its bit string representation with a specified separator.
+	/// </summary>
+	/// <param name="buffer">The byte array.</param>
+	/// <param name="index">Optional start index for conversion.</param>
+	/// <param name="count">Optional count of bytes to convert.</param>
+	/// <param name="separator">The character separator between byte bits.</param>
+	/// <returns>A string representing the bits of the bytes.</returns>
+	public static string ToBitString(this byte[] buffer, int? index = null, int? count = null, char separator = ' ')
+	{
+		if (buffer is null)
+			throw new ArgumentNullException(nameof(buffer));
 
-			var bstr = Marshal.SecureStringToBSTR(str);
+		var offset = index ?? 0;
+		var len = count ?? buffer.Length;
 
-			using (bstr.MakeDisposable(Marshal.ZeroFreeBSTR))
-			{
-				return Marshal.PtrToStringBSTR(bstr);
-			}
-		}
+		if ((offset + len) > buffer.Length)
+			throw new ArgumentOutOfRangeException(nameof(index));
 
-		/// <summary>
-		/// Converts a SecureString key to a numeric identifier.
-		/// </summary>
-		/// <param name="key">The secure key.</param>
-		/// <returns>A numeric identifier or null if the key is null.</returns>
-		public static int? ToId(this SecureString key) => key?.UnSecure().GetDeterministicHashCode();
-
-		/// <summary>
-		/// Converts a character array to a string using the specified count and starting index.
-		/// </summary>
-		/// <param name="arr">The character array.</param>
-		/// <param name="count">The number of characters to convert.</param>
-		/// <param name="index">The starting index in the array.</param>
-		/// <returns>A new string constructed from the array.</returns>
-		[CLSCompliant(false)]
-		public static string ToString(this char[] arr, uint count, int index = 0)
-			=> arr.ToString((int)count, index);
-
-		/// <summary>
-		/// Converts a character array to a string using the specified count and starting index.
-		/// </summary>
-		/// <param name="arr">The character array.</param>
-		/// <param name="count">The number of characters to convert.</param>
-		/// <param name="index">The starting index in the array.</param>
-		/// <returns>A new string constructed from the array.</returns>
-		public static string ToString(this char[] arr, int count, int index = 0)
-			=> count == 0 ? string.Empty : new string(arr, index, count);
-
-		/// <summary>
-		/// Converts an ArraySegment of bytes to its bit string representation with a specified separator.
-		/// </summary>
-		/// <param name="buffer">The byte array segment.</param>
-		/// <param name="separator">The character separator between byte bits.</param>
-		/// <returns>A string representing the bits of the bytes.</returns>
-		public static string ToBitString(this ArraySegment<byte> buffer, char separator = ' ')
-			=> buffer.Array.ToBitString(buffer.Offset, buffer.Count, separator);
-
-		/// <summary>
-		/// Converts a byte array to its bit string representation with a specified separator.
-		/// </summary>
-		/// <param name="buffer">The byte array.</param>
-		/// <param name="index">Optional start index for conversion.</param>
-		/// <param name="count">Optional count of bytes to convert.</param>
-		/// <param name="separator">The character separator between byte bits.</param>
-		/// <returns>A string representing the bits of the bytes.</returns>
-		public static string ToBitString(this byte[] buffer, int? index = null, int? count = null, char separator = ' ')
-		{
-			if (buffer is null)
-				throw new ArgumentNullException(nameof(buffer));
+		if (offset == len)
+			return string.Empty;
 
-			var offset = index ?? 0;
-			var len = count ?? buffer.Length;
+		var builder = new StringBuilder();
 
-			if ((offset + len) > buffer.Length)
-				throw new ArgumentOutOfRangeException(nameof(index));
+		for (var i = 0; i < len; i++)
+		{
+			var bits = Convert.ToString(buffer[i + offset] & 0xFF, 2).PadLeft(8, '0');
 
-			if (offset == len)
-				return string.Empty;
+			builder.Append(bits).Append(separator);
+		}
 
-			var builder = new StringBuilder();
+		if (builder.Length > 0)
+			builder.Remove(builder.Length - 1, 1);
 
-			for (var i = 0; i < len; i++)
-			{
-				var bits = Convert.ToString(buffer[i + offset] & 0xFF, 2).PadLeft(8, '0');
+		return builder.ToString();
+	}
 
-				builder.Append(bits).Append(separator);
-			}
+	/// <summary>
+	/// Converts a bit string representation to a byte array.
+	/// </summary>
+	/// <param name="bitString">The string containing bits.</param>
+	/// <param name="separator">The character that separates individual byte bits.</param>
+	/// <returns>A byte array created from the bit string.</returns>
+	public static byte[] ToByteArray(this string bitString, char separator = ' ')
+	{
+		if (bitString is null)
+			throw new ArgumentNullException(nameof(bitString));
 
-			if (builder.Length > 0)
-				builder.Remove(builder.Length - 1, 1);
+		if (bitString.Length == 0)
+			return [];
 
-			return builder.ToString();
-		}
+		var bitStrings = bitString.Split(separator);
+		var bytes = new byte[bitStrings.Length];
 
-		/// <summary>
-		/// Converts a bit string representation to a byte array.
-		/// </summary>
-		/// <param name="bitString">The string containing bits.</param>
-		/// <param name="separator">The character that separates individual byte bits.</param>
-		/// <returns>A byte array created from the bit string.</returns>
-		public static byte[] ToByteArray(this string bitString, char separator = ' ')
+		for (var i = 0; i < bitStrings.Length; i++)
 		{
-			if (bitString is null)
-				throw new ArgumentNullException(nameof(bitString));
-
-			if (bitString.Length == 0)
-				return [];
+			bytes[i] = (byte)Convert.ToInt32(bitStrings[i], 2);
+		}
 
-			var bitStrings = bitString.Split(separator);
-			var bytes = new byte[bitStrings.Length];
+		return bytes;
+	}
 
-			for (var i = 0; i < bitStrings.Length; i++)
-			{
-				bytes[i] = (byte)Convert.ToInt32(bitStrings[i], 2);
-			}
+	/// <summary>
+	/// Calculates a deterministic hash code for the specified string.
+	/// </summary>
+	/// <param name="value">The string to hash.</param>
+	/// <returns>An integer hash code computed deterministically.</returns>
+	public static unsafe int GetDeterministicHashCode(this string value)
+	{
+		if (value is null)
+			throw new ArgumentNullException(nameof(value));
 
-			return bytes;
-		}
+		// decompiled code from .NET FW
+		// reason - make in stable in FW and CORE
+		// https://andrewlock.net/why-is-string-gethashcode-different-each-time-i-run-my-program-in-net-core/
 
-		/// <summary>
-		/// Calculates a deterministic hash code for the specified string.
-		/// </summary>
-		/// <param name="value">The string to hash.</param>
-		/// <returns>An integer hash code computed deterministically.</returns>
-		public static unsafe int GetDeterministicHashCode(this string value)
+		fixed (char* str = value)
 		{
-			if (value is null)
-				throw new ArgumentNullException(nameof(value));
-
-			// decompiled code from .NET FW
-			// reason - make in stable in FW and CORE
-			// https://andrewlock.net/why-is-string-gethashcode-different-each-time-i-run-my-program-in-net-core/
-
-			fixed (char* str = value)
+			char* chPtr = str;
+			
+			if (Environment.Is64BitProcess)
 			{
-				char* chPtr = str;
-				
-				if (Environment.Is64BitProcess)
-				{
-					int hash1 = 5381;
+				int hash1 = 5381;
                     int hash2 = hash1;
 
                     int c;
                     while ((c = chPtr[0]) != 0)
-					{
+				{
                         hash1 = ((hash1 << 5) + hash1) ^ c;
                         c = chPtr[1];
 
@@ -1844,215 +1844,214 @@ public static unsafe int GetDeterministicHashCode(this string value)
                     }
 
                     return hash1 + (hash2 * 1566083941);
+			}
+			else
+			{
+				int num = 352654597;
+				int num2 = num;
+				int* numPtr = (int*)chPtr;
+				int length = value.Length;
+
+				while (length > 2)
+				{
+					num = (((num << 5) + num) + (num >> 27)) ^ numPtr[0];
+					num2 = (((num2 << 5) + num2) + (num2 >> 27)) ^ numPtr[1];
+					numPtr += 2;
+					length -= 4;
 				}
-				else
+
+				if (length > 0)
 				{
-					int num = 352654597;
-					int num2 = num;
-					int* numPtr = (int*)chPtr;
-					int length = value.Length;
-
-					while (length > 2)
-					{
-						num = (((num << 5) + num) + (num >> 27)) ^ numPtr[0];
-						num2 = (((num2 << 5) + num2) + (num2 >> 27)) ^ numPtr[1];
-						numPtr += 2;
-						length -= 4;
-					}
-
-					if (length > 0)
-					{
-						num = (((num << 5) + num) + (num >> 27)) ^ numPtr[0];
-					}
-
-					return (num + (num2 * 1566083941));
+					num = (((num << 5) + num) + (num >> 27)) ^ numPtr[0];
 				}
+
+				return (num + (num2 * 1566083941));
 			}
 		}
+	}
+
+	/// <summary>
+	/// Tries to parse the string to a long integer.
+	/// </summary>
+	/// <param name="str">The string to parse.</param>
+	/// <returns>The long value if successfully parsed; otherwise, null.</returns>
+	public static long? TryToLong(this string str)
+	{
+		return long.TryParse(str, out var l) ? l : (long?)null;
+	}
+
+	/// <summary>
+	/// Searches for the specified pattern in the source string and returns the zero-based index of its first occurrence.
+	/// </summary>
+	/// <param name="source">The source string to search.</param>
+	/// <param name="pattern">The pattern to locate.</param>
+	/// <returns>The index of the first occurrence; otherwise, -1 if not found.</returns>
+	public static int FastIndexOf(this string source, string pattern)
+	{
+		if (source is null)
+			throw new ArgumentNullException(nameof(source));
+
+		if (pattern is null)
+			throw new ArgumentNullException(nameof(pattern));
+
+		if (pattern.Length == 0)
+		{
+			return 0;
+		}
 
-		/// <summary>
-		/// Tries to parse the string to a long integer.
-		/// </summary>
-		/// <param name="str">The string to parse.</param>
-		/// <returns>The long value if successfully parsed; otherwise, null.</returns>
-		public static long? TryToLong(this string str)
+		if (pattern.Length == 1)
 		{
-			return long.TryParse(str, out var l) ? l : (long?)null;
+			return source.IndexOf(pattern[0]);
 		}
 
-		/// <summary>
-		/// Searches for the specified pattern in the source string and returns the zero-based index of its first occurrence.
-		/// </summary>
-		/// <param name="source">The source string to search.</param>
-		/// <param name="pattern">The pattern to locate.</param>
-		/// <returns>The index of the first occurrence; otherwise, -1 if not found.</returns>
-		public static int FastIndexOf(this string source, string pattern)
+		int limit = source.Length - pattern.Length + 1;
+		if (limit < 1)
 		{
-			if (source is null)
-				throw new ArgumentNullException(nameof(source));
+			return -1;
+		}
 
-			if (pattern is null)
-				throw new ArgumentNullException(nameof(pattern));
+		// Store the first 2 characters of the pattern.
+		char c0 = pattern[0];
+		char c1 = pattern[1];
 
-			if (pattern.Length == 0)
+		// Find the first occurrence of the first character.
+		int first = source.IndexOf(c0, 0, limit);
+		while (first != -1)
+		{
+			// Check if the following character matches the second character of the pattern.
+			if (source[first + 1] != c1)
 			{
-				return 0;
+				first = source.IndexOf(c0, ++first, limit - first);
+				continue;
 			}
 
-			if (pattern.Length == 1)
+			// Check the rest of the pattern (starting with the 3rd character).
+			bool found = true;
+			for (int j = 2; j < pattern.Length; j++)
 			{
-				return source.IndexOf(pattern[0]);
+				if (source[first + j] != pattern[j])
+				{
+					found = false;
+					break;
+				}
 			}
 
-			int limit = source.Length - pattern.Length + 1;
-			if (limit < 1)
+			// If the entire pattern is found, return its index; otherwise, continue searching.
+			if (found)
 			{
-				return -1;
+				return first;
 			}
 
-			// Store the first 2 characters of the pattern.
-			char c0 = pattern[0];
-			char c1 = pattern[1];
+			first = source.IndexOf(c0, ++first, limit - first);
+		}
 
-			// Find the first occurrence of the first character.
-			int first = source.IndexOf(c0, 0, limit);
-			while (first != -1)
-			{
-				// Check if the following character matches the second character of the pattern.
-				if (source[first + 1] != c1)
-				{
-					first = source.IndexOf(c0, ++first, limit - first);
-					continue;
-				}
+		return -1;
+	}
 
-				// Check the rest of the pattern (starting with the 3rd character).
-				bool found = true;
-				for (int j = 2; j < pattern.Length; j++)
-				{
-					if (source[first + j] != pattern[j])
-					{
-						found = false;
-						break;
-					}
-				}
+	/// <summary>
+	/// Removes multiple consecutive whitespace characters from the specified text.
+	/// </summary>
+	/// <param name="text">The input text.</param>
+	/// <returns>A string with multiple whitespaces replaced by a single space.</returns>
+	public static string RemoveMultipleWhitespace(this string text)
+	{
+		string result = string.Empty;
+		if (text.IsEmptyOrWhiteSpace())
+		{
+			return result;
+		}
 
-				// If the entire pattern is found, return its index; otherwise, continue searching.
-				if (found)
-				{
-					return first;
-				}
+		var r = new Regex(@"\s+");
+		return r.Replace(text, @" ");
+	}
 
-				first = source.IndexOf(c0, ++first, limit - first);
-			}
+	/// <summary>
+	/// Escapes a URL string.
+	/// </summary>
+	/// <param name="url">The URL to escape.</param>
+	/// <returns>An escaped URL string.</returns>
+	[Obsolete]
+	public static string UrlEscape(this string url)
+		=> Uri.EscapeUriString(url);
 
-			return -1;
-		}
+	/// <summary>
+	/// Escapes URL data.
+	/// </summary>
+	/// <param name="url">The URL data to escape.</param>
+	/// <returns>An escaped URL data string.</returns>
+	public static string DataEscape(this string url)
+		=> Uri.EscapeDataString(url);
 
-		/// <summary>
-		/// Removes multiple consecutive whitespace characters from the specified text.
-		/// </summary>
-		/// <param name="text">The input text.</param>
-		/// <returns>A string with multiple whitespaces replaced by a single space.</returns>
-		public static string RemoveMultipleWhitespace(this string text)
-		{
-			string result = string.Empty;
-			if (text.IsEmptyOrWhiteSpace())
-			{
-				return result;
-			}
+	/// <summary>
+	/// Unescapes URL data.
+	/// </summary>
+	/// <param name="url">The URL data to unescape.</param>
+	/// <returns>An unescaped URL data string.</returns>
+	public static string DataUnEscape(this string url)
+		=> Uri.UnescapeDataString(url);
 
-			var r = new Regex(@"\s+");
-			return r.Replace(text, @" ");
-		}
+	/// <summary>
+	/// Converts the specified character to lowercase.
+	/// </summary>
+	/// <param name="c">The character to convert.</param>
+	/// <param name="invariant">If set to true, uses culture-invariant conversion; otherwise, uses current culture.</param>
+	/// <returns>The lowercase equivalent of the character.</returns>
+	public static char ToLower(this char c, bool invariant = true)
+		=> invariant ? char.ToLowerInvariant(c) : char.ToLower(c);
 
-		/// <summary>
-		/// Escapes a URL string.
-		/// </summary>
-		/// <param name="url">The URL to escape.</param>
-		/// <returns>An escaped URL string.</returns>
-		[Obsolete]
-		public static string UrlEscape(this string url)
-			=> Uri.EscapeUriString(url);
-
-		/// <summary>
-		/// Escapes URL data.
-		/// </summary>
-		/// <param name="url">The URL data to escape.</param>
-		/// <returns>An escaped URL data string.</returns>
-		public static string DataEscape(this string url)
-			=> Uri.EscapeDataString(url);
-
-		/// <summary>
-		/// Unescapes URL data.
-		/// </summary>
-		/// <param name="url">The URL data to unescape.</param>
-		/// <returns>An unescaped URL data string.</returns>
-		public static string DataUnEscape(this string url)
-			=> Uri.UnescapeDataString(url);
-
-		/// <summary>
-		/// Converts the specified character to lowercase.
-		/// </summary>
-		/// <param name="c">The character to convert.</param>
-		/// <param name="invariant">If set to true, uses culture-invariant conversion; otherwise, uses current culture.</param>
-		/// <returns>The lowercase equivalent of the character.</returns>
-		public static char ToLower(this char c, bool invariant = true)
-			=> invariant ? char.ToLowerInvariant(c) : char.ToLower(c);
-
-		/// <summary>
-		/// Converts the specified character to uppercase.
-		/// </summary>
-		/// <param name="c">The character to convert.</param>
-		/// <param name="invariant">If set to true, uses culture-invariant conversion; otherwise, uses current culture.</param>
-		/// <returns>The uppercase equivalent of the character.</returns>
-		public static char ToUpper(this char c, bool invariant = true)
-			=> invariant ? char.ToUpperInvariant(c) : char.ToUpper(c);
-
-		/// <summary>
-		/// Gets the two-letter ISO language code from the provided culture name.
-		/// </summary>
-		/// <param name="cultureName">The culture name.</param>
-		/// <returns>The two-letter ISO language code.</returns>
-		public static string GetLangCode(this string cultureName)
-			=> cultureName.To<CultureInfo>().TwoLetterISOLanguageName;
-
-		/// <summary>
-		/// Removes the specified number of characters from the end of the StringBuilder.
-		/// </summary>
-		/// <param name="builder">The StringBuilder to modify.</param>
-		/// <param name="count">The number of characters to remove.</param>
-		public static void RemoveLast(this StringBuilder builder, int count)
-			=> builder.Remove(builder.Length - count, count);
-
-		/// <summary>
-		/// Determines whether the StringBuilder is empty.
-		/// </summary>
-		/// <param name="builder">The StringBuilder to evaluate.</param>
-		/// <returns>True if the StringBuilder is empty; otherwise, false.</returns>
-		public static bool IsEmpty(this StringBuilder builder)
-			=> builder.CheckOnNull(nameof(builder)).Length == 0;
-
-		/// <summary>
-		/// Retrieves the content of the StringBuilder and then clears it.
-		/// </summary>
-		/// <param name="builder">The StringBuilder.</param>
-		/// <returns>The content of the StringBuilder before it was cleared.</returns>
-		public static string GetAndClear(this StringBuilder builder)
-		{
-			if (builder is null)
-				throw new ArgumentNullException(nameof(builder));
+	/// <summary>
+	/// Converts the specified character to uppercase.
+	/// </summary>
+	/// <param name="c">The character to convert.</param>
+	/// <param name="invariant">If set to true, uses culture-invariant conversion; otherwise, uses current culture.</param>
+	/// <returns>The uppercase equivalent of the character.</returns>
+	public static char ToUpper(this char c, bool invariant = true)
+		=> invariant ? char.ToUpperInvariant(c) : char.ToUpper(c);
 
-			var str = builder.ToString();
-			builder.Clear();
-			return str;
-		}
+	/// <summary>
+	/// Gets the two-letter ISO language code from the provided culture name.
+	/// </summary>
+	/// <param name="cultureName">The culture name.</param>
+	/// <returns>The two-letter ISO language code.</returns>
+	public static string GetLangCode(this string cultureName)
+		=> cultureName.To<CultureInfo>().TwoLetterISOLanguageName;
+
+	/// <summary>
+	/// Removes the specified number of characters from the end of the StringBuilder.
+	/// </summary>
+	/// <param name="builder">The StringBuilder to modify.</param>
+	/// <param name="count">The number of characters to remove.</param>
+	public static void RemoveLast(this StringBuilder builder, int count)
+		=> builder.Remove(builder.Length - count, count);
+
+	/// <summary>
+	/// Determines whether the StringBuilder is empty.
+	/// </summary>
+	/// <param name="builder">The StringBuilder to evaluate.</param>
+	/// <returns>True if the StringBuilder is empty; otherwise, false.</returns>
+	public static bool IsEmpty(this StringBuilder builder)
+		=> builder.CheckOnNull(nameof(builder)).Length == 0;
+
+	/// <summary>
+	/// Retrieves the content of the StringBuilder and then clears it.
+	/// </summary>
+	/// <param name="builder">The StringBuilder.</param>
+	/// <returns>The content of the StringBuilder before it was cleared.</returns>
+	public static string GetAndClear(this StringBuilder builder)
+	{
+		if (builder is null)
+			throw new ArgumentNullException(nameof(builder));
 
-		/// <summary>
-		/// Interns the specified string.
-		/// </summary>
-		/// <param name="str">The string to intern.</param>
-		/// <returns>The interned string.</returns>
-		public static string Intern(this string str)
-			=> string.Intern(str);
+		var str = builder.ToString();
+		builder.Clear();
+		return str;
 	}
+
+	/// <summary>
+	/// Interns the specified string.
+	/// </summary>
+	/// <param name="str">The string to intern.</param>
+	/// <returns>The interned string.</returns>
+	public static string Intern(this string str)
+		=> string.Intern(str);
 }
\ No newline at end of file
diff --git a/Common/SyncObject.cs b/Common/SyncObject.cs
index efef125b..7ff1411a 100644
--- a/Common/SyncObject.cs
+++ b/Common/SyncObject.cs
@@ -1,146 +1,145 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+using System;
+using System.Threading;
+
+/// <summary>
+/// Provides a synchronization object that encapsulates thread synchronization mechanisms using Monitor.
+/// </summary>
+public class SyncObject
 {
-	using System;
-	using System.Threading;
+	private bool _processed;
+	private object _state;
 
 	/// <summary>
-	/// Provides a synchronization object that encapsulates thread synchronization mechanisms using Monitor.
+	/// Attempts to enter the synchronization block, with an optional timeout.
 	/// </summary>
-	public class SyncObject
+	/// <param name="timeOut">The timeout duration. If null, the method does not specify a timeout.</param>
+	/// <returns>true if the synchronization lock was successfully acquired; otherwise, false.</returns>
+	public bool TryEnter(TimeSpan? timeOut = null)
 	{
-		private bool _processed;
-		private object _state;
-
-		/// <summary>
-		/// Attempts to enter the synchronization block, with an optional timeout.
-		/// </summary>
-		/// <param name="timeOut">The timeout duration. If null, the method does not specify a timeout.</param>
-		/// <returns>true if the synchronization lock was successfully acquired; otherwise, false.</returns>
-		public bool TryEnter(TimeSpan? timeOut = null)
-		{
-			return timeOut is null ? Monitor.TryEnter(this) : Monitor.TryEnter(this, timeOut.Value);
-		}
+		return timeOut is null ? Monitor.TryEnter(this) : Monitor.TryEnter(this, timeOut.Value);
+	}
 
-		/// <summary>
-		/// Enters the synchronization block, waiting indefinitely until the lock is acquired.
-		/// </summary>
-		public void Enter()
-		{
-			Monitor.Enter(this);
-		}
+	/// <summary>
+	/// Enters the synchronization block, waiting indefinitely until the lock is acquired.
+	/// </summary>
+	public void Enter()
+	{
+		Monitor.Enter(this);
+	}
 
-		/// <summary>
-		/// Exits the synchronization block.
-		/// </summary>
-		public void Exit()
-		{
-			Monitor.Exit(this);
-		}
+	/// <summary>
+	/// Exits the synchronization block.
+	/// </summary>
+	public void Exit()
+	{
+		Monitor.Exit(this);
+	}
 
-		/// <summary>
-		/// Sends a pulse to a single waiting thread.
-		/// </summary>
-		public void Pulse()
-		{
-			Pulse(null);
-		}
+	/// <summary>
+	/// Sends a pulse to a single waiting thread.
+	/// </summary>
+	public void Pulse()
+	{
+		Pulse(null);
+	}
 
-		/// <summary>
-		/// Sends a pulse to a single waiting thread and sets the optional state.
-		/// </summary>
-		/// <param name="state">An optional state object to pass along with the pulse.</param>
-		public void Pulse(object state)
+	/// <summary>
+	/// Sends a pulse to a single waiting thread and sets the optional state.
+	/// </summary>
+	/// <param name="state">An optional state object to pass along with the pulse.</param>
+	public void Pulse(object state)
+	{
+		lock (this)
 		{
-			lock (this)
-			{
-				_state = state;
-				Monitor.Pulse(this);
-			}
+			_state = state;
+			Monitor.Pulse(this);
 		}
+	}
 
-		/// <summary>
-		/// Sends a pulse to all waiting threads.
-		/// </summary>
-		public void PulseAll()
-		{
-			PulseAll(null);
-		}
+	/// <summary>
+	/// Sends a pulse to all waiting threads.
+	/// </summary>
+	public void PulseAll()
+	{
+		PulseAll(null);
+	}
 
-		/// <summary>
-		/// Sends a pulse to all waiting threads and sets the optional state.
-		/// </summary>
-		/// <param name="state">An optional state object to pass along with the pulse.</param>
-		public void PulseAll(object state)
+	/// <summary>
+	/// Sends a pulse to all waiting threads and sets the optional state.
+	/// </summary>
+	/// <param name="state">An optional state object to pass along with the pulse.</param>
+	public void PulseAll(object state)
+	{
+		lock (this)
 		{
-			lock (this)
-			{
-				_state = state;
-				Monitor.PulseAll(this);
-			}
+			_state = state;
+			Monitor.PulseAll(this);
 		}
+	}
 
-		/// <summary>
-		/// Signals a waiting thread by sending a pulse along with setting the processed flag.
-		/// </summary>
-		/// <param name="state">An optional state object to pass along with the pulse.</param>
-		public void PulseSignal(object state = null)
+	/// <summary>
+	/// Signals a waiting thread by sending a pulse along with setting the processed flag.
+	/// </summary>
+	/// <param name="state">An optional state object to pass along with the pulse.</param>
+	public void PulseSignal(object state = null)
+	{
+		lock (this)
 		{
-			lock (this)
-			{
-				_processed = true;
-				_state = state;
-				Monitor.Pulse(this);
-			}
+			_processed = true;
+			_state = state;
+			Monitor.Pulse(this);
 		}
+	}
 
-		/// <summary>
-		/// Waits for a pulse with an optional timeout.
-		/// </summary>
-		/// <param name="timeOut">The timeout duration. If null, waits indefinitely.</param>
-		/// <returns>true if the pulse was received; otherwise, false (in case of timeout).</returns>
-		public bool Wait(TimeSpan? timeOut = null)
-		{
-			lock (this)
-				return WaitInternal(timeOut);
-		}
+	/// <summary>
+	/// Waits for a pulse with an optional timeout.
+	/// </summary>
+	/// <param name="timeOut">The timeout duration. If null, waits indefinitely.</param>
+	/// <returns>true if the pulse was received; otherwise, false (in case of timeout).</returns>
+	public bool Wait(TimeSpan? timeOut = null)
+	{
+		lock (this)
+			return WaitInternal(timeOut);
+	}
 
-		/// <summary>
-		/// Waits for a signal with an optional timeout.
-		/// </summary>
-		/// <param name="timeOut">The timeout duration. If null, waits indefinitely.</param>
-		/// <returns>true if the signal was received; otherwise, false (in case of timeout).</returns>
-		public bool WaitSignal(TimeSpan? timeOut = null)
-		{
-			return WaitSignal(timeOut, out _);
-		}
+	/// <summary>
+	/// Waits for a signal with an optional timeout.
+	/// </summary>
+	/// <param name="timeOut">The timeout duration. If null, waits indefinitely.</param>
+	/// <returns>true if the signal was received; otherwise, false (in case of timeout).</returns>
+	public bool WaitSignal(TimeSpan? timeOut = null)
+	{
+		return WaitSignal(timeOut, out _);
+	}
 
-		/// <summary>
-		/// Waits for a signal with an optional timeout and outputs the state associated with the signal.
-		/// </summary>
-		/// <param name="timeOut">The timeout duration. If null, waits indefinitely.</param>
-		/// <param name="state">The state object passed by the signaling call.</param>
-		/// <returns>true if a signal was received; otherwise, false (in case of timeout).</returns>
-		public bool WaitSignal(TimeSpan? timeOut, out object state)
+	/// <summary>
+	/// Waits for a signal with an optional timeout and outputs the state associated with the signal.
+	/// </summary>
+	/// <param name="timeOut">The timeout duration. If null, waits indefinitely.</param>
+	/// <param name="state">The state object passed by the signaling call.</param>
+	/// <returns>true if a signal was received; otherwise, false (in case of timeout).</returns>
+	public bool WaitSignal(TimeSpan? timeOut, out object state)
+	{
+		lock (this)
 		{
-			lock (this)
-			{
-				var result = _processed || WaitInternal(timeOut);
-				_processed = false;
-				state = _state;
-				return result;
-			}
+			var result = _processed || WaitInternal(timeOut);
+			_processed = false;
+			state = _state;
+			return result;
 		}
+	}
 
-		/// <summary>
-		/// Waits internally for a pulse with an optional timeout.
-		/// </summary>
-		/// <param name="timeOut">The timeout duration. If null, waits indefinitely.</param>
-		/// <returns>true if the pulse was received; otherwise, false (in case of timeout).</returns>
-		private bool WaitInternal(TimeSpan? timeOut)
-		{
-			return timeOut is null
-				? Monitor.Wait(this)
-				: Monitor.Wait(this, timeOut.Value);
-		}
+	/// <summary>
+	/// Waits internally for a pulse with an optional timeout.
+	/// </summary>
+	/// <param name="timeOut">The timeout duration. If null, waits indefinitely.</param>
+	/// <returns>true if the pulse was received; otherwise, false (in case of timeout).</returns>
+	private bool WaitInternal(TimeSpan? timeOut)
+	{
+		return timeOut is null
+			? Monitor.Wait(this)
+			: Monitor.Wait(this, timeOut.Value);
 	}
 }
diff --git a/Common/TargetPlatformAttribute.cs b/Common/TargetPlatformAttribute.cs
index e94d3c68..807b16a3 100644
--- a/Common/TargetPlatformAttribute.cs
+++ b/Common/TargetPlatformAttribute.cs
@@ -1,20 +1,19 @@
-namespace Ecng.Common
-{
-	using System;
+namespace Ecng.Common;
+
+using System;
 
+/// <summary>
+/// Features attribute.
+/// </summary>
+/// <remarks>
+/// Initializes a new instance of the <see cref="TargetPlatformAttribute"/>.
+/// </remarks>
+/// <param name="platform">Platform.</param>
+[AttributeUsage(AttributeTargets.Class)]
+public class TargetPlatformAttribute(Platforms platform = Platforms.AnyCPU) : Attribute
+{
 	/// <summary>
-	/// Features attribute.
+	/// Platform.
 	/// </summary>
-	/// <remarks>
-	/// Initializes a new instance of the <see cref="TargetPlatformAttribute"/>.
-	/// </remarks>
-	/// <param name="platform">Platform.</param>
-	[AttributeUsage(AttributeTargets.Class)]
-	public class TargetPlatformAttribute(Platforms platform = Platforms.AnyCPU) : Attribute
-	{
-		/// <summary>
-		/// Platform.
-		/// </summary>
-		public Platforms Platform { get; } = platform;
-	}
+	public Platforms Platform { get; } = platform;
 }
\ No newline at end of file
diff --git a/Common/ThreadingHelper.cs b/Common/ThreadingHelper.cs
index be563e14..cc42e0e4 100644
--- a/Common/ThreadingHelper.cs
+++ b/Common/ThreadingHelper.cs
@@ -1,558 +1,557 @@
-namespace Ecng.Common
-{
-	using System;
-	using System.Collections.Generic;
-	using System.Globalization;
-	using System.Threading;
+namespace Ecng.Common;
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Threading;
 
+/// <summary>
+/// Provides helper methods for thread and timer operations.
+/// </summary>
+public static class ThreadingHelper
+{
 	/// <summary>
-	/// Provides helper methods for thread and timer operations.
+	/// Creates a Timer that executes the specified action with invariant culture.
 	/// </summary>
-	public static class ThreadingHelper
+	/// <param name="handler">The action to be executed by the timer.</param>
+	/// <returns>A new Timer instance.</returns>
+	public static Timer TimerInvariant(this Action handler)
 	{
-		/// <summary>
-		/// Creates a Timer that executes the specified action with invariant culture.
-		/// </summary>
-		/// <param name="handler">The action to be executed by the timer.</param>
-		/// <returns>A new Timer instance.</returns>
-		public static Timer TimerInvariant(this Action handler)
-		{
-			return handler.AsInvariant().Timer();
-		}
+		return handler.AsInvariant().Timer();
+	}
 
-		/// <summary>
-		/// Creates a Timer that executes the specified action.
-		/// </summary>
-		/// <param name="handler">The action to be executed by the timer.</param>
-		/// <returns>A new Timer instance.</returns>
-		public static Timer Timer(this Action handler)
-		{
-			if (handler is null)
-				throw new ArgumentNullException(nameof(handler));
+	/// <summary>
+	/// Creates a Timer that executes the specified action.
+	/// </summary>
+	/// <param name="handler">The action to be executed by the timer.</param>
+	/// <returns>A new Timer instance.</returns>
+	public static Timer Timer(this Action handler)
+	{
+		if (handler is null)
+			throw new ArgumentNullException(nameof(handler));
 
-			return CreateTimer(s => handler());
-		}
+		return CreateTimer(s => handler());
+	}
 
-		/// <summary>
-		/// Creates a Timer that executes the specified action with one argument.
-		/// </summary>
-		/// <typeparam name="T">The type of the argument.</typeparam>
-		/// <param name="handler">The action to be executed by the timer.</param>
-		/// <param name="arg">The argument passed to the action.</param>
-		/// <returns>A new Timer instance.</returns>
-		public static Timer Timer<T>(this Action<T> handler, T arg)
-		{
-			if (handler is null)
-				throw new ArgumentNullException(nameof(handler));
+	/// <summary>
+	/// Creates a Timer that executes the specified action with one argument.
+	/// </summary>
+	/// <typeparam name="T">The type of the argument.</typeparam>
+	/// <param name="handler">The action to be executed by the timer.</param>
+	/// <param name="arg">The argument passed to the action.</param>
+	/// <returns>A new Timer instance.</returns>
+	public static Timer Timer<T>(this Action<T> handler, T arg)
+	{
+		if (handler is null)
+			throw new ArgumentNullException(nameof(handler));
 
-			return CreateTimer(s => handler(arg));
-		}
+		return CreateTimer(s => handler(arg));
+	}
 
-		/// <summary>
-		/// Creates a Timer that executes the specified action with two arguments.
-		/// </summary>
-		/// <typeparam name="T1">The type of the first argument.</typeparam>
-		/// <typeparam name="T2">The type of the second argument.</typeparam>
-		/// <param name="handler">The action to be executed by the timer.</param>
-		/// <param name="arg1">The first argument passed to the action.</param>
-		/// <param name="arg2">The second argument passed to the action.</param>
-		/// <returns>A new Timer instance.</returns>
-		public static Timer Timer<T1, T2>(this Action<T1, T2> handler, T1 arg1, T2 arg2)
-		{
-			if (handler is null)
-				throw new ArgumentNullException(nameof(handler));
+	/// <summary>
+	/// Creates a Timer that executes the specified action with two arguments.
+	/// </summary>
+	/// <typeparam name="T1">The type of the first argument.</typeparam>
+	/// <typeparam name="T2">The type of the second argument.</typeparam>
+	/// <param name="handler">The action to be executed by the timer.</param>
+	/// <param name="arg1">The first argument passed to the action.</param>
+	/// <param name="arg2">The second argument passed to the action.</param>
+	/// <returns>A new Timer instance.</returns>
+	public static Timer Timer<T1, T2>(this Action<T1, T2> handler, T1 arg1, T2 arg2)
+	{
+		if (handler is null)
+			throw new ArgumentNullException(nameof(handler));
 
-			return CreateTimer(s => handler(arg1, arg2));
-		}
+		return CreateTimer(s => handler(arg1, arg2));
+	}
 
-		/// <summary>
-		/// Creates a Timer that executes the specified action with three arguments.
-		/// </summary>
-		/// <typeparam name="T1">The type of the first argument.</typeparam>
-		/// <typeparam name="T2">The type of the second argument.</typeparam>
-		/// <typeparam name="T3">The type of the third argument.</typeparam>
-		/// <param name="handler">The action to be executed by the timer.</param>
-		/// <param name="arg1">The first argument passed to the action.</param>
-		/// <param name="arg2">The second argument passed to the action.</param>
-		/// <param name="arg3">The third argument passed to the action.</param>
-		/// <returns>A new Timer instance.</returns>
-		public static Timer Timer<T1, T2, T3>(this Action<T1, T2, T3> handler, T1 arg1, T2 arg2, T3 arg3)
-		{
-			if (handler is null)
-				throw new ArgumentNullException(nameof(handler));
+	/// <summary>
+	/// Creates a Timer that executes the specified action with three arguments.
+	/// </summary>
+	/// <typeparam name="T1">The type of the first argument.</typeparam>
+	/// <typeparam name="T2">The type of the second argument.</typeparam>
+	/// <typeparam name="T3">The type of the third argument.</typeparam>
+	/// <param name="handler">The action to be executed by the timer.</param>
+	/// <param name="arg1">The first argument passed to the action.</param>
+	/// <param name="arg2">The second argument passed to the action.</param>
+	/// <param name="arg3">The third argument passed to the action.</param>
+	/// <returns>A new Timer instance.</returns>
+	public static Timer Timer<T1, T2, T3>(this Action<T1, T2, T3> handler, T1 arg1, T2 arg2, T3 arg3)
+	{
+		if (handler is null)
+			throw new ArgumentNullException(nameof(handler));
 
-			return CreateTimer(s => handler(arg1, arg2, arg3));
-		}
+		return CreateTimer(s => handler(arg1, arg2, arg3));
+	}
 
-		/// <summary>
-		/// Creates a Timer that executes the specified action with four arguments.
-		/// </summary>
-		/// <typeparam name="T1">The type of the first argument.</typeparam>
-		/// <typeparam name="T2">The type of the second argument.</typeparam>
-		/// <typeparam name="T3">The type of the third argument.</typeparam>
-		/// <typeparam name="T4">The type of the fourth argument.</typeparam>
-		/// <param name="handler">The action to be executed by the timer.</param>
-		/// <param name="arg1">The first argument passed to the action.</param>
-		/// <param name="arg2">The second argument passed to the action.</param>
-		/// <param name="arg3">The third argument passed to the action.</param>
-		/// <param name="arg4">The fourth argument passed to the action.</param>
-		/// <returns>A new Timer instance.</returns>
-		public static Timer Timer<T1, T2, T3, T4>(this Action<T1, T2, T3, T4> handler, T1 arg1, T2 arg2, T3 arg3, T4 arg4)
-		{
-			if (handler is null)
-				throw new ArgumentNullException(nameof(handler));
+	/// <summary>
+	/// Creates a Timer that executes the specified action with four arguments.
+	/// </summary>
+	/// <typeparam name="T1">The type of the first argument.</typeparam>
+	/// <typeparam name="T2">The type of the second argument.</typeparam>
+	/// <typeparam name="T3">The type of the third argument.</typeparam>
+	/// <typeparam name="T4">The type of the fourth argument.</typeparam>
+	/// <param name="handler">The action to be executed by the timer.</param>
+	/// <param name="arg1">The first argument passed to the action.</param>
+	/// <param name="arg2">The second argument passed to the action.</param>
+	/// <param name="arg3">The third argument passed to the action.</param>
+	/// <param name="arg4">The fourth argument passed to the action.</param>
+	/// <returns>A new Timer instance.</returns>
+	public static Timer Timer<T1, T2, T3, T4>(this Action<T1, T2, T3, T4> handler, T1 arg1, T2 arg2, T3 arg3, T4 arg4)
+	{
+		if (handler is null)
+			throw new ArgumentNullException(nameof(handler));
 
-			return CreateTimer(s => handler(arg1, arg2, arg3, arg4));
-		}
+		return CreateTimer(s => handler(arg1, arg2, arg3, arg4));
+	}
 
-		private static readonly Dictionary<Timer, TimeSpan> _intervals = [];
+	private static readonly Dictionary<Timer, TimeSpan> _intervals = [];
 
-		/// <summary>
-		/// Gets the interval associated with the specified timer.
-		/// </summary>
-		/// <param name="timer">The timer whose interval is retrieved.</param>
-		/// <returns>The TimeSpan interval of the timer.</returns>
-		public static TimeSpan Interval(this Timer timer)
+	/// <summary>
+	/// Gets the interval associated with the specified timer.
+	/// </summary>
+	/// <param name="timer">The timer whose interval is retrieved.</param>
+	/// <returns>The TimeSpan interval of the timer.</returns>
+	public static TimeSpan Interval(this Timer timer)
+	{
+		lock (_intervals)
 		{
-			lock (_intervals)
-			{
-				_intervals.TryGetValue(timer, out var interval);
-				return interval;
-			}
+			_intervals.TryGetValue(timer, out var interval);
+			return interval;
 		}
+	}
 
-		/// <summary>
-		/// Sets the start and execution interval for the specified timer.
-		/// </summary>
-		/// <param name="timer">The timer to configure.</param>
-		/// <param name="interval">The interval between timer executions.</param>
-		/// <returns>The configured timer.</returns>
-		public static Timer Interval(this Timer timer, TimeSpan interval)
-		{
-			return timer.Interval(interval, interval);
-		}
+	/// <summary>
+	/// Sets the start and execution interval for the specified timer.
+	/// </summary>
+	/// <param name="timer">The timer to configure.</param>
+	/// <param name="interval">The interval between timer executions.</param>
+	/// <returns>The configured timer.</returns>
+	public static Timer Interval(this Timer timer, TimeSpan interval)
+	{
+		return timer.Interval(interval, interval);
+	}
 
-		/// <summary>
-		/// Sets the start delay and execution interval for the specified timer.
-		/// </summary>
-		/// <param name="timer">The timer to configure.</param>
-		/// <param name="start">The start delay before the timer begins execution.</param>
-		/// <param name="interval">The interval between timer executions.</param>
-		/// <returns>The configured timer.</returns>
-		public static Timer Interval(this Timer timer, TimeSpan start, TimeSpan interval)
-		{
-			if (timer is null)
-				throw new ArgumentNullException(nameof(timer));
+	/// <summary>
+	/// Sets the start delay and execution interval for the specified timer.
+	/// </summary>
+	/// <param name="timer">The timer to configure.</param>
+	/// <param name="start">The start delay before the timer begins execution.</param>
+	/// <param name="interval">The interval between timer executions.</param>
+	/// <returns>The configured timer.</returns>
+	public static Timer Interval(this Timer timer, TimeSpan start, TimeSpan interval)
+	{
+		if (timer is null)
+			throw new ArgumentNullException(nameof(timer));
 
-			timer.Change(start, interval);
+		timer.Change(start, interval);
 
-			lock(_intervals)
-				_intervals[timer] = interval;
+		lock(_intervals)
+			_intervals[timer] = interval;
 
-			return timer;
-		}
+		return timer;
+	}
 
-		/// <summary>
-		/// Creates a Timer using the specified callback.
-		/// </summary>
-		/// <param name="callback">The TimerCallback to be executed.</param>
-		/// <returns>A new Timer instance.</returns>
-		private static Timer CreateTimer(TimerCallback callback)
-		{
-			return new Timer(callback);
-		}
+	/// <summary>
+	/// Creates a Timer using the specified callback.
+	/// </summary>
+	/// <param name="callback">The TimerCallback to be executed.</param>
+	/// <returns>A new Timer instance.</returns>
+	private static Timer CreateTimer(TimerCallback callback)
+	{
+		return new Timer(callback);
+	}
 
-		/// <summary>
-		/// Creates a Thread that executes the specified action with invariant culture.
-		/// </summary>
-		/// <param name="handler">The action to be executed by the thread.</param>
-		/// <returns>A new Thread instance.</returns>
-		public static Thread ThreadInvariant(this Action handler)
-		{
-			return handler.AsInvariant().Thread();
-		}
+	/// <summary>
+	/// Creates a Thread that executes the specified action with invariant culture.
+	/// </summary>
+	/// <param name="handler">The action to be executed by the thread.</param>
+	/// <returns>A new Thread instance.</returns>
+	public static Thread ThreadInvariant(this Action handler)
+	{
+		return handler.AsInvariant().Thread();
+	}
 
-		/// <summary>
-		/// Creates a Thread that executes the specified action.
-		/// </summary>
-		/// <param name="handler">The action to be executed by the thread.</param>
-		/// <returns>A new Thread instance.</returns>
-		public static Thread Thread(this Action handler)
-		{
-			if (handler is null)
-				throw new ArgumentNullException(nameof(handler));
+	/// <summary>
+	/// Creates a Thread that executes the specified action.
+	/// </summary>
+	/// <param name="handler">The action to be executed by the thread.</param>
+	/// <returns>A new Thread instance.</returns>
+	public static Thread Thread(this Action handler)
+	{
+		if (handler is null)
+			throw new ArgumentNullException(nameof(handler));
 
-			return CreateThread(() => handler());
-		}
+		return CreateThread(() => handler());
+	}
 
-		/// <summary>
-		/// Creates a Thread that executes the specified action with one argument.
-		/// </summary>
-		/// <typeparam name="T">The type of the argument.</typeparam>
-		/// <param name="handler">The action to be executed by the thread.</param>
-		/// <param name="arg">The argument passed to the action.</param>
-		/// <returns>A new Thread instance.</returns>
-		public static Thread Thread<T>(this Action<T> handler, T arg)
-		{
-			if (handler is null)
-				throw new ArgumentNullException(nameof(handler));
+	/// <summary>
+	/// Creates a Thread that executes the specified action with one argument.
+	/// </summary>
+	/// <typeparam name="T">The type of the argument.</typeparam>
+	/// <param name="handler">The action to be executed by the thread.</param>
+	/// <param name="arg">The argument passed to the action.</param>
+	/// <returns>A new Thread instance.</returns>
+	public static Thread Thread<T>(this Action<T> handler, T arg)
+	{
+		if (handler is null)
+			throw new ArgumentNullException(nameof(handler));
 
-			return CreateThread(() => handler(arg));
-		}
+		return CreateThread(() => handler(arg));
+	}
 
-		/// <summary>
-		/// Creates a Thread that executes the specified action with two arguments.
-		/// </summary>
-		/// <typeparam name="T1">The type of the first argument.</typeparam>
-		/// <typeparam name="T2">The type of the second argument.</typeparam>
-		/// <param name="handler">The action to be executed by the thread.</param>
-		/// <param name="arg1">The first argument passed to the action.</param>
-		/// <param name="arg2">The second argument passed to the action.</param>
-		/// <returns>A new Thread instance.</returns>
-		public static Thread Thread<T1, T2>(this Action<T1, T2> handler, T1 arg1, T2 arg2)
-		{
-			if (handler is null)
-				throw new ArgumentNullException(nameof(handler));
+	/// <summary>
+	/// Creates a Thread that executes the specified action with two arguments.
+	/// </summary>
+	/// <typeparam name="T1">The type of the first argument.</typeparam>
+	/// <typeparam name="T2">The type of the second argument.</typeparam>
+	/// <param name="handler">The action to be executed by the thread.</param>
+	/// <param name="arg1">The first argument passed to the action.</param>
+	/// <param name="arg2">The second argument passed to the action.</param>
+	/// <returns>A new Thread instance.</returns>
+	public static Thread Thread<T1, T2>(this Action<T1, T2> handler, T1 arg1, T2 arg2)
+	{
+		if (handler is null)
+			throw new ArgumentNullException(nameof(handler));
 
-			return CreateThread(() => handler(arg1, arg2));
-		}
+		return CreateThread(() => handler(arg1, arg2));
+	}
 
-		/// <summary>
-		/// Creates a Thread that executes the specified action with three arguments.
-		/// </summary>
-		/// <typeparam name="T1">The type of the first argument.</typeparam>
-		/// <typeparam name="T2">The type of the second argument.</typeparam>
-		/// <typeparam name="T3">The type of the third argument.</typeparam>
-		/// <param name="handler">The action to be executed by the thread.</param>
-		/// <param name="arg1">The first argument passed to the action.</param>
-		/// <param name="arg2">The second argument passed to the action.</param>
-		/// <param name="arg3">The third argument passed to the action.</param>
-		/// <returns>A new Thread instance.</returns>
-		public static Thread Thread<T1, T2, T3>(this Action<T1, T2, T3> handler, T1 arg1, T2 arg2, T3 arg3)
-		{
-			if (handler is null)
-				throw new ArgumentNullException(nameof(handler));
+	/// <summary>
+	/// Creates a Thread that executes the specified action with three arguments.
+	/// </summary>
+	/// <typeparam name="T1">The type of the first argument.</typeparam>
+	/// <typeparam name="T2">The type of the second argument.</typeparam>
+	/// <typeparam name="T3">The type of the third argument.</typeparam>
+	/// <param name="handler">The action to be executed by the thread.</param>
+	/// <param name="arg1">The first argument passed to the action.</param>
+	/// <param name="arg2">The second argument passed to the action.</param>
+	/// <param name="arg3">The third argument passed to the action.</param>
+	/// <returns>A new Thread instance.</returns>
+	public static Thread Thread<T1, T2, T3>(this Action<T1, T2, T3> handler, T1 arg1, T2 arg2, T3 arg3)
+	{
+		if (handler is null)
+			throw new ArgumentNullException(nameof(handler));
 
-			return CreateThread(() => handler(arg1, arg2, arg3));
-		}
+		return CreateThread(() => handler(arg1, arg2, arg3));
+	}
 
-		/// <summary>
-		/// Creates a Thread that executes the specified action with four arguments.
-		/// </summary>
-		/// <typeparam name="T1">The type of the first argument.</typeparam>
-		/// <typeparam name="T2">The type of the second argument.</typeparam>
-		/// <typeparam name="T3">The type of the third argument.</typeparam>
-		/// <typeparam name="T4">The type of the fourth argument.</typeparam>
-		/// <param name="handler">The action to be executed by the thread.</param>
-		/// <param name="arg1">The first argument passed to the action.</param>
-		/// <param name="arg2">The second argument passed to the action.</param>
-		/// <param name="arg3">The third argument passed to the action.</param>
-		/// <param name="arg4">The fourth argument passed to the action.</param>
-		/// <returns>A new Thread instance.</returns>
-		public static Thread Thread<T1, T2, T3, T4>(this Action<T1, T2, T3, T4> handler, T1 arg1, T2 arg2, T3 arg3, T4 arg4)
-		{
-			if (handler is null)
-				throw new ArgumentNullException(nameof(handler));
+	/// <summary>
+	/// Creates a Thread that executes the specified action with four arguments.
+	/// </summary>
+	/// <typeparam name="T1">The type of the first argument.</typeparam>
+	/// <typeparam name="T2">The type of the second argument.</typeparam>
+	/// <typeparam name="T3">The type of the third argument.</typeparam>
+	/// <typeparam name="T4">The type of the fourth argument.</typeparam>
+	/// <param name="handler">The action to be executed by the thread.</param>
+	/// <param name="arg1">The first argument passed to the action.</param>
+	/// <param name="arg2">The second argument passed to the action.</param>
+	/// <param name="arg3">The third argument passed to the action.</param>
+	/// <param name="arg4">The fourth argument passed to the action.</param>
+	/// <returns>A new Thread instance.</returns>
+	public static Thread Thread<T1, T2, T3, T4>(this Action<T1, T2, T3, T4> handler, T1 arg1, T2 arg2, T3 arg3, T4 arg4)
+	{
+		if (handler is null)
+			throw new ArgumentNullException(nameof(handler));
 
-			return CreateThread(() => handler(arg1, arg2, arg3, arg4));
-		}
+		return CreateThread(() => handler(arg1, arg2, arg3, arg4));
+	}
 
-		/// <summary>
-		/// Creates a new background thread using the specified start method.
-		/// </summary>
-		/// <param name="start">The ThreadStart delegate that represents the method to be invoked when the thread begins executing.</param>
-		/// <returns>A new Thread instance set as a background thread.</returns>
-		private static Thread CreateThread(ThreadStart start)
-		{
-			return new Thread(start) { IsBackground = true };
-		}
+	/// <summary>
+	/// Creates a new background thread using the specified start method.
+	/// </summary>
+	/// <param name="start">The ThreadStart delegate that represents the method to be invoked when the thread begins executing.</param>
+	/// <returns>A new Thread instance set as a background thread.</returns>
+	private static Thread CreateThread(ThreadStart start)
+	{
+		return new Thread(start) { IsBackground = true };
+	}
 
-		/// <summary>
-		/// Sets the name of the specified thread.
-		/// </summary>
-		/// <param name="thread">The thread to name.</param>
-		/// <param name="name">The name to set.</param>
-		/// <returns>The thread with the assigned name.</returns>
-		public static Thread Name(this Thread thread, string name)
-		{
-			if (thread is null)
-				throw new ArgumentNullException(nameof(thread));
+	/// <summary>
+	/// Sets the name of the specified thread.
+	/// </summary>
+	/// <param name="thread">The thread to name.</param>
+	/// <param name="name">The name to set.</param>
+	/// <returns>The thread with the assigned name.</returns>
+	public static Thread Name(this Thread thread, string name)
+	{
+		if (thread is null)
+			throw new ArgumentNullException(nameof(thread));
 
-			thread.Name = name;
-			return thread;
-		}
+		thread.Name = name;
+		return thread;
+	}
 
-		/// <summary>
-		/// Sets whether the specified thread is a background thread.
-		/// </summary>
-		/// <param name="thread">The thread to configure.</param>
-		/// <param name="isBackground">True to set the thread as a background thread; otherwise, false.</param>
-		/// <returns>The configured thread.</returns>
-		public static Thread Background(this Thread thread, bool isBackground)
-		{
-			if (thread is null)
-				throw new ArgumentNullException(nameof(thread));
+	/// <summary>
+	/// Sets whether the specified thread is a background thread.
+	/// </summary>
+	/// <param name="thread">The thread to configure.</param>
+	/// <param name="isBackground">True to set the thread as a background thread; otherwise, false.</param>
+	/// <returns>The configured thread.</returns>
+	public static Thread Background(this Thread thread, bool isBackground)
+	{
+		if (thread is null)
+			throw new ArgumentNullException(nameof(thread));
 
-			thread.IsBackground = isBackground;
-			return thread;
-		}
+		thread.IsBackground = isBackground;
+		return thread;
+	}
 
-		/// <summary>
-		/// Starts the specified thread.
-		/// </summary>
-		/// <param name="thread">The thread to start.</param>
-		/// <returns>The started thread.</returns>
-		public static Thread Launch(this Thread thread)
-		{
-			if (thread is null)
-				throw new ArgumentNullException(nameof(thread));
+	/// <summary>
+	/// Starts the specified thread.
+	/// </summary>
+	/// <param name="thread">The thread to start.</param>
+	/// <returns>The started thread.</returns>
+	public static Thread Launch(this Thread thread)
+	{
+		if (thread is null)
+			throw new ArgumentNullException(nameof(thread));
 
-			thread.Start();
-			return thread;
-		}
+		thread.Start();
+		return thread;
+	}
 
-		/// <summary>
-		/// Suspends the current thread for the specified time interval.
-		/// </summary>
-		/// <param name="timeOut">The TimeSpan for which to sleep.</param>
-		public static void Sleep(this TimeSpan timeOut)
-		{
-			if (timeOut != TimeSpan.Zero)
-				System.Threading.Thread.Sleep(timeOut);
-		}
+	/// <summary>
+	/// Suspends the current thread for the specified time interval.
+	/// </summary>
+	/// <param name="timeOut">The TimeSpan for which to sleep.</param>
+	public static void Sleep(this TimeSpan timeOut)
+	{
+		if (timeOut != TimeSpan.Zero)
+			System.Threading.Thread.Sleep(timeOut);
+	}
 
-		/// <summary>
-		/// Sets the priority of the specified thread.
-		/// </summary>
-		/// <param name="thread">The thread whose priority is to be set.</param>
-		/// <param name="priority">The thread priority to set.</param>
-		/// <returns>The thread with the updated priority.</returns>
-		public static Thread Priority(this Thread thread, ThreadPriority priority)
-		{
-			if (thread is null)
-				throw new ArgumentNullException(nameof(thread));
+	/// <summary>
+	/// Sets the priority of the specified thread.
+	/// </summary>
+	/// <param name="thread">The thread whose priority is to be set.</param>
+	/// <param name="priority">The thread priority to set.</param>
+	/// <returns>The thread with the updated priority.</returns>
+	public static Thread Priority(this Thread thread, ThreadPriority priority)
+	{
+		if (thread is null)
+			throw new ArgumentNullException(nameof(thread));
 
-			thread.Priority = priority;
-			return thread;
-		}
+		thread.Priority = priority;
+		return thread;
+	}
 
-		/// <summary>
-		/// Executes the specified action within a write lock.
-		/// </summary>
-		/// <param name="rw">The ReaderWriterLockSlim instance.</param>
-		/// <param name="handler">The action to execute within the lock.</param>
-		public static void Write(this ReaderWriterLockSlim rw, Action handler)
-		{
-			rw.TryWrite(handler, -1);
-		}
+	/// <summary>
+	/// Executes the specified action within a write lock.
+	/// </summary>
+	/// <param name="rw">The ReaderWriterLockSlim instance.</param>
+	/// <param name="handler">The action to execute within the lock.</param>
+	public static void Write(this ReaderWriterLockSlim rw, Action handler)
+	{
+		rw.TryWrite(handler, -1);
+	}
 
-		/// <summary>
-		/// Attempts to execute the specified action within a write lock.
-		/// </summary>
-		/// <param name="rw">The ReaderWriterLockSlim instance.</param>
-		/// <param name="handler">The action to execute within the lock.</param>
-		/// <param name="timeOut">The timeout in milliseconds to wait for acquiring the lock.</param>
-		/// <returns>True if the lock was acquired and the action executed; otherwise, false.</returns>
-		public static bool TryWrite(this ReaderWriterLockSlim rw, Action handler, int timeOut = 0)
-		{
-			if (rw is null)
-				throw new ArgumentNullException(nameof(rw));
+	/// <summary>
+	/// Attempts to execute the specified action within a write lock.
+	/// </summary>
+	/// <param name="rw">The ReaderWriterLockSlim instance.</param>
+	/// <param name="handler">The action to execute within the lock.</param>
+	/// <param name="timeOut">The timeout in milliseconds to wait for acquiring the lock.</param>
+	/// <returns>True if the lock was acquired and the action executed; otherwise, false.</returns>
+	public static bool TryWrite(this ReaderWriterLockSlim rw, Action handler, int timeOut = 0)
+	{
+		if (rw is null)
+			throw new ArgumentNullException(nameof(rw));
 
-			return Try(rw.TryEnterWriteLock, rw.ExitWriteLock, handler, timeOut);
-		}
+		return Try(rw.TryEnterWriteLock, rw.ExitWriteLock, handler, timeOut);
+	}
 
-		/// <summary>
-		/// Executes the specified action within a read lock.
-		/// </summary>
-		/// <param name="rw">The ReaderWriterLockSlim instance.</param>
-		/// <param name="handler">The action to execute within the read lock.</param>
-		public static void Read(this ReaderWriterLockSlim rw, Action handler)
+	/// <summary>
+	/// Executes the specified action within a read lock.
+	/// </summary>
+	/// <param name="rw">The ReaderWriterLockSlim instance.</param>
+	/// <param name="handler">The action to execute within the read lock.</param>
+	public static void Read(this ReaderWriterLockSlim rw, Action handler)
+	{
+		rw.TryRead(handler, -1);
+	}
+
+	/// <summary>
+	/// Attempts to execute the specified action within a read lock.
+	/// </summary>
+	/// <param name="rw">The ReaderWriterLockSlim instance.</param>
+	/// <param name="handler">The action to execute within the read lock.</param>
+	/// <param name="timeOut">The timeout in milliseconds to wait for acquiring the lock.</param>
+	/// <returns>True if the lock was acquired and the action executed; otherwise, false.</returns>
+	public static bool TryRead(this ReaderWriterLockSlim rw, Action handler, int timeOut = 0)
+	{
+		if (rw is null)
+			throw new ArgumentNullException(nameof(rw));
+
+		return Try(rw.TryEnterReadLock, rw.ExitReadLock, handler, timeOut);
+	}
+
+	/// <summary>
+	/// Executes the specified action within an upgradeable read lock.
+	/// </summary>
+	/// <param name="rw">The ReaderWriterLockSlim instance.</param>
+	/// <param name="handler">The action to execute within the upgradeable read lock.</param>
+	public static void Upgrade(this ReaderWriterLockSlim rw, Action handler)
+	{
+		rw.TryUpgrade(handler, -1);
+	}
+
+	/// <summary>
+	/// Attempts to execute the specified action within an upgradeable read lock.
+	/// </summary>
+	/// <param name="rw">The ReaderWriterLockSlim instance.</param>
+	/// <param name="handler">The action to execute within the upgradeable read lock.</param>
+	/// <param name="timeOut">The timeout in milliseconds to wait for acquiring the lock.</param>
+	/// <returns>True if the lock was acquired and the action executed; otherwise, false.</returns>
+	public static bool TryUpgrade(this ReaderWriterLockSlim rw, Action handler, int timeOut = 0)
+	{
+		if (rw is null)
+			throw new ArgumentNullException(nameof(rw));
+
+		return Try(rw.TryEnterUpgradeableReadLock, rw.ExitUpgradeableReadLock, handler, timeOut);
+	}
+
+	/// <summary>
+	/// Helper method to attempt entering a lock, executing an action, and releasing the lock.
+	/// </summary>
+	/// <param name="enter">Function to attempt entering the lock.</param>
+	/// <param name="exit">Action to exit the lock.</param>
+	/// <param name="handler">The action to execute once the lock is acquired.</param>
+	/// <param name="timeOut">The timeout in milliseconds to wait for the lock.</param>
+	/// <returns>True if the action is executed; otherwise, false.</returns>
+	private static bool Try(Func<int, bool> enter, Action exit, Action handler, int timeOut = 0)
+	{
+		if (handler is null)
+			throw new ArgumentNullException(nameof(handler));
+
+		if (!enter(timeOut))
+			return false;
+
+		try
+		{
+			handler();
+		}
+		finally
 		{
-			rw.TryRead(handler, -1);
+			exit();
 		}
 
+		return true;
+	}
+
+	/// <summary>
+	/// Provides a disposable wrapper for ReaderWriterLockSlim that enters a lock on creation and exits on disposal.
+	/// </summary>
+	private struct ReaderWriterLockSlimDispose : IDisposable
+	{
+		private readonly ReaderWriterLockSlim _rwLock;
+		private readonly bool _isRead;
+
 		/// <summary>
-		/// Attempts to execute the specified action within a read lock.
+		/// Initializes a new instance of the ReaderWriterLockSlimDispose struct.
 		/// </summary>
-		/// <param name="rw">The ReaderWriterLockSlim instance.</param>
-		/// <param name="handler">The action to execute within the read lock.</param>
-		/// <param name="timeOut">The timeout in milliseconds to wait for acquiring the lock.</param>
-		/// <returns>True if the lock was acquired and the action executed; otherwise, false.</returns>
-		public static bool TryRead(this ReaderWriterLockSlim rw, Action handler, int timeOut = 0)
+		/// <param name="rwLock">The ReaderWriterLockSlim instance.</param>
+		/// <param name="isRead">True to enter a read lock; false to enter a write lock.</param>
+		public ReaderWriterLockSlimDispose(ReaderWriterLockSlim rwLock, bool isRead)
 		{
-			if (rw is null)
-				throw new ArgumentNullException(nameof(rw));
+			_rwLock = rwLock ?? throw new ArgumentNullException(nameof(rwLock));
+			_isRead = isRead;
 
-			return Try(rw.TryEnterReadLock, rw.ExitReadLock, handler, timeOut);
+			if (_isRead)
+				rwLock.EnterReadLock();
+			else
+				rwLock.EnterWriteLock();
 		}
 
 		/// <summary>
-		/// Executes the specified action within an upgradeable read lock.
+		/// Exits the lock when disposed.
 		/// </summary>
-		/// <param name="rw">The ReaderWriterLockSlim instance.</param>
-		/// <param name="handler">The action to execute within the upgradeable read lock.</param>
-		public static void Upgrade(this ReaderWriterLockSlim rw, Action handler)
+		void IDisposable.Dispose()
 		{
-			rw.TryUpgrade(handler, -1);
+			if (_isRead)
+				_rwLock.ExitReadLock();
+			else
+				_rwLock.ExitWriteLock();
 		}
+	}
 
-		/// <summary>
-		/// Attempts to execute the specified action within an upgradeable read lock.
-		/// </summary>
-		/// <param name="rw">The ReaderWriterLockSlim instance.</param>
-		/// <param name="handler">The action to execute within the upgradeable read lock.</param>
-		/// <param name="timeOut">The timeout in milliseconds to wait for acquiring the lock.</param>
-		/// <returns>True if the lock was acquired and the action executed; otherwise, false.</returns>
-		public static bool TryUpgrade(this ReaderWriterLockSlim rw, Action handler, int timeOut = 0)
-		{
-			if (rw is null)
-				throw new ArgumentNullException(nameof(rw));
+	/// <summary>
+	/// Acquires a write lock and returns an IDisposable that releases the lock when disposed.
+	/// </summary>
+	/// <param name="rwLock">The ReaderWriterLockSlim instance.</param>
+	/// <returns>An IDisposable that releases the write lock.</returns>
+	public static IDisposable WriterLock(this ReaderWriterLockSlim rwLock)
+		=> new ReaderWriterLockSlimDispose(rwLock, false);
 
-			return Try(rw.TryEnterUpgradeableReadLock, rw.ExitUpgradeableReadLock, handler, timeOut);
-		}
+	/// <summary>
+	/// Acquires a read lock and returns an IDisposable that releases the lock when disposed.
+	/// </summary>
+	/// <param name="rwLock">The ReaderWriterLockSlim instance.</param>
+	/// <returns>An IDisposable that releases the read lock.</returns>
+	public static IDisposable ReaderLock(this ReaderWriterLockSlim rwLock)
+		=> new ReaderWriterLockSlimDispose(rwLock, true);
 
-		/// <summary>
-		/// Helper method to attempt entering a lock, executing an action, and releasing the lock.
-		/// </summary>
-		/// <param name="enter">Function to attempt entering the lock.</param>
-		/// <param name="exit">Action to exit the lock.</param>
-		/// <param name="handler">The action to execute once the lock is acquired.</param>
-		/// <param name="timeOut">The timeout in milliseconds to wait for the lock.</param>
-		/// <returns>True if the action is executed; otherwise, false.</returns>
-		private static bool Try(Func<int, bool> enter, Action exit, Action handler, int timeOut = 0)
-		{
-			if (handler is null)
-				throw new ArgumentNullException(nameof(handler));
+	/// <summary>
+	/// Tries to get a unique Mutex with the specified name.
+	/// </summary>
+	/// <param name="name">The name of the Mutex.</param>
+	/// <param name="mutex">When this method returns, contains the Mutex if successful.</param>
+	/// <returns>True if the Mutex is unique and acquired; otherwise, false.</returns>
+	public static bool TryGetUniqueMutex(string name, out Mutex mutex)
+	{
+		mutex = new Mutex(false, name);
 
-			if (!enter(timeOut))
+		try
+		{
+			if (!mutex.WaitOne(1))
 				return false;
 
-			try
-			{
-				handler();
-			}
-			finally
-			{
-				exit();
-			}
-
-			return true;
+			mutex = new Mutex(true, name);
 		}
-
-		/// <summary>
-		/// Provides a disposable wrapper for ReaderWriterLockSlim that enters a lock on creation and exits on disposal.
-		/// </summary>
-		private struct ReaderWriterLockSlimDispose : IDisposable
+		catch (AbandonedMutexException)
 		{
-			private readonly ReaderWriterLockSlim _rwLock;
-			private readonly bool _isRead;
-
-			/// <summary>
-			/// Initializes a new instance of the ReaderWriterLockSlimDispose struct.
-			/// </summary>
-			/// <param name="rwLock">The ReaderWriterLockSlim instance.</param>
-			/// <param name="isRead">True to enter a read lock; false to enter a write lock.</param>
-			public ReaderWriterLockSlimDispose(ReaderWriterLockSlim rwLock, bool isRead)
-			{
-				_rwLock = rwLock ?? throw new ArgumentNullException(nameof(rwLock));
-				_isRead = isRead;
-
-				if (_isRead)
-					rwLock.EnterReadLock();
-				else
-					rwLock.EnterWriteLock();
-			}
-
-			/// <summary>
-			/// Exits the lock when disposed.
-			/// </summary>
-			void IDisposable.Dispose()
-			{
-				if (_isRead)
-					_rwLock.ExitReadLock();
-				else
-					_rwLock.ExitWriteLock();
-			}
+			// http://stackoverflow.com/questions/15456986/how-to-gracefully-get-out-of-abandonedmutexexception
+			// The previous process did not release the mutex.
+			// When catching the exception, the current process becomes the owner.
 		}
 
-		/// <summary>
-		/// Acquires a write lock and returns an IDisposable that releases the lock when disposed.
-		/// </summary>
-		/// <param name="rwLock">The ReaderWriterLockSlim instance.</param>
-		/// <returns>An IDisposable that releases the write lock.</returns>
-		public static IDisposable WriterLock(this ReaderWriterLockSlim rwLock)
-			=> new ReaderWriterLockSlimDispose(rwLock, false);
+		return true;
+	}
 
-		/// <summary>
-		/// Acquires a read lock and returns an IDisposable that releases the lock when disposed.
-		/// </summary>
-		/// <param name="rwLock">The ReaderWriterLockSlim instance.</param>
-		/// <returns>An IDisposable that releases the read lock.</returns>
-		public static IDisposable ReaderLock(this ReaderWriterLockSlim rwLock)
-			=> new ReaderWriterLockSlimDispose(rwLock, true);
+	private class CultureHolder : Disposable
+	{
+		private readonly CultureInfo _culture;
 
 		/// <summary>
-		/// Tries to get a unique Mutex with the specified name.
+		/// Initializes a new instance of the CultureHolder class, capturing the current culture.
 		/// </summary>
-		/// <param name="name">The name of the Mutex.</param>
-		/// <param name="mutex">When this method returns, contains the Mutex if successful.</param>
-		/// <returns>True if the Mutex is unique and acquired; otherwise, false.</returns>
-		public static bool TryGetUniqueMutex(string name, out Mutex mutex)
-		{
-			mutex = new Mutex(false, name);
-
-			try
-			{
-				if (!mutex.WaitOne(1))
-					return false;
-
-				mutex = new Mutex(true, name);
-			}
-			catch (AbandonedMutexException)
-			{
-				// http://stackoverflow.com/questions/15456986/how-to-gracefully-get-out-of-abandonedmutexexception
-				// The previous process did not release the mutex.
-				// When catching the exception, the current process becomes the owner.
-			}
-
-			return true;
-		}
-
-		private class CultureHolder : Disposable
-		{
-			private readonly CultureInfo _culture;
-
-			/// <summary>
-			/// Initializes a new instance of the CultureHolder class, capturing the current culture.
-			/// </summary>
-			public CultureHolder() => _culture = System.Threading.Thread.CurrentThread.CurrentCulture;
-
-			/// <summary>
-			/// Restores the original culture when disposed.
-			/// </summary>
-			protected override void DisposeManaged()
-			{
-				System.Threading.Thread.CurrentThread.CurrentCulture = _culture;
-				base.DisposeManaged();
-			}
-		}
+		public CultureHolder() => _culture = System.Threading.Thread.CurrentThread.CurrentCulture;
 
 		/// <summary>
-		/// Temporarily sets the current thread's culture to the specified culture.
+		/// Restores the original culture when disposed.
 		/// </summary>
-		/// <param name="culture">The CultureInfo to be set for the current thread.</param>
-		/// <returns>An IDisposable that, when disposed, restores the original culture.</returns>
-		public static IDisposable WithCulture(CultureInfo culture)
+		protected override void DisposeManaged()
 		{
-			var holder = new CultureHolder();
-			System.Threading.Thread.CurrentThread.CurrentCulture = culture;
-			return holder;
+			System.Threading.Thread.CurrentThread.CurrentCulture = _culture;
+			base.DisposeManaged();
 		}
+	}
 
-		/// <summary>
-		/// Temporarily sets the current thread's culture to the invariant culture.
-		/// </summary>
-		/// <returns>An IDisposable that, when disposed, restores the original culture.</returns>
-		public static IDisposable WithInvariantCulture() => WithCulture(CultureInfo.InvariantCulture);
+	/// <summary>
+	/// Temporarily sets the current thread's culture to the specified culture.
+	/// </summary>
+	/// <param name="culture">The CultureInfo to be set for the current thread.</param>
+	/// <returns>An IDisposable that, when disposed, restores the original culture.</returns>
+	public static IDisposable WithCulture(CultureInfo culture)
+	{
+		var holder = new CultureHolder();
+		System.Threading.Thread.CurrentThread.CurrentCulture = culture;
+		return holder;
 	}
+
+	/// <summary>
+	/// Temporarily sets the current thread's culture to the invariant culture.
+	/// </summary>
+	/// <returns>An IDisposable that, when disposed, restores the original culture.</returns>
+	public static IDisposable WithInvariantCulture() => WithCulture(CultureInfo.InvariantCulture);
 }
\ No newline at end of file
diff --git a/Common/TimeHelper.cs b/Common/TimeHelper.cs
index 1f6fae09..7c2d888a 100644
--- a/Common/TimeHelper.cs
+++ b/Common/TimeHelper.cs
@@ -1,1075 +1,1074 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+
+/// <summary>
+/// Provides various helper methods and properties for working with dates, times, and time offsets.
+/// </summary>
+public static class TimeHelper
 {
-	using System;
-	using System.Collections.Generic;
-	using System.Diagnostics;
-	using System.Globalization;
+	private static readonly Stopwatch _timer;
+	private static readonly DateTime _start;
+	private static DateTime _startWithOffset;
+
+	static TimeHelper()
+	{
+		_start = DateTime.Now;
+		_timer = Stopwatch.StartNew();
+
+		NowOffset = TimeSpan.Zero;
+	}
 
 	/// <summary>
-	/// Provides various helper methods and properties for working with dates, times, and time offsets.
+	/// Gets the current time including the configured offset.
 	/// </summary>
-	public static class TimeHelper
-	{
-		private static readonly Stopwatch _timer;
-		private static readonly DateTime _start;
-		private static DateTime _startWithOffset;
+	public static DateTime Now => _startWithOffset + _timer.Elapsed;
 
-		static TimeHelper()
-		{
-			_start = DateTime.Now;
-			_timer = Stopwatch.StartNew();
+	/// <summary>
+	/// Gets the current time as a <see cref="DateTimeOffset"/> including the local offset.
+	/// </summary>
+	public static DateTimeOffset NowWithOffset => Now.ApplyLocal();
+
+	private static TimeSpan _nowOffset;
 
-			NowOffset = TimeSpan.Zero;
+	/// <summary>
+	/// Gets or sets the offset applied to the current time when retrieving <see cref="Now"/>.
+	/// </summary>
+	public static TimeSpan NowOffset
+	{
+		get => _nowOffset;
+		set
+		{
+			_nowOffset = value;
+			_startWithOffset = _start + value;
 		}
+	}
 
-		/// <summary>
-		/// Gets the current time including the configured offset.
-		/// </summary>
-		public static DateTime Now => _startWithOffset + _timer.Elapsed;
+	/// <summary>
+	/// Gets or sets the time zone offset used for calculations.
+	/// </summary>
+	public static TimeSpan TimeZoneOffset { get; set; } = TimeZoneInfo.Local.BaseUtcOffset;
 
-		/// <summary>
-		/// Gets the current time as a <see cref="DateTimeOffset"/> including the local offset.
-		/// </summary>
-		public static DateTimeOffset NowWithOffset => Now.ApplyLocal();
+	/// <summary>
+	/// Synchronizes the current offset by comparing local time with an NTP server.
+	/// </summary>
+	/// <param name="timeout">The synchronization timeout in milliseconds.</param>
+	public static void SyncMarketTime(int timeout = 5000)
+	{
+		var dtNow = _start + _timer.Elapsed;
+		NowOffset = new NtpClient().GetLocalTime(TimeZoneInfo.Local, timeout).Subtract(dtNow);
+	}
 
-		private static TimeSpan _nowOffset;
+	/// <summary>
+	/// Returns total weeks in the specified <see cref="TimeSpan"/>.
+	/// </summary>
+	public static double TotalWeeks(this TimeSpan value)
+	{
+		return (double)value.Ticks / TicksPerWeek;
+	}
 
-		/// <summary>
-		/// Gets or sets the offset applied to the current time when retrieving <see cref="Now"/>.
-		/// </summary>
-		public static TimeSpan NowOffset
-		{
-			get => _nowOffset;
-			set
-			{
-				_nowOffset = value;
-				_startWithOffset = _start + value;
-			}
-		}
+	/// <summary>
+	/// Returns total months in the specified <see cref="TimeSpan"/>.
+	/// </summary>
+	public static double TotalMonths(this TimeSpan value)
+	{
+		return (double)value.Ticks / TicksPerMonth;
+	}
 
-		/// <summary>
-		/// Gets or sets the time zone offset used for calculations.
-		/// </summary>
-		public static TimeSpan TimeZoneOffset { get; set; } = TimeZoneInfo.Local.BaseUtcOffset;
+	/// <summary>
+	/// Returns total years in the specified <see cref="TimeSpan"/>.
+	/// </summary>
+	public static double TotalYears(this TimeSpan value)
+	{
+		return (double)value.Ticks / TicksPerYear;
+	}
 
-		/// <summary>
-		/// Synchronizes the current offset by comparing local time with an NTP server.
-		/// </summary>
-		/// <param name="timeout">The synchronization timeout in milliseconds.</param>
-		public static void SyncMarketTime(int timeout = 5000)
-		{
-			var dtNow = _start + _timer.Elapsed;
-			NowOffset = new NtpClient().GetLocalTime(TimeZoneInfo.Local, timeout).Subtract(dtNow);
-		}
+	/// <summary>
+	/// Returns total centuries in the specified <see cref="TimeSpan"/>.
+	/// </summary>
+	public static double TotalCenturies(this TimeSpan value)
+	{
+		return (double)value.Ticks / TicksPerCentury;
+	}
 
-		/// <summary>
-		/// Returns total weeks in the specified <see cref="TimeSpan"/>.
-		/// </summary>
-		public static double TotalWeeks(this TimeSpan value)
-		{
-			return (double)value.Ticks / TicksPerWeek;
-		}
+	/// <summary>
+	/// Returns total millenniums in the specified <see cref="TimeSpan"/>.
+	/// </summary>
+	public static double TotalMilleniums(this TimeSpan value)
+	{
+		return (double)value.Ticks / TicksPerMillenium;
+	}
 
-		/// <summary>
-		/// Returns total months in the specified <see cref="TimeSpan"/>.
-		/// </summary>
-		public static double TotalMonths(this TimeSpan value)
-		{
-			return (double)value.Ticks / TicksPerMonth;
-		}
+	/// <summary>
+	/// Represents the number of ticks in 1 nanosecond.
+	/// </summary>
+	public const double TicksPerNanosecond = 1.0 / NanosecondsPerTick;
 
-		/// <summary>
-		/// Returns total years in the specified <see cref="TimeSpan"/>.
-		/// </summary>
-		public static double TotalYears(this TimeSpan value)
-		{
-			return (double)value.Ticks / TicksPerYear;
-		}
+	/// <summary>
+	/// Represents the number of nanoseconds in 1 tick.
+	/// </summary>
+	public const long NanosecondsPerTick = 100;
 
-		/// <summary>
-		/// Returns total centuries in the specified <see cref="TimeSpan"/>.
-		/// </summary>
-		public static double TotalCenturies(this TimeSpan value)
-		{
-			return (double)value.Ticks / TicksPerCentury;
-		}
+	/// <summary>
+	/// Represents the number of ticks in 1 microsecond.
+	/// </summary>
+	public const long TicksPerMicrosecond = TimeSpan.TicksPerMillisecond / 1000;
 
-		/// <summary>
-		/// Returns total millenniums in the specified <see cref="TimeSpan"/>.
-		/// </summary>
-		public static double TotalMilleniums(this TimeSpan value)
-		{
-			return (double)value.Ticks / TicksPerMillenium;
-		}
+	/// <summary>
+	/// Represents the number of ticks in 1 week.
+	/// </summary>
+	public const long TicksPerWeek = TimeSpan.TicksPerDay * 7;
 
-		/// <summary>
-		/// Represents the number of ticks in 1 nanosecond.
-		/// </summary>
-		public const double TicksPerNanosecond = 1.0 / NanosecondsPerTick;
-
-		/// <summary>
-		/// Represents the number of nanoseconds in 1 tick.
-		/// </summary>
-		public const long NanosecondsPerTick = 100;
-
-		/// <summary>
-		/// Represents the number of ticks in 1 microsecond.
-		/// </summary>
-		public const long TicksPerMicrosecond = TimeSpan.TicksPerMillisecond / 1000;
-
-		/// <summary>
-		/// Represents the number of ticks in 1 week.
-		/// </summary>
-		public const long TicksPerWeek = TimeSpan.TicksPerDay * 7;
-
-		/// <summary>
-		/// Represents the number of ticks in 1 month.
-		/// </summary>
-		public const long TicksPerMonth = TimeSpan.TicksPerDay * 30;
-
-		/// <summary>
-		/// Represents the number of ticks in 1 year.
-		/// </summary>
-		public const long TicksPerYear = TimeSpan.TicksPerDay * 365;
-
-		/// <summary>
-		/// Represents the number of ticks in 1 century.
-		/// </summary>
-		public const long TicksPerCentury = TicksPerYear * 100;
-
-		/// <summary>
-		/// Represents the number of ticks in 1 millenium.
-		/// </summary>
-		public const long TicksPerMillenium = TicksPerCentury * 10;
-
-		/// <summary>
-		/// A <see cref="TimeSpan"/> of one minute.
-		/// </summary>
-		public static readonly TimeSpan Minute1 = TimeSpan.FromMinutes(1);
-
-		/// <summary>
-		/// A <see cref="TimeSpan"/> of five minutes.
-		/// </summary>
-		public static readonly TimeSpan Minute5 = TimeSpan.FromMinutes(5);
-
-		/// <summary>
-		/// A <see cref="TimeSpan"/> of ten minutes.
-		/// </summary>
-		public static readonly TimeSpan Minute10 = TimeSpan.FromMinutes(10);
-
-		/// <summary>
-		/// A <see cref="TimeSpan"/> of fifteen minutes.
-		/// </summary>
-		public static readonly TimeSpan Minute15 = TimeSpan.FromMinutes(15);
-
-		/// <summary>
-		/// A <see cref="TimeSpan"/> of one hour.
-		/// </summary>
-		public static readonly TimeSpan Hour = TimeSpan.FromHours(1);
-
-		/// <summary>
-		/// A <see cref="TimeSpan"/> of one day.
-		/// </summary>
-		public static readonly TimeSpan Day = TimeSpan.FromDays(1);
-
-		/// <summary>
-		/// A <see cref="TimeSpan"/> of one week (7 days).
-		/// </summary>
-		public static readonly TimeSpan Week = TimeSpan.FromTicks(TicksPerWeek);
-
-		/// <summary>
-		/// A <see cref="TimeSpan"/> of one month (30 days).
-		/// </summary>
-		public static readonly TimeSpan Month = TimeSpan.FromTicks(TicksPerMonth);
-
-		/// <summary>
-		/// A <see cref="TimeSpan"/> of one year (365 days).
-		/// </summary>
-		public static readonly TimeSpan Year = TimeSpan.FromTicks(TicksPerYear);
-
-		/// <summary>
-		/// A <see cref="TimeSpan"/> that is one tick less than a day.
-		/// </summary>
-		public static readonly TimeSpan LessOneDay = TimeSpan.FromTicks(TimeSpan.TicksPerDay - 1);
-
-		/// <summary>
-		/// Gets the microseconds component from a <see cref="TimeSpan"/>.
-		/// </summary>
-		public static int GetMicroseconds(this TimeSpan ts)
-		{
-			return (int)(TicksToMicroseconds(ts.Ticks) % 1000);
-		}
+	/// <summary>
+	/// Represents the number of ticks in 1 month.
+	/// </summary>
+	public const long TicksPerMonth = TimeSpan.TicksPerDay * 30;
 
-		/// <summary>
-		/// Gets the microseconds component from a <see cref="DateTime"/>.
-		/// </summary>
-		public static int GetMicroseconds(this DateTime dt)
-		{
-			return (int)(TicksToMicroseconds(dt.Ticks) % 1000);
-		}
+	/// <summary>
+	/// Represents the number of ticks in 1 year.
+	/// </summary>
+	public const long TicksPerYear = TimeSpan.TicksPerDay * 365;
 
-		/// <summary>
-		/// Gets the nanoseconds component from a <see cref="TimeSpan"/>.
-		/// </summary>
-		public static int GetNanoseconds(this TimeSpan ts)
-		{
-			return GetNanoseconds(ts.Ticks);
-		}
+	/// <summary>
+	/// Represents the number of ticks in 1 century.
+	/// </summary>
+	public const long TicksPerCentury = TicksPerYear * 100;
 
-		/// <summary>
-		/// Gets the nanoseconds component from a <see cref="DateTime"/>.
-		/// </summary>
-		public static int GetNanoseconds(this DateTime dt)
-		{
-			return GetNanoseconds(dt.Ticks);
-		}
+	/// <summary>
+	/// Represents the number of ticks in 1 millenium.
+	/// </summary>
+	public const long TicksPerMillenium = TicksPerCentury * 10;
 
-		/// <summary>
-		/// Gets the nanoseconds component from the specified number of ticks.
-		/// </summary>
-		public static int GetNanoseconds(this long ticks)
-		{
-			return (int)((ticks % 10) * NanosecondsPerTick);
-		}
+	/// <summary>
+	/// A <see cref="TimeSpan"/> of one minute.
+	/// </summary>
+	public static readonly TimeSpan Minute1 = TimeSpan.FromMinutes(1);
 
-		/// <summary>
-		/// Converts a <see cref="TimeSpan"/> to the total number of nanoseconds.
-		/// </summary>
-		public static long ToNanoseconds(this TimeSpan ts)
-		{
-			return TicksToNanoseconds(ts.Ticks);
-		}
+	/// <summary>
+	/// A <see cref="TimeSpan"/> of five minutes.
+	/// </summary>
+	public static readonly TimeSpan Minute5 = TimeSpan.FromMinutes(5);
 
-		/// <summary>
-		/// Converts a <see cref="DateTime"/> to the total number of nanoseconds.
-		/// </summary>
-		public static long ToNanoseconds(this DateTime dt)
-		{
-			return TicksToNanoseconds(dt.Ticks);
-		}
+	/// <summary>
+	/// A <see cref="TimeSpan"/> of ten minutes.
+	/// </summary>
+	public static readonly TimeSpan Minute10 = TimeSpan.FromMinutes(10);
 
-		/// <summary>
-		/// Converts nanoseconds to ticks.
-		/// </summary>
-		public static long NanosecondsToTicks(this long nanoseconds)
-		{
-			return nanoseconds / NanosecondsPerTick;
-		}
+	/// <summary>
+	/// A <see cref="TimeSpan"/> of fifteen minutes.
+	/// </summary>
+	public static readonly TimeSpan Minute15 = TimeSpan.FromMinutes(15);
 
-		/// <summary>
-		/// Converts ticks to nanoseconds.
-		/// </summary>
-		public static long TicksToNanoseconds(this long ticks)
-		{
-			return checked(ticks * NanosecondsPerTick);
-		}
+	/// <summary>
+	/// A <see cref="TimeSpan"/> of one hour.
+	/// </summary>
+	public static readonly TimeSpan Hour = TimeSpan.FromHours(1);
 
-		/// <summary>
-		/// Adds the specified number of nanoseconds to a <see cref="TimeSpan"/>.
-		/// </summary>
-		public static TimeSpan AddNanoseconds(this TimeSpan t, long nanoseconds)
-		{
-			return t + TimeSpan.FromTicks(NanosecondsToTicks(nanoseconds));
-		}
+	/// <summary>
+	/// A <see cref="TimeSpan"/> of one day.
+	/// </summary>
+	public static readonly TimeSpan Day = TimeSpan.FromDays(1);
 
-		/// <summary>
-		/// Adds the specified number of nanoseconds to a <see cref="DateTime"/>.
-		/// </summary>
-		public static DateTime AddNanoseconds(this DateTime dt, long nanoseconds)
-		{
-			return dt.AddTicks(NanosecondsToTicks(nanoseconds));
-		}
+	/// <summary>
+	/// A <see cref="TimeSpan"/> of one week (7 days).
+	/// </summary>
+	public static readonly TimeSpan Week = TimeSpan.FromTicks(TicksPerWeek);
 
-		/// <summary>
-		/// Adds the specified number of nanoseconds to a <see cref="DateTimeOffset"/>.
-		/// </summary>
-		public static DateTimeOffset AddNanoseconds(this DateTimeOffset dto, long nanoseconds)
-		{
-			return dto.AddTicks(NanosecondsToTicks(nanoseconds));
-		}
+	/// <summary>
+	/// A <see cref="TimeSpan"/> of one month (30 days).
+	/// </summary>
+	public static readonly TimeSpan Month = TimeSpan.FromTicks(TicksPerMonth);
 
-		/// <summary>
-		/// Converts microseconds to ticks.
-		/// </summary>
-		public static long MicrosecondsToTicks(this long mcs)
-		{
-			return mcs * TicksPerMicrosecond;
-		}
+	/// <summary>
+	/// A <see cref="TimeSpan"/> of one year (365 days).
+	/// </summary>
+	public static readonly TimeSpan Year = TimeSpan.FromTicks(TicksPerYear);
 
-		/// <summary>
-		/// Converts ticks to microseconds.
-		/// </summary>
-		public static long TicksToMicroseconds(this long ticks)
-		{
-			return ticks / TicksPerMicrosecond;
-		}
+	/// <summary>
+	/// A <see cref="TimeSpan"/> that is one tick less than a day.
+	/// </summary>
+	public static readonly TimeSpan LessOneDay = TimeSpan.FromTicks(TimeSpan.TicksPerDay - 1);
 
-		/// <summary>
-		/// Adds the specified number of microseconds to a <see cref="TimeSpan"/>.
-		/// </summary>
-		public static TimeSpan AddMicroseconds(this TimeSpan t, long microseconds)
-		{
-			return t + TimeSpan.FromTicks(MicrosecondsToTicks(microseconds));
-		}
+	/// <summary>
+	/// Gets the microseconds component from a <see cref="TimeSpan"/>.
+	/// </summary>
+	public static int GetMicroseconds(this TimeSpan ts)
+	{
+		return (int)(TicksToMicroseconds(ts.Ticks) % 1000);
+	}
 
-		/// <summary>
-		/// Adds the specified number of microseconds to a <see cref="DateTime"/>.
-		/// </summary>
-		public static DateTime AddMicroseconds(this DateTime dt, long microseconds)
-		{
-			return dt.AddTicks(MicrosecondsToTicks(microseconds));
-		}
+	/// <summary>
+	/// Gets the microseconds component from a <see cref="DateTime"/>.
+	/// </summary>
+	public static int GetMicroseconds(this DateTime dt)
+	{
+		return (int)(TicksToMicroseconds(dt.Ticks) % 1000);
+	}
 
-		/// <summary>
-		/// Adds the specified number of microseconds to a <see cref="DateTimeOffset"/>.
-		/// </summary>
-		public static DateTimeOffset AddMicroseconds(this DateTimeOffset dto, long microseconds)
-		{
-			return dto.AddTicks(MicrosecondsToTicks(microseconds));
-		}
+	/// <summary>
+	/// Gets the nanoseconds component from a <see cref="TimeSpan"/>.
+	/// </summary>
+	public static int GetNanoseconds(this TimeSpan ts)
+	{
+		return GetNanoseconds(ts.Ticks);
+	}
+
+	/// <summary>
+	/// Gets the nanoseconds component from a <see cref="DateTime"/>.
+	/// </summary>
+	public static int GetNanoseconds(this DateTime dt)
+	{
+		return GetNanoseconds(dt.Ticks);
+	}
+
+	/// <summary>
+	/// Gets the nanoseconds component from the specified number of ticks.
+	/// </summary>
+	public static int GetNanoseconds(this long ticks)
+	{
+		return (int)((ticks % 10) * NanosecondsPerTick);
+	}
 
-		/// <summary>
-		/// Truncates a <see cref="DateTime"/> to the specified ticks precision.
-		/// </summary>
-		public static DateTime Truncate(this DateTime time, long precision)
+	/// <summary>
+	/// Converts a <see cref="TimeSpan"/> to the total number of nanoseconds.
+	/// </summary>
+	public static long ToNanoseconds(this TimeSpan ts)
+	{
+		return TicksToNanoseconds(ts.Ticks);
+	}
+
+	/// <summary>
+	/// Converts a <see cref="DateTime"/> to the total number of nanoseconds.
+	/// </summary>
+	public static long ToNanoseconds(this DateTime dt)
+	{
+		return TicksToNanoseconds(dt.Ticks);
+	}
+
+	/// <summary>
+	/// Converts nanoseconds to ticks.
+	/// </summary>
+	public static long NanosecondsToTicks(this long nanoseconds)
+	{
+		return nanoseconds / NanosecondsPerTick;
+	}
+
+	/// <summary>
+	/// Converts ticks to nanoseconds.
+	/// </summary>
+	public static long TicksToNanoseconds(this long ticks)
+	{
+		return checked(ticks * NanosecondsPerTick);
+	}
+
+	/// <summary>
+	/// Adds the specified number of nanoseconds to a <see cref="TimeSpan"/>.
+	/// </summary>
+	public static TimeSpan AddNanoseconds(this TimeSpan t, long nanoseconds)
+	{
+		return t + TimeSpan.FromTicks(NanosecondsToTicks(nanoseconds));
+	}
+
+	/// <summary>
+	/// Adds the specified number of nanoseconds to a <see cref="DateTime"/>.
+	/// </summary>
+	public static DateTime AddNanoseconds(this DateTime dt, long nanoseconds)
+	{
+		return dt.AddTicks(NanosecondsToTicks(nanoseconds));
+	}
+
+	/// <summary>
+	/// Adds the specified number of nanoseconds to a <see cref="DateTimeOffset"/>.
+	/// </summary>
+	public static DateTimeOffset AddNanoseconds(this DateTimeOffset dto, long nanoseconds)
+	{
+		return dto.AddTicks(NanosecondsToTicks(nanoseconds));
+	}
+
+	/// <summary>
+	/// Converts microseconds to ticks.
+	/// </summary>
+	public static long MicrosecondsToTicks(this long mcs)
+	{
+		return mcs * TicksPerMicrosecond;
+	}
+
+	/// <summary>
+	/// Converts ticks to microseconds.
+	/// </summary>
+	public static long TicksToMicroseconds(this long ticks)
+	{
+		return ticks / TicksPerMicrosecond;
+	}
+
+	/// <summary>
+	/// Adds the specified number of microseconds to a <see cref="TimeSpan"/>.
+	/// </summary>
+	public static TimeSpan AddMicroseconds(this TimeSpan t, long microseconds)
+	{
+		return t + TimeSpan.FromTicks(MicrosecondsToTicks(microseconds));
+	}
+
+	/// <summary>
+	/// Adds the specified number of microseconds to a <see cref="DateTime"/>.
+	/// </summary>
+	public static DateTime AddMicroseconds(this DateTime dt, long microseconds)
+	{
+		return dt.AddTicks(MicrosecondsToTicks(microseconds));
+	}
+
+	/// <summary>
+	/// Adds the specified number of microseconds to a <see cref="DateTimeOffset"/>.
+	/// </summary>
+	public static DateTimeOffset AddMicroseconds(this DateTimeOffset dto, long microseconds)
+	{
+		return dto.AddTicks(MicrosecondsToTicks(microseconds));
+	}
+
+	/// <summary>
+	/// Truncates a <see cref="DateTime"/> to the specified ticks precision.
+	/// </summary>
+	public static DateTime Truncate(this DateTime time, long precision)
+	{
+		return time.AddTicks(-(time.Ticks % precision));
+	}
+
+	/// <summary>
+	/// Truncates a <see cref="DateTime"/> to the specified time span precision.
+	/// </summary>
+	public static DateTime Truncate(this DateTime dateTime, TimeSpan timeSpan)
+	{
+		return dateTime.Truncate(timeSpan.Ticks);
+	}
+
+	/// <summary>
+	/// Truncates a <see cref="TimeSpan"/> to the specified ticks precision.
+	/// </summary>
+	public static TimeSpan Truncate(this TimeSpan time, long precision)
+	{
+		return TimeSpan.FromTicks(time.Ticks - (time.Ticks % precision));
+	}
+
+	/// <summary>
+	/// Truncates a <see cref="TimeSpan"/> to the specified time span precision.
+	/// </summary>
+	public static TimeSpan Truncate(this TimeSpan dateTime, TimeSpan timeSpan)
+	{
+		return dateTime.Truncate(timeSpan.Ticks);
+	}
+
+	/// <summary>
+	/// Generates a sequence of <see cref="DateTime"/> values from a start to an end with a given interval.
+	/// </summary>
+	/// <param name="from">Start date.</param>
+	/// <param name="to">End date.</param>
+	/// <param name="interval">The interval between generated dates.</param>
+	/// <returns>An enumerable of dates.</returns>
+	public static IEnumerable<DateTime> Range(this DateTime from, DateTime to, TimeSpan interval)
+	{
+		if (interval <= TimeSpan.Zero)
+			throw new ArgumentOutOfRangeException(nameof(interval), interval, "Invalid value.");
+
+		while (from <= to)
 		{
-			return time.AddTicks(-(time.Ticks % precision));
+			yield return from;
+
+			from += interval;
 		}
+	}
+
+	/// <summary>
+	/// Gets the number of days in the month of the given <see cref="DateTime"/>.
+	/// </summary>
+	public static int DaysInMonth(this DateTime date)
+	{
+		return DateTime.DaysInMonth(date.Year, date.Month);
+	}
+
+	/// <summary>
+	/// Changes the <see cref="DateTimeKind"/> of a <see cref="DateTime"/>.
+	/// </summary>
+	public static DateTime ChangeKind(this DateTime date, DateTimeKind kind = DateTimeKind.Unspecified)
+	{
+		return DateTime.SpecifyKind(date, kind);
+	}
+
+	/// <summary>
+	/// Converts a <see cref="DateTime"/> to UTC kind.
+	/// </summary>
+	public static DateTime UtcKind(this DateTime date)
+	{
+		return date.ChangeKind(DateTimeKind.Utc);
+	}
+
+	// http://stackoverflow.com/questions/38039/how-can-i-get-the-datetime-for-the-start-of-the-week
+
+	/// <summary>
+	/// Gets the start of the week for the specified <see cref="DateTime"/>, based on a chosen <see cref="System.DayOfWeek"/>.
+	/// </summary>
+	public static DateTime StartOfWeek(this DateTime date, DayOfWeek startOfWeek)
+	{
+		var diff = date.DayOfWeek - startOfWeek;
+
+		if (diff < 0)
+			diff += 7;
+
+		return date.AddDays(-1 * diff).Date;
+	}
+
+	/// <summary>
+	/// Gets the end of the day for the specified <see cref="DateTime"/>, just before midnight.
+	/// </summary>
+	public static DateTime EndOfDay(this DateTime dt)
+	{
+		return dt.Date + LessOneDay;
+	}
+
+	/// <summary>
+	/// Gets the end of the day for the specified <see cref="DateTimeOffset"/>, just before midnight.
+	/// </summary>
+	public static DateTimeOffset EndOfDay(this DateTimeOffset dto)
+	{
+		return new DateTimeOffset(dto.Date.EndOfDay(), dto.Offset);
+	}
+
+	/// <summary>
+	/// Represents a reference start date (1/1/1970, UTC).
+	/// </summary>
+	public static readonly DateTime GregorianStart = new(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc);
+
+	/// <summary>
+	/// Represents the Eastern Standard Time zone.
+	/// </summary>
+	public static readonly TimeZoneInfo Est = "Eastern Standard Time".To<TimeZoneInfo>();
+
+	/// <summary>
+	/// Represents the Central Standard Time zone.
+	/// </summary>
+	public static readonly TimeZoneInfo Cst = "Central Standard Time".To<TimeZoneInfo>();
+
+	/// <summary>
+	/// Represents the Russian Standard Time zone (Moscow).
+	/// </summary>
+	public static readonly TimeZoneInfo Moscow = "Russian Standard Time".To<TimeZoneInfo>();
+
+	/// <summary>
+	/// Represents the GMT Standard Time zone.
+	/// </summary>
+	public static readonly TimeZoneInfo Gmt = "GMT Standard Time".To<TimeZoneInfo>();
+
+	/// <summary>
+	/// Represents the FLE (Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius) Standard Time zone.
+	/// </summary>
+	public static readonly TimeZoneInfo Fle = "FLE Standard Time".To<TimeZoneInfo>();
+
+	/// <summary>
+	/// Represents the China Standard Time zone.
+	/// </summary>
+	public static readonly TimeZoneInfo China = "China Standard Time".To<TimeZoneInfo>();
+
+	/// <summary>
+	/// Represents the Korea Standard Time zone.
+	/// </summary>
+	public static readonly TimeZoneInfo Korea = "Korea Standard Time".To<TimeZoneInfo>();
+
+	/// <summary>
+	/// Represents the Tokyo Standard Time zone.
+	/// </summary>
+	public static readonly TimeZoneInfo Tokyo = "Tokyo Standard Time".To<TimeZoneInfo>();
+
+	/// <summary>
+	/// Represents the West Central Africa Standard Time zone (Tunisia).
+	/// </summary>
+	public static readonly TimeZoneInfo Tunisia = "W. Central Africa Standard Time".To<TimeZoneInfo>();
+
+	/// <summary>
+	/// Converts a <see cref="DateTime"/> between time zones.
+	/// </summary>
+	public static DateTime To(this DateTime time, TimeZoneInfo source = null, TimeZoneInfo destination = null)
+	{
+		if (source is null)
+			source = time.Kind == DateTimeKind.Utc ? TimeZoneInfo.Utc : TimeZoneInfo.Local;
 
-		/// <summary>
-		/// Truncates a <see cref="DateTime"/> to the specified time span precision.
-		/// </summary>
-		public static DateTime Truncate(this DateTime dateTime, TimeSpan timeSpan)
+		return TimeZoneInfo.ConvertTime(time, source, destination ?? TimeZoneInfo.Utc);
+	}
+
+	/// <summary>
+	/// Attempts to convert a string to a <see cref="DateTime"/> using the provided format.
+	/// </summary>
+	public static DateTime? TryToDateTime(this string value, string format, CultureInfo ci = null)
+	{
+		if (value.IsEmpty())
+			return null;
+
+		return value.ToDateTime(format, ci);
+	}
+
+	/// <summary>
+	/// Converts a string to a <see cref="DateTime"/> using the provided format.
+	/// </summary>
+	public static DateTime ToDateTime(this string value, string format, CultureInfo ci = null)
+	{
+		try
 		{
-			return dateTime.Truncate(timeSpan.Ticks);
+			return DateTime.ParseExact(value, format, ci ?? CultureInfo.InvariantCulture);
 		}
-
-		/// <summary>
-		/// Truncates a <see cref="TimeSpan"/> to the specified ticks precision.
-		/// </summary>
-		public static TimeSpan Truncate(this TimeSpan time, long precision)
+		catch (Exception ex)
 		{
-			return TimeSpan.FromTicks(time.Ticks - (time.Ticks % precision));
+			throw new InvalidCastException($"Cannot convert {value} with format {format} to {typeof(DateTime).Name}.", ex);
 		}
+	}
+
+	/// <summary>
+	/// Formats a <see cref="DateTime"/> to a string using the provided format.
+	/// </summary>
+	public static string FromDateTime(this DateTime dt, string format, CultureInfo ci = null)
+	{
+		return dt.ToString(format, ci ?? CultureInfo.InvariantCulture);
+	}
 
-		/// <summary>
-		/// Truncates a <see cref="TimeSpan"/> to the specified time span precision.
-		/// </summary>
-		public static TimeSpan Truncate(this TimeSpan dateTime, TimeSpan timeSpan)
+	/// <summary>
+	/// Attempts to convert a string to a <see cref="TimeSpan"/> using the provided format.
+	/// </summary>
+	public static TimeSpan? TryToTimeSpan(this string value, string format, CultureInfo ci = null)
+	{
+		if (value.IsEmpty())
+			return null;
+
+		return value.ToTimeSpan(format, ci);
+	}
+
+	/// <summary>
+	/// Converts a string to a <see cref="TimeSpan"/> using the provided format.
+	/// </summary>
+	public static TimeSpan ToTimeSpan(this string value, string format, CultureInfo ci = null)
+	{
+		try
 		{
-			return dateTime.Truncate(timeSpan.Ticks);
+			return TimeSpan.ParseExact(value, format, ci ?? CultureInfo.InvariantCulture);
 		}
-
-		/// <summary>
-		/// Generates a sequence of <see cref="DateTime"/> values from a start to an end with a given interval.
-		/// </summary>
-		/// <param name="from">Start date.</param>
-		/// <param name="to">End date.</param>
-		/// <param name="interval">The interval between generated dates.</param>
-		/// <returns>An enumerable of dates.</returns>
-		public static IEnumerable<DateTime> Range(this DateTime from, DateTime to, TimeSpan interval)
+		catch (Exception ex)
 		{
-			if (interval <= TimeSpan.Zero)
-				throw new ArgumentOutOfRangeException(nameof(interval), interval, "Invalid value.");
+			throw new InvalidCastException($"Cannot convert {value} with format {format} to {typeof(TimeSpan).Name}.", ex);
+		}
+	}
 
-			while (from <= to)
-			{
-				yield return from;
+	/// <summary>
+	/// Formats a <see cref="TimeSpan"/> to a string using the provided format.
+	/// </summary>
+	public static string FromTimeSpan(this TimeSpan ts, string format, CultureInfo ci = null)
+	{
+		return ts.ToString(format, ci ?? CultureInfo.InvariantCulture);
+	}
 
-				from += interval;
-			}
-		}
+	/// <summary>
+	/// Attempts to convert a string to a <see cref="DateTimeOffset"/> using the provided format.
+	/// </summary>
+	public static DateTimeOffset? TryToDateTimeOffset(this string value, string format, CultureInfo ci = null)
+	{
+		if (value.IsEmpty())
+			return null;
 
-		/// <summary>
-		/// Gets the number of days in the month of the given <see cref="DateTime"/>.
-		/// </summary>
-		public static int DaysInMonth(this DateTime date)
-		{
-			return DateTime.DaysInMonth(date.Year, date.Month);
-		}
+		return value.ToDateTimeOffset(format, ci);
+	}
 
-		/// <summary>
-		/// Changes the <see cref="DateTimeKind"/> of a <see cref="DateTime"/>.
-		/// </summary>
-		public static DateTime ChangeKind(this DateTime date, DateTimeKind kind = DateTimeKind.Unspecified)
+	/// <summary>
+	/// Converts a string to a <see cref="DateTimeOffset"/> using the provided format.
+	/// </summary>
+	public static DateTimeOffset ToDateTimeOffset(this string value, string format, CultureInfo ci = null)
+	{
+		try
 		{
-			return DateTime.SpecifyKind(date, kind);
+			return DateTimeOffset.ParseExact(value, format, ci ?? CultureInfo.InvariantCulture);
 		}
-
-		/// <summary>
-		/// Converts a <see cref="DateTime"/> to UTC kind.
-		/// </summary>
-		public static DateTime UtcKind(this DateTime date)
+		catch (Exception ex)
 		{
-			return date.ChangeKind(DateTimeKind.Utc);
+			throw new InvalidCastException($"Cannot convert {value} with format {format} to {typeof(DateTimeOffset).Name}.", ex);
 		}
+	}
 
-		// http://stackoverflow.com/questions/38039/how-can-i-get-the-datetime-for-the-start-of-the-week
-
-		/// <summary>
-		/// Gets the start of the week for the specified <see cref="DateTime"/>, based on a chosen <see cref="System.DayOfWeek"/>.
-		/// </summary>
-		public static DateTime StartOfWeek(this DateTime date, DayOfWeek startOfWeek)
-		{
-			var diff = date.DayOfWeek - startOfWeek;
-
-			if (diff < 0)
-				diff += 7;
-
-			return date.AddDays(-1 * diff).Date;
-		}
+	/// <summary>
+	/// Converts a <see cref="DateTime"/> and a time zone to a <see cref="DateTimeOffset"/>.
+	/// </summary>
+	public static DateTimeOffset ToDateTimeOffset(this DateTime date, TimeZoneInfo zone)
+	{
+		if (zone is null)
+			throw new ArgumentNullException(nameof(zone));
 
-		/// <summary>
-		/// Gets the end of the day for the specified <see cref="DateTime"/>, just before midnight.
-		/// </summary>
-		public static DateTime EndOfDay(this DateTime dt)
-		{
-			return dt.Date + LessOneDay;
-		}
+		return date.ToDateTimeOffset(zone.GetUtcOffset(date));
+	}
 
-		/// <summary>
-		/// Gets the end of the day for the specified <see cref="DateTimeOffset"/>, just before midnight.
-		/// </summary>
-		public static DateTimeOffset EndOfDay(this DateTimeOffset dto)
-		{
-			return new DateTimeOffset(dto.Date.EndOfDay(), dto.Offset);
-		}
+	/// <summary>
+	/// Converts a <see cref="DateTime"/> and a specific offset to a <see cref="DateTimeOffset"/>.
+	/// </summary>
+	public static DateTimeOffset ToDateTimeOffset(this DateTime date, TimeSpan offset)
+	{
+		return new DateTimeOffset(date.ChangeKind() + offset, offset);
+	}
 
-		/// <summary>
-		/// Represents a reference start date (1/1/1970, UTC).
-		/// </summary>
-		public static readonly DateTime GregorianStart = new(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc);
-
-		/// <summary>
-		/// Represents the Eastern Standard Time zone.
-		/// </summary>
-		public static readonly TimeZoneInfo Est = "Eastern Standard Time".To<TimeZoneInfo>();
-
-		/// <summary>
-		/// Represents the Central Standard Time zone.
-		/// </summary>
-		public static readonly TimeZoneInfo Cst = "Central Standard Time".To<TimeZoneInfo>();
-
-		/// <summary>
-		/// Represents the Russian Standard Time zone (Moscow).
-		/// </summary>
-		public static readonly TimeZoneInfo Moscow = "Russian Standard Time".To<TimeZoneInfo>();
-
-		/// <summary>
-		/// Represents the GMT Standard Time zone.
-		/// </summary>
-		public static readonly TimeZoneInfo Gmt = "GMT Standard Time".To<TimeZoneInfo>();
-
-		/// <summary>
-		/// Represents the FLE (Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius) Standard Time zone.
-		/// </summary>
-		public static readonly TimeZoneInfo Fle = "FLE Standard Time".To<TimeZoneInfo>();
-
-		/// <summary>
-		/// Represents the China Standard Time zone.
-		/// </summary>
-		public static readonly TimeZoneInfo China = "China Standard Time".To<TimeZoneInfo>();
-
-		/// <summary>
-		/// Represents the Korea Standard Time zone.
-		/// </summary>
-		public static readonly TimeZoneInfo Korea = "Korea Standard Time".To<TimeZoneInfo>();
-
-		/// <summary>
-		/// Represents the Tokyo Standard Time zone.
-		/// </summary>
-		public static readonly TimeZoneInfo Tokyo = "Tokyo Standard Time".To<TimeZoneInfo>();
-
-		/// <summary>
-		/// Represents the West Central Africa Standard Time zone (Tunisia).
-		/// </summary>
-		public static readonly TimeZoneInfo Tunisia = "W. Central Africa Standard Time".To<TimeZoneInfo>();
-
-		/// <summary>
-		/// Converts a <see cref="DateTime"/> between time zones.
-		/// </summary>
-		public static DateTime To(this DateTime time, TimeZoneInfo source = null, TimeZoneInfo destination = null)
-		{
-			if (source is null)
-				source = time.Kind == DateTimeKind.Utc ? TimeZoneInfo.Utc : TimeZoneInfo.Local;
+	/// <summary>
+	/// Formats a <see cref="DateTimeOffset"/> to a string using the provided format.
+	/// </summary>
+	public static string FromDateTimeOffset(this DateTimeOffset dto, string format, CultureInfo ci = null)
+	{
+		return dto.ToString(format, ci ?? CultureInfo.InvariantCulture);
+	}
 
-			return TimeZoneInfo.ConvertTime(time, source, destination ?? TimeZoneInfo.Utc);
-		}
+	/// <summary>
+	/// Creates a <see cref="DateTimeOffset"/> from a <see cref="DateTime"/> using the local time zone.
+	/// </summary>
+	public static DateTimeOffset ApplyLocal(this DateTime dt)
+	{
+		return dt.ApplyTimeZone(TimeZoneInfo.Local);
+	}
 
-		/// <summary>
-		/// Attempts to convert a string to a <see cref="DateTime"/> using the provided format.
-		/// </summary>
-		public static DateTime? TryToDateTime(this string value, string format, CultureInfo ci = null)
-		{
-			if (value.IsEmpty())
-				return null;
+	/// <summary>
+	/// Creates a <see cref="DateTimeOffset"/> from a <see cref="DateTime"/> using UTC.
+	/// </summary>
+	public static DateTimeOffset ApplyUtc(this DateTime dt)
+	{
+		return dt.ApplyTimeZone(TimeZoneInfo.Utc);
+	}
 
-			return value.ToDateTime(format, ci);
-		}
+	/// <summary>
+	/// Creates a <see cref="DateTimeOffset"/> from a <see cref="DateTime"/> in China Standard Time.
+	/// </summary>
+	public static DateTimeOffset ApplyChina(this DateTime dt)
+	{
+		return dt.ApplyTimeZone(China);
+	}
 
-		/// <summary>
-		/// Converts a string to a <see cref="DateTime"/> using the provided format.
-		/// </summary>
-		public static DateTime ToDateTime(this string value, string format, CultureInfo ci = null)
-		{
-			try
-			{
-				return DateTime.ParseExact(value, format, ci ?? CultureInfo.InvariantCulture);
-			}
-			catch (Exception ex)
-			{
-				throw new InvalidCastException($"Cannot convert {value} with format {format} to {typeof(DateTime).Name}.", ex);
-			}
-		}
+	/// <summary>
+	/// Creates a <see cref="DateTimeOffset"/> from a <see cref="DateTime"/> in Eastern Standard Time.
+	/// </summary>
+	public static DateTimeOffset ApplyEst(this DateTime dt)
+	{
+		return dt.ApplyTimeZone(Est);
+	}
 
-		/// <summary>
-		/// Formats a <see cref="DateTime"/> to a string using the provided format.
-		/// </summary>
-		public static string FromDateTime(this DateTime dt, string format, CultureInfo ci = null)
-		{
-			return dt.ToString(format, ci ?? CultureInfo.InvariantCulture);
-		}
+	/// <summary>
+	/// Creates a <see cref="DateTimeOffset"/> from a <see cref="DateTime"/> in Russian Standard Time (Moscow).
+	/// </summary>
+	public static DateTimeOffset ApplyMoscow(this DateTime dt)
+	{
+		return dt.ApplyTimeZone(Moscow);
+	}
 
-		/// <summary>
-		/// Attempts to convert a string to a <see cref="TimeSpan"/> using the provided format.
-		/// </summary>
-		public static TimeSpan? TryToTimeSpan(this string value, string format, CultureInfo ci = null)
-		{
-			if (value.IsEmpty())
-				return null;
+	/// <summary>
+	/// Creates a <see cref="DateTimeOffset"/> from a <see cref="DateTime"/> in the specified time zone.
+	/// </summary>
+	public static DateTimeOffset ApplyTimeZone(this DateTime dt, TimeZoneInfo zone)
+	{
+		if (zone is null)
+			throw new ArgumentNullException(nameof(zone));
 
-			return value.ToTimeSpan(format, ci);
-		}
+		return dt.ApplyTimeZone(zone.GetUtcOffset(dt.ChangeKind()));
+	}
 
-		/// <summary>
-		/// Converts a string to a <see cref="TimeSpan"/> using the provided format.
-		/// </summary>
-		public static TimeSpan ToTimeSpan(this string value, string format, CultureInfo ci = null)
+	/// <summary>
+	/// Creates a <see cref="DateTimeOffset"/> from a <see cref="DateTime"/> with the specified offset.
+	/// </summary>
+	public static DateTimeOffset ApplyTimeZone(this DateTime dt, TimeSpan offset)
+	{
+		try
 		{
-			try
-			{
-				return TimeSpan.ParseExact(value, format, ci ?? CultureInfo.InvariantCulture);
-			}
-			catch (Exception ex)
-			{
-				throw new InvalidCastException($"Cannot convert {value} with format {format} to {typeof(TimeSpan).Name}.", ex);
-			}
+			return new DateTimeOffset(dt.ChangeKind(), offset);
 		}
-
-		/// <summary>
-		/// Formats a <see cref="TimeSpan"/> to a string using the provided format.
-		/// </summary>
-		public static string FromTimeSpan(this TimeSpan ts, string format, CultureInfo ci = null)
+		catch (Exception ex)
 		{
-			return ts.ToString(format, ci ?? CultureInfo.InvariantCulture);
+			throw new ArgumentException($"Cannot convert {dt} to {nameof(DateTimeOffset)}.", nameof(dt), ex);
 		}
+	}
 
-		/// <summary>
-		/// Attempts to convert a string to a <see cref="DateTimeOffset"/> using the provided format.
-		/// </summary>
-		public static DateTimeOffset? TryToDateTimeOffset(this string value, string format, CultureInfo ci = null)
-		{
-			if (value.IsEmpty())
-				return null;
+	/// <summary>
+	/// Converts a <see cref="DateTimeOffset"/> to a <see cref="DateTime"/> in the specified time zone.
+	/// </summary>
+	public static DateTime ToLocalTime(this DateTimeOffset dto, TimeZoneInfo zone)
+	{
+		return dto.Convert(zone).DateTime;
+	}
 
-			return value.ToDateTimeOffset(format, ci);
-		}
+	/// <summary>
+	/// Converts a <see cref="DateTimeOffset"/> to China Standard Time zone.
+	/// </summary>
+	public static DateTimeOffset ConvertToChina(this DateTimeOffset dto)
+	{
+		return TimeZoneInfo.ConvertTime(dto, China);
+	}
 
-		/// <summary>
-		/// Converts a string to a <see cref="DateTimeOffset"/> using the provided format.
-		/// </summary>
-		public static DateTimeOffset ToDateTimeOffset(this string value, string format, CultureInfo ci = null)
-		{
-			try
-			{
-				return DateTimeOffset.ParseExact(value, format, ci ?? CultureInfo.InvariantCulture);
-			}
-			catch (Exception ex)
-			{
-				throw new InvalidCastException($"Cannot convert {value} with format {format} to {typeof(DateTimeOffset).Name}.", ex);
-			}
-		}
+	/// <summary>
+	/// Converts the specified <see cref="DateTimeOffset"/> to Eastern Standard Time.
+	/// </summary>
+	/// <param name="dto">The <see cref="DateTimeOffset"/> to convert.</param>
+	/// <returns>A new <see cref="DateTimeOffset"/> in Eastern Standard Time.</returns>
+	public static DateTimeOffset ConvertToEst(this DateTimeOffset dto)
+	{
+		return TimeZoneInfo.ConvertTime(dto, Est);
+	}
 
-		/// <summary>
-		/// Converts a <see cref="DateTime"/> and a time zone to a <see cref="DateTimeOffset"/>.
-		/// </summary>
-		public static DateTimeOffset ToDateTimeOffset(this DateTime date, TimeZoneInfo zone)
-		{
-			if (zone is null)
-				throw new ArgumentNullException(nameof(zone));
+	/// <summary>
+	/// Converts the specified <see cref="DateTimeOffset"/> to Moscow Time.
+	/// </summary>
+	/// <param name="dto">The <see cref="DateTimeOffset"/> to convert.</param>
+	/// <returns>A new <see cref="DateTimeOffset"/> in Moscow Time.</returns>
+	public static DateTimeOffset ConvertToMoscow(this DateTimeOffset dto)
+	{
+		return TimeZoneInfo.ConvertTime(dto, Moscow);
+	}
 
-			return date.ToDateTimeOffset(zone.GetUtcOffset(date));
-		}
+	/// <summary>
+	/// Converts the specified <see cref="DateTimeOffset"/> to UTC.
+	/// </summary>
+	/// <param name="dto">The <see cref="DateTimeOffset"/> to convert.</param>
+	/// <returns>A new <see cref="DateTimeOffset"/> in UTC.</returns>
+	public static DateTimeOffset ConvertToUtc(this DateTimeOffset dto)
+	{
+		return TimeZoneInfo.ConvertTime(dto, TimeZoneInfo.Utc);
+	}
 
-		/// <summary>
-		/// Converts a <see cref="DateTime"/> and a specific offset to a <see cref="DateTimeOffset"/>.
-		/// </summary>
-		public static DateTimeOffset ToDateTimeOffset(this DateTime date, TimeSpan offset)
-		{
-			return new DateTimeOffset(date.ChangeKind() + offset, offset);
-		}
+	/// <summary>
+	/// Converts the specified <see cref="DateTimeOffset"/> to the provided time zone.
+	/// </summary>
+	/// <param name="dto">The <see cref="DateTimeOffset"/> to convert.</param>
+	/// <param name="zone">The target <see cref="TimeZoneInfo"/>.</param>
+	/// <returns>A <see cref="DateTimeOffset"/> in the specified time zone.</returns>
+	public static DateTimeOffset Convert(this DateTimeOffset dto, TimeZoneInfo zone)
+	{
+		return TimeZoneInfo.ConvertTime(dto, zone);
+	}
 
-		/// <summary>
-		/// Formats a <see cref="DateTimeOffset"/> to a string using the provided format.
-		/// </summary>
-		public static string FromDateTimeOffset(this DateTimeOffset dto, string format, CultureInfo ci = null)
-		{
-			return dto.ToString(format, ci ?? CultureInfo.InvariantCulture);
-		}
+	/// <summary>
+	/// Truncates the specified <see cref="DateTimeOffset"/> to the given <see cref="TimeSpan"/>.
+	/// </summary>
+	/// <param name="time">The <see cref="DateTimeOffset"/> to truncate.</param>
+	/// <param name="timeSpan">The <see cref="TimeSpan"/> precision.</param>
+	/// <returns>The truncated <see cref="DateTimeOffset"/>.</returns>
+	public static DateTimeOffset Truncate(this DateTimeOffset time, TimeSpan timeSpan)
+	{
+		return time.Truncate(timeSpan.Ticks);
+	}
 
-		/// <summary>
-		/// Creates a <see cref="DateTimeOffset"/> from a <see cref="DateTime"/> using the local time zone.
-		/// </summary>
-		public static DateTimeOffset ApplyLocal(this DateTime dt)
-		{
-			return dt.ApplyTimeZone(TimeZoneInfo.Local);
-		}
+	/// <summary>
+	/// Truncates the specified <see cref="DateTimeOffset"/> to the given precision in ticks.
+	/// </summary>
+	/// <param name="time">The <see cref="DateTimeOffset"/> to truncate.</param>
+	/// <param name="precision">The precision in ticks.</param>
+	/// <returns>The truncated <see cref="DateTimeOffset"/>.</returns>
+	public static DateTimeOffset Truncate(this DateTimeOffset time, long precision)
+	{
+		var offset = time.Offset;
+		return new DateTimeOffset(time.UtcDateTime.Truncate(precision).ChangeKind() + offset, offset);
+	}
 
-		/// <summary>
-		/// Creates a <see cref="DateTimeOffset"/> from a <see cref="DateTime"/> using UTC.
-		/// </summary>
-		public static DateTimeOffset ApplyUtc(this DateTime dt)
-		{
-			return dt.ApplyTimeZone(TimeZoneInfo.Utc);
-		}
+	/// <summary>
+	/// Parses the specified string as an ISO8601 date/time.
+	/// </summary>
+	/// <param name="str">The string to parse.</param>
+	/// <param name="provider">An optional <see cref="IFormatProvider"/>.</param>
+	/// <returns>A <see cref="DateTime"/> parsed from the string, in UTC.</returns>
+	public static DateTime FromIso8601(this string str, IFormatProvider provider = null)
+	{
+		return DateTime.Parse(str, provider, DateTimeStyles.RoundtripKind).UtcKind();
+	}
 
-		/// <summary>
-		/// Creates a <see cref="DateTimeOffset"/> from a <see cref="DateTime"/> in China Standard Time.
-		/// </summary>
-		public static DateTimeOffset ApplyChina(this DateTime dt)
-		{
-			return dt.ApplyTimeZone(China);
-		}
+	/// <summary>
+	/// Formats the specified <see cref="DateTime"/> as an ISO8601 string.
+	/// </summary>
+	/// <param name="dt">The <see cref="DateTime"/> to format.</param>
+	/// <param name="provider">An optional <see cref="IFormatProvider"/>.</param>
+	/// <returns>An ISO8601-formatted string.</returns>
+	public static string ToIso8601(this DateTime dt, IFormatProvider provider = null)
+	{
+		return dt.ToString("yyyy-MM-dd'T'HH:mm:ss.fffK", provider);
+	}
 
-		/// <summary>
-		/// Creates a <see cref="DateTimeOffset"/> from a <see cref="DateTime"/> in Eastern Standard Time.
-		/// </summary>
-		public static DateTimeOffset ApplyEst(this DateTime dt)
-		{
-			return dt.ApplyTimeZone(Est);
-		}
+	// https://stackoverflow.com/questions/11154673/get-the-correct-week-number-of-a-given-date
 
-		/// <summary>
-		/// Creates a <see cref="DateTimeOffset"/> from a <see cref="DateTime"/> in Russian Standard Time (Moscow).
-		/// </summary>
-		public static DateTimeOffset ApplyMoscow(this DateTime dt)
-		{
-			return dt.ApplyTimeZone(Moscow);
-		}
+	/// <summary>
+	/// Calculates the ISO8601 week number of the specified date.
+	/// </summary>
+	/// <param name="time">The <see cref="DateTime"/> to evaluate.</param>
+	/// <param name="ci">An optional <see cref="CultureInfo"/>.</param>
+	/// <returns>The ISO8601 week of the year.</returns>
+	public static int GetIso8601WeekOfYear(this DateTime time, CultureInfo ci = null)
+	{
+		// Seriously cheat.  If its Monday, Tuesday or Wednesday, then it'll
+		// be the same week# as whatever Thursday, Friday or Saturday are,
+		// and we always get those right
+		var calendar = (ci ?? CultureInfo.InvariantCulture).Calendar;
 
-		/// <summary>
-		/// Creates a <see cref="DateTimeOffset"/> from a <see cref="DateTime"/> in the specified time zone.
-		/// </summary>
-		public static DateTimeOffset ApplyTimeZone(this DateTime dt, TimeZoneInfo zone)
+		var day = calendar.GetDayOfWeek(time);
+		if (day >= DayOfWeek.Monday && day <= DayOfWeek.Wednesday)
 		{
-			if (zone is null)
-				throw new ArgumentNullException(nameof(zone));
-
-			return dt.ApplyTimeZone(zone.GetUtcOffset(dt.ChangeKind()));
+			time = time.AddDays(3);
 		}
 
-		/// <summary>
-		/// Creates a <see cref="DateTimeOffset"/> from a <see cref="DateTime"/> with the specified offset.
-		/// </summary>
-		public static DateTimeOffset ApplyTimeZone(this DateTime dt, TimeSpan offset)
-		{
-			try
-			{
-				return new DateTimeOffset(dt.ChangeKind(), offset);
-			}
-			catch (Exception ex)
-			{
-				throw new ArgumentException($"Cannot convert {dt} to {nameof(DateTimeOffset)}.", nameof(dt), ex);
-			}
-		}
+		// Return the week of our adjusted day
+		return calendar.GetWeekOfYear(time, CalendarWeekRule.FirstFourDayWeek, DayOfWeek.Monday);
+	}
 
-		/// <summary>
-		/// Converts a <see cref="DateTimeOffset"/> to a <see cref="DateTime"/> in the specified time zone.
-		/// </summary>
-		public static DateTime ToLocalTime(this DateTimeOffset dto, TimeZoneInfo zone)
-		{
-			return dto.Convert(zone).DateTime;
-		}
+	/// <summary>
+	/// Converts the specified <see cref="DateTimeOffset"/> to Unix time in seconds or milliseconds.
+	/// </summary>
+	/// <param name="time">The <see cref="DateTimeOffset"/> to convert.</param>
+	/// <param name="isSeconds">If set to true, returns seconds; otherwise milliseconds.</param>
+	/// <returns>A double representing the Unix time.</returns>
+	public static double ToUnix(this DateTimeOffset time, bool isSeconds = true)
+	{
+		return time.UtcDateTime.ToUnix(isSeconds);
+	}
 
-		/// <summary>
-		/// Converts a <see cref="DateTimeOffset"/> to China Standard Time zone.
-		/// </summary>
-		public static DateTimeOffset ConvertToChina(this DateTimeOffset dto)
-		{
-			return TimeZoneInfo.ConvertTime(dto, China);
-		}
+	/// <summary>
+	/// Converts the specified <see cref="DateTime"/> to Unix time in seconds or milliseconds.
+	/// </summary>
+	/// <param name="time">The <see cref="DateTime"/> to convert.</param>
+	/// <param name="isSeconds">If set to true, returns seconds; otherwise milliseconds.</param>
+	/// <returns>A double representing the Unix time.</returns>
+	public static double ToUnix(this DateTime time, bool isSeconds = true)
+	{
+		var diff = time.GetUnixDiff();
 
-		/// <summary>
-		/// Converts the specified <see cref="DateTimeOffset"/> to Eastern Standard Time.
-		/// </summary>
-		/// <param name="dto">The <see cref="DateTimeOffset"/> to convert.</param>
-		/// <returns>A new <see cref="DateTimeOffset"/> in Eastern Standard Time.</returns>
-		public static DateTimeOffset ConvertToEst(this DateTimeOffset dto)
-		{
-			return TimeZoneInfo.ConvertTime(dto, Est);
-		}
+		return isSeconds ? diff.TotalSeconds : diff.TotalMilliseconds;
+	}
 
-		/// <summary>
-		/// Converts the specified <see cref="DateTimeOffset"/> to Moscow Time.
-		/// </summary>
-		/// <param name="dto">The <see cref="DateTimeOffset"/> to convert.</param>
-		/// <returns>A new <see cref="DateTimeOffset"/> in Moscow Time.</returns>
-		public static DateTimeOffset ConvertToMoscow(this DateTimeOffset dto)
+	/// <summary>
+	/// Gets the difference between the specified <see cref="DateTime"/> and the <see cref="GregorianStart"/>.
+	/// </summary>
+	/// <param name="time">The <see cref="DateTime"/> to evaluate.</param>
+	/// <returns>A <see cref="TimeSpan"/> representing the difference.</returns>
+	/// <exception cref="ArgumentOutOfRangeException">Thrown if the time is earlier than <see cref="GregorianStart"/>.</exception>
+	public static TimeSpan GetUnixDiff(this DateTime time)
+	{
+		if (time.Kind != DateTimeKind.Utc)
 		{
-			return TimeZoneInfo.ConvertTime(dto, Moscow);
+			time = time.ToUniversalTime();
+			//throw new ArgumentException(nameof(time));
 		}
 
-		/// <summary>
-		/// Converts the specified <see cref="DateTimeOffset"/> to UTC.
-		/// </summary>
-		/// <param name="dto">The <see cref="DateTimeOffset"/> to convert.</param>
-		/// <returns>A new <see cref="DateTimeOffset"/> in UTC.</returns>
-		public static DateTimeOffset ConvertToUtc(this DateTimeOffset dto)
-		{
-			return TimeZoneInfo.ConvertTime(dto, TimeZoneInfo.Utc);
-		}
+		var diff = time - GregorianStart;
 
-		/// <summary>
-		/// Converts the specified <see cref="DateTimeOffset"/> to the provided time zone.
-		/// </summary>
-		/// <param name="dto">The <see cref="DateTimeOffset"/> to convert.</param>
-		/// <param name="zone">The target <see cref="TimeZoneInfo"/>.</param>
-		/// <returns>A <see cref="DateTimeOffset"/> in the specified time zone.</returns>
-		public static DateTimeOffset Convert(this DateTimeOffset dto, TimeZoneInfo zone)
-		{
-			return TimeZoneInfo.ConvertTime(dto, zone);
-		}
+		if (diff < TimeSpan.Zero)
+			throw new ArgumentOutOfRangeException(nameof(time));
 
-		/// <summary>
-		/// Truncates the specified <see cref="DateTimeOffset"/> to the given <see cref="TimeSpan"/>.
-		/// </summary>
-		/// <param name="time">The <see cref="DateTimeOffset"/> to truncate.</param>
-		/// <param name="timeSpan">The <see cref="TimeSpan"/> precision.</param>
-		/// <returns>The truncated <see cref="DateTimeOffset"/>.</returns>
-		public static DateTimeOffset Truncate(this DateTimeOffset time, TimeSpan timeSpan)
-		{
-			return time.Truncate(timeSpan.Ticks);
-		}
+		return diff;
+	}
 
-		/// <summary>
-		/// Truncates the specified <see cref="DateTimeOffset"/> to the given precision in ticks.
-		/// </summary>
-		/// <param name="time">The <see cref="DateTimeOffset"/> to truncate.</param>
-		/// <param name="precision">The precision in ticks.</param>
-		/// <returns>The truncated <see cref="DateTimeOffset"/>.</returns>
-		public static DateTimeOffset Truncate(this DateTimeOffset time, long precision)
-		{
-			var offset = time.Offset;
-			return new DateTimeOffset(time.UtcDateTime.Truncate(precision).ChangeKind() + offset, offset);
-		}
+	/// <summary>
+	/// Creates a <see cref="DateTime"/> from a Unix time in seconds or milliseconds.
+	/// </summary>
+	/// <param name="time">The Unix time to convert.</param>
+	/// <param name="isSeconds">If set to true, interprets time as seconds; otherwise milliseconds.</param>
+	/// <returns>A <see cref="DateTime"/> in UTC.</returns>
+	public static DateTime FromUnix(this long time, bool isSeconds = true)
+	{
+		return isSeconds ? GregorianStart.AddSeconds(time) : GregorianStart.AddMilliseconds(time);
+	}
 
-		/// <summary>
-		/// Parses the specified string as an ISO8601 date/time.
-		/// </summary>
-		/// <param name="str">The string to parse.</param>
-		/// <param name="provider">An optional <see cref="IFormatProvider"/>.</param>
-		/// <returns>A <see cref="DateTime"/> parsed from the string, in UTC.</returns>
-		public static DateTime FromIso8601(this string str, IFormatProvider provider = null)
-		{
-			return DateTime.Parse(str, provider, DateTimeStyles.RoundtripKind).UtcKind();
-		}
+	/// <summary>
+	/// Creates a <see cref="DateTime"/> from a Unix time in seconds or milliseconds.
+	/// </summary>
+	/// <param name="time">The Unix time to convert.</param>
+	/// <param name="isSeconds">If set to true, interprets time as seconds; otherwise milliseconds.</param>
+	/// <returns>A <see cref="DateTime"/> in UTC.</returns>
+	public static DateTime FromUnix(this double time, bool isSeconds = true)
+	{
+		return isSeconds ? GregorianStart.AddSeconds(time) : GregorianStart.AddMilliseconds(time);
+	}
 
-		/// <summary>
-		/// Formats the specified <see cref="DateTime"/> as an ISO8601 string.
-		/// </summary>
-		/// <param name="dt">The <see cref="DateTime"/> to format.</param>
-		/// <param name="provider">An optional <see cref="IFormatProvider"/>.</param>
-		/// <returns>An ISO8601-formatted string.</returns>
-		public static string ToIso8601(this DateTime dt, IFormatProvider provider = null)
-		{
-			return dt.ToString("yyyy-MM-dd'T'HH:mm:ss.fffK", provider);
-		}
+	/// <summary>
+	/// Tries to create a <see cref="DateTime"/> from a Unix time in seconds or milliseconds. Returns null if time is 0.
+	/// </summary>
+	/// <param name="time">The Unix time to convert.</param>
+	/// <param name="isSeconds">If set to true, interprets time as seconds; otherwise milliseconds.</param>
+	/// <returns>A <see cref="DateTime"/> in UTC, or null if 0.</returns>
+	public static DateTime? TryFromUnix(this long time, bool isSeconds = true)
+	{
+		if (time == 0)
+			return null;
 
-		// https://stackoverflow.com/questions/11154673/get-the-correct-week-number-of-a-given-date
+		return time.FromUnix(isSeconds);
+	}
 
-		/// <summary>
-		/// Calculates the ISO8601 week number of the specified date.
-		/// </summary>
-		/// <param name="time">The <see cref="DateTime"/> to evaluate.</param>
-		/// <param name="ci">An optional <see cref="CultureInfo"/>.</param>
-		/// <returns>The ISO8601 week of the year.</returns>
-		public static int GetIso8601WeekOfYear(this DateTime time, CultureInfo ci = null)
-		{
-			// Seriously cheat.  If its Monday, Tuesday or Wednesday, then it'll
-			// be the same week# as whatever Thursday, Friday or Saturday are,
-			// and we always get those right
-			var calendar = (ci ?? CultureInfo.InvariantCulture).Calendar;
-
-			var day = calendar.GetDayOfWeek(time);
-			if (day >= DayOfWeek.Monday && day <= DayOfWeek.Wednesday)
-			{
-				time = time.AddDays(3);
-			}
-
-			// Return the week of our adjusted day
-			return calendar.GetWeekOfYear(time, CalendarWeekRule.FirstFourDayWeek, DayOfWeek.Monday);
-		}
+	/// <summary>
+	/// Tries to create a <see cref="DateTime"/> from a Unix time in seconds or milliseconds. Returns null if time is near zero.
+	/// </summary>
+	/// <param name="time">The Unix time to convert.</param>
+	/// <param name="isSeconds">If set to true, interprets time as seconds; otherwise milliseconds.</param>
+	/// <returns>A <see cref="DateTime"/> in UTC, or null if near zero.</returns>
+	public static DateTime? TryFromUnix(this double time, bool isSeconds = true)
+	{
+		if (Math.Abs(time) < double.Epsilon)
+			return null;
 
-		/// <summary>
-		/// Converts the specified <see cref="DateTimeOffset"/> to Unix time in seconds or milliseconds.
-		/// </summary>
-		/// <param name="time">The <see cref="DateTimeOffset"/> to convert.</param>
-		/// <param name="isSeconds">If set to true, returns seconds; otherwise milliseconds.</param>
-		/// <returns>A double representing the Unix time.</returns>
-		public static double ToUnix(this DateTimeOffset time, bool isSeconds = true)
-		{
-			return time.UtcDateTime.ToUnix(isSeconds);
-		}
+		return time.FromUnix(isSeconds);
+	}
 
-		/// <summary>
-		/// Converts the specified <see cref="DateTime"/> to Unix time in seconds or milliseconds.
-		/// </summary>
-		/// <param name="time">The <see cref="DateTime"/> to convert.</param>
-		/// <param name="isSeconds">If set to true, returns seconds; otherwise milliseconds.</param>
-		/// <returns>A double representing the Unix time.</returns>
-		public static double ToUnix(this DateTime time, bool isSeconds = true)
-		{
-			var diff = time.GetUnixDiff();
+	/// <summary>
+	/// Creates a <see cref="DateTime"/> from Microseconds since <see cref="GregorianStart"/>.
+	/// </summary>
+	/// <param name="mcs">Microseconds to convert.</param>
+	/// <returns>A <see cref="DateTime"/> in UTC.</returns>
+	public static DateTime FromUnixMcs(this long mcs)
+	{
+		return GregorianStart.AddMicroseconds(mcs);
+	}
 
-			return isSeconds ? diff.TotalSeconds : diff.TotalMilliseconds;
-		}
+	/// <summary>
+	/// Creates a <see cref="DateTime"/> from Microseconds since <see cref="GregorianStart"/>.
+	/// </summary>
+	/// <param name="mcs">Microseconds to convert.</param>
+	/// <returns>A <see cref="DateTime"/> in UTC.</returns>
+	public static DateTime FromUnixMcs(this double mcs)
+	{
+		return FromUnixMcs((long)mcs);
+	}
 
-		/// <summary>
-		/// Gets the difference between the specified <see cref="DateTime"/> and the <see cref="GregorianStart"/>.
-		/// </summary>
-		/// <param name="time">The <see cref="DateTime"/> to evaluate.</param>
-		/// <returns>A <see cref="TimeSpan"/> representing the difference.</returns>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown if the time is earlier than <see cref="GregorianStart"/>.</exception>
-		public static TimeSpan GetUnixDiff(this DateTime time)
-		{
-			if (time.Kind != DateTimeKind.Utc)
-			{
-				time = time.ToUniversalTime();
-				//throw new ArgumentException(nameof(time));
-			}
+	/// <summary>
+	/// Converts the specified <see cref="DateTime"/> to Unix Microseconds since <see cref="GregorianStart"/>.
+	/// </summary>
+	/// <param name="time">The <see cref="DateTime"/> to convert.</param>
+	/// <returns>A long representing the Unix time in microseconds.</returns>
+	public static long ToUnixMcs(this DateTime time)
+	{
+		return time.GetUnixDiff().Ticks.TicksToMicroseconds();
+	}
 
-			var diff = time - GregorianStart;
+	/// <summary>
+	/// Gets the current Unix time in seconds.
+	/// </summary>
+	public static double UnixNowS => DateTime.UtcNow.ToUnix();
 
-			if (diff < TimeSpan.Zero)
-				throw new ArgumentOutOfRangeException(nameof(time));
+	/// <summary>
+	/// Gets the current Unix time in milliseconds.
+	/// </summary>
+	public static double UnixNowMls => DateTime.UtcNow.ToUnix(false);
 
-			return diff;
-		}
+	//private const string _timeFormat = "yyyy-MM-dd'T'HH:mm:ss.fffffff'Z'"; // "yyyy-MM-dd'T'HH:mm:ss.fffffffff'Z'"
 
-		/// <summary>
-		/// Creates a <see cref="DateTime"/> from a Unix time in seconds or milliseconds.
-		/// </summary>
-		/// <param name="time">The Unix time to convert.</param>
-		/// <param name="isSeconds">If set to true, interprets time as seconds; otherwise milliseconds.</param>
-		/// <returns>A <see cref="DateTime"/> in UTC.</returns>
-		public static DateTime FromUnix(this long time, bool isSeconds = true)
-		{
-			return isSeconds ? GregorianStart.AddSeconds(time) : GregorianStart.AddMilliseconds(time);
-		}
+	//public static string ToRfc3339(this DateTimeOffset time)
+	//{
+	//	var str = time.ToString(_timeFormat);
+	//	return str.Insert(str.IndexOf('.') + 8, "00");
+	//}
 
-		/// <summary>
-		/// Creates a <see cref="DateTime"/> from a Unix time in seconds or milliseconds.
-		/// </summary>
-		/// <param name="time">The Unix time to convert.</param>
-		/// <param name="isSeconds">If set to true, interprets time as seconds; otherwise milliseconds.</param>
-		/// <returns>A <see cref="DateTime"/> in UTC.</returns>
-		public static DateTime FromUnix(this double time, bool isSeconds = true)
-		{
-			return isSeconds ? GregorianStart.AddSeconds(time) : GregorianStart.AddMilliseconds(time);
-		}
+	//public static DateTimeOffset FromRfc3339(this string time)
+	//{
+	//	if (time.IsEmpty())
+	//		throw new ArgumentNullException(nameof(time));
 
-		/// <summary>
-		/// Tries to create a <see cref="DateTime"/> from a Unix time in seconds or milliseconds. Returns null if time is 0.
-		/// </summary>
-		/// <param name="time">The Unix time to convert.</param>
-		/// <param name="isSeconds">If set to true, interprets time as seconds; otherwise milliseconds.</param>
-		/// <returns>A <see cref="DateTime"/> in UTC, or null if 0.</returns>
-		public static DateTime? TryFromUnix(this long time, bool isSeconds = true)
-		{
-			if (time == 0)
-				return null;
+	//	// cannot parse nanoseconds
+	//	var dt = time.Remove(time.IndexOf('.') + 8, 2).ToDateTime(_timeFormat);
+	//	//var dt = time.ToDateTime(_timeFormat);
+	//	return dt.ChangeKind(DateTimeKind.Utc);
+	//}
 
-			return time.FromUnix(isSeconds);
-		}
+	/// <summary>
+	/// Checks if the given <see cref="Type"/> is a date/time type.
+	/// </summary>
+	/// <param name="type">The <see cref="Type"/> to check.</param>
+	/// <returns>True if the type is a <see cref="DateTime"/> or <see cref="DateTimeOffset"/>; otherwise false.</returns>
+	/// <exception cref="ArgumentNullException">Thrown if <paramref name="type"/> is null.</exception>
+	public static bool IsDateTime(this Type type)
+	{
+		if (type is null)
+			throw new ArgumentNullException(nameof(type));
 
-		/// <summary>
-		/// Tries to create a <see cref="DateTime"/> from a Unix time in seconds or milliseconds. Returns null if time is near zero.
-		/// </summary>
-		/// <param name="time">The Unix time to convert.</param>
-		/// <param name="isSeconds">If set to true, interprets time as seconds; otherwise milliseconds.</param>
-		/// <returns>A <see cref="DateTime"/> in UTC, or null if near zero.</returns>
-		public static DateTime? TryFromUnix(this double time, bool isSeconds = true)
-		{
-			if (Math.Abs(time) < double.Epsilon)
-				return null;
+		return type == typeof(DateTimeOffset) || type == typeof(DateTime);
+	}
 
-			return time.FromUnix(isSeconds);
-		}
+	/// <summary>
+	/// Checks if the given <see cref="Type"/> is a date or time type.
+	/// </summary>
+	/// <param name="type">The <see cref="Type"/> to check.</param>
+	/// <returns>True if the type is a date/time or <see cref="TimeSpan"/>; otherwise false.</returns>
+	public static bool IsDateOrTime(this Type type)
+	{
+		return type.IsDateTime() || type == typeof(TimeSpan);
+	}
 
-		/// <summary>
-		/// Creates a <see cref="DateTime"/> from Microseconds since <see cref="GregorianStart"/>.
-		/// </summary>
-		/// <param name="mcs">Microseconds to convert.</param>
-		/// <returns>A <see cref="DateTime"/> in UTC.</returns>
-		public static DateTime FromUnixMcs(this long mcs)
-		{
-			return GregorianStart.AddMicroseconds(mcs);
-		}
+	/// <summary>
+	/// Checks if the given <see cref="DateTimeOffset"/> falls on a weekday (Monday through Friday).
+	/// </summary>
+	/// <param name="date">The <see cref="DateTimeOffset"/> to check.</param>
+	/// <returns>True if it is a weekday; otherwise false.</returns>
+	public static bool IsWeekday(this DateTimeOffset date)
+		=> date.DayOfWeek.IsWeekday();
 
-		/// <summary>
-		/// Creates a <see cref="DateTime"/> from Microseconds since <see cref="GregorianStart"/>.
-		/// </summary>
-		/// <param name="mcs">Microseconds to convert.</param>
-		/// <returns>A <see cref="DateTime"/> in UTC.</returns>
-		public static DateTime FromUnixMcs(this double mcs)
-		{
-			return FromUnixMcs((long)mcs);
-		}
+	/// <summary>
+	/// Checks if the given <see cref="DateTimeOffset"/> falls on a weekend (Saturday or Sunday).
+	/// </summary>
+	/// <param name="date">The <see cref="DateTimeOffset"/> to check.</param>
+	/// <returns>True if it is a weekend; otherwise false.</returns>
+	public static bool IsWeekend(this DateTimeOffset date)
+		=> date.DayOfWeek.IsWeekend();
 
-		/// <summary>
-		/// Converts the specified <see cref="DateTime"/> to Unix Microseconds since <see cref="GregorianStart"/>.
-		/// </summary>
-		/// <param name="time">The <see cref="DateTime"/> to convert.</param>
-		/// <returns>A long representing the Unix time in microseconds.</returns>
-		public static long ToUnixMcs(this DateTime time)
-		{
-			return time.GetUnixDiff().Ticks.TicksToMicroseconds();
-		}
+	/// <summary>
+	/// Checks if the given <see cref="DateTime"/> falls on a weekday (Monday through Friday).
+	/// </summary>
+	/// <param name="date">The <see cref="DateTime"/> to check.</param>
+	/// <returns>True if it is a weekday; otherwise false.</returns>
+	public static bool IsWeekday(this DateTime date)
+		=> date.DayOfWeek.IsWeekday();
 
-		/// <summary>
-		/// Gets the current Unix time in seconds.
-		/// </summary>
-		public static double UnixNowS => DateTime.UtcNow.ToUnix();
-
-		/// <summary>
-		/// Gets the current Unix time in milliseconds.
-		/// </summary>
-		public static double UnixNowMls => DateTime.UtcNow.ToUnix(false);
-
-		//private const string _timeFormat = "yyyy-MM-dd'T'HH:mm:ss.fffffff'Z'"; // "yyyy-MM-dd'T'HH:mm:ss.fffffffff'Z'"
-
-		//public static string ToRfc3339(this DateTimeOffset time)
-		//{
-		//	var str = time.ToString(_timeFormat);
-		//	return str.Insert(str.IndexOf('.') + 8, "00");
-		//}
-
-		//public static DateTimeOffset FromRfc3339(this string time)
-		//{
-		//	if (time.IsEmpty())
-		//		throw new ArgumentNullException(nameof(time));
-
-		//	// cannot parse nanoseconds
-		//	var dt = time.Remove(time.IndexOf('.') + 8, 2).ToDateTime(_timeFormat);
-		//	//var dt = time.ToDateTime(_timeFormat);
-		//	return dt.ChangeKind(DateTimeKind.Utc);
-		//}
-
-		/// <summary>
-		/// Checks if the given <see cref="Type"/> is a date/time type.
-		/// </summary>
-		/// <param name="type">The <see cref="Type"/> to check.</param>
-		/// <returns>True if the type is a <see cref="DateTime"/> or <see cref="DateTimeOffset"/>; otherwise false.</returns>
-		/// <exception cref="ArgumentNullException">Thrown if <paramref name="type"/> is null.</exception>
-		public static bool IsDateTime(this Type type)
-		{
-			if (type is null)
-				throw new ArgumentNullException(nameof(type));
+	/// <summary>
+	/// Checks if the given <see cref="DateTime"/> falls on a weekend (Saturday or Sunday).
+	/// </summary>
+	/// <param name="date">The <see cref="DateTime"/> to check.</param>
+	/// <returns>True if it is a weekend; otherwise false.</returns>
+	public static bool IsWeekend(this DateTime date)
+		=> date.DayOfWeek.IsWeekend();
 
-			return type == typeof(DateTimeOffset) || type == typeof(DateTime);
-		}
+	/// <summary>
+	/// Checks if the given <see cref="DayOfWeek"/> represents a weekday (Monday through Friday).
+	/// </summary>
+	/// <param name="dow">The <see cref="DayOfWeek"/>.</param>
+	/// <returns>True if it is a weekday; otherwise false.</returns>
+	public static bool IsWeekday(this DayOfWeek dow)
+		=> !dow.IsWeekend();
 
-		/// <summary>
-		/// Checks if the given <see cref="Type"/> is a date or time type.
-		/// </summary>
-		/// <param name="type">The <see cref="Type"/> to check.</param>
-		/// <returns>True if the type is a date/time or <see cref="TimeSpan"/>; otherwise false.</returns>
-		public static bool IsDateOrTime(this Type type)
-		{
-			return type.IsDateTime() || type == typeof(TimeSpan);
-		}
+	/// <summary>
+	/// Checks if the given <see cref="DayOfWeek"/> represents a weekend (Saturday or Sunday).
+	/// </summary>
+	/// <param name="dow">The <see cref="DayOfWeek"/>.</param>
+	/// <returns>True if it is a weekend; otherwise false.</returns>
+	public static bool IsWeekend(this DayOfWeek dow)
+		=> dow == DayOfWeek.Saturday || dow == DayOfWeek.Sunday;
 
-		/// <summary>
-		/// Checks if the given <see cref="DateTimeOffset"/> falls on a weekday (Monday through Friday).
-		/// </summary>
-		/// <param name="date">The <see cref="DateTimeOffset"/> to check.</param>
-		/// <returns>True if it is a weekday; otherwise false.</returns>
-		public static bool IsWeekday(this DateTimeOffset date)
-			=> date.DayOfWeek.IsWeekday();
-
-		/// <summary>
-		/// Checks if the given <see cref="DateTimeOffset"/> falls on a weekend (Saturday or Sunday).
-		/// </summary>
-		/// <param name="date">The <see cref="DateTimeOffset"/> to check.</param>
-		/// <returns>True if it is a weekend; otherwise false.</returns>
-		public static bool IsWeekend(this DateTimeOffset date)
-			=> date.DayOfWeek.IsWeekend();
-
-		/// <summary>
-		/// Checks if the given <see cref="DateTime"/> falls on a weekday (Monday through Friday).
-		/// </summary>
-		/// <param name="date">The <see cref="DateTime"/> to check.</param>
-		/// <returns>True if it is a weekday; otherwise false.</returns>
-		public static bool IsWeekday(this DateTime date)
-			=> date.DayOfWeek.IsWeekday();
-
-		/// <summary>
-		/// Checks if the given <see cref="DateTime"/> falls on a weekend (Saturday or Sunday).
-		/// </summary>
-		/// <param name="date">The <see cref="DateTime"/> to check.</param>
-		/// <returns>True if it is a weekend; otherwise false.</returns>
-		public static bool IsWeekend(this DateTime date)
-			=> date.DayOfWeek.IsWeekend();
-
-		/// <summary>
-		/// Checks if the given <see cref="DayOfWeek"/> represents a weekday (Monday through Friday).
-		/// </summary>
-		/// <param name="dow">The <see cref="DayOfWeek"/>.</param>
-		/// <returns>True if it is a weekday; otherwise false.</returns>
-		public static bool IsWeekday(this DayOfWeek dow)
-			=> !dow.IsWeekend();
-
-		/// <summary>
-		/// Checks if the given <see cref="DayOfWeek"/> represents a weekend (Saturday or Sunday).
-		/// </summary>
-		/// <param name="dow">The <see cref="DayOfWeek"/>.</param>
-		/// <returns>True if it is a weekend; otherwise false.</returns>
-		public static bool IsWeekend(this DayOfWeek dow)
-			=> dow == DayOfWeek.Saturday || dow == DayOfWeek.Sunday;
-
-		/// <summary>
-		/// Determines the lunar phase for the specified date.
-		/// </summary>
-		/// <param name="date">The <see cref="DateTime"/> for which to determine the phase.</param>
-		/// <returns>A <see cref="LunarPhases"/> value representing the phase of the moon.</returns>
-		public static LunarPhases GetLunarPhase(this DateTime date)
-		{
-			// Convert the date to Julian Date
-			var julianDate = ToJulianDate(date);
+	/// <summary>
+	/// Determines the lunar phase for the specified date.
+	/// </summary>
+	/// <param name="date">The <see cref="DateTime"/> for which to determine the phase.</param>
+	/// <returns>A <see cref="LunarPhases"/> value representing the phase of the moon.</returns>
+	public static LunarPhases GetLunarPhase(this DateTime date)
+	{
+		// Convert the date to Julian Date
+		var julianDate = ToJulianDate(date);
 
-			// Calculate days since the last known new moon (Jan 6, 2000)
-			var daysSinceNew = julianDate - 2451549.5;
+		// Calculate days since the last known new moon (Jan 6, 2000)
+		var daysSinceNew = julianDate - 2451549.5;
 
-			// Calculate the number of lunar cycles since the reference date
-			var newMoons = daysSinceNew / 29.53; // 29.53 is the length of a lunar cycle in days
+		// Calculate the number of lunar cycles since the reference date
+		var newMoons = daysSinceNew / 29.53; // 29.53 is the length of a lunar cycle in days
 
-			// Get the current position in the lunar cycle (0 to 1)
-			var phase = newMoons - Math.Floor(newMoons);
+		// Get the current position in the lunar cycle (0 to 1)
+		var phase = newMoons - Math.Floor(newMoons);
 
-			// Convert the phase (0 to 1) to one of 8 moon phases (0 to 7)
-			var phaseIndex = (LunarPhases)Math.Floor(phase * 8);
+		// Convert the phase (0 to 1) to one of 8 moon phases (0 to 7)
+		var phaseIndex = (LunarPhases)Math.Floor(phase * 8);
 
-			return phaseIndex;
-		}
+		return phaseIndex;
+	}
 
-		/// <summary>
-		/// Converts the specified <see cref="DateTime"/> to a Julian date.
-		/// </summary>
-		/// <param name="date">The <see cref="DateTime"/> to convert.</param>
-		/// <returns>A double representing the Julian date.</returns>
-		public static double ToJulianDate(this DateTime date)
-		{
-			return date.ToOADate() + 2415018.5;
-		}
+	/// <summary>
+	/// Converts the specified <see cref="DateTime"/> to a Julian date.
+	/// </summary>
+	/// <param name="date">The <see cref="DateTime"/> to convert.</param>
+	/// <returns>A double representing the Julian date.</returns>
+	public static double ToJulianDate(this DateTime date)
+	{
+		return date.ToOADate() + 2415018.5;
 	}
 }
\ No newline at end of file
diff --git a/Common/TupleHelper.cs b/Common/TupleHelper.cs
index 7a22664b..1a9bd33e 100644
--- a/Common/TupleHelper.cs
+++ b/Common/TupleHelper.cs
@@ -1,327 +1,326 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+
+/// <summary>
+/// Provides helper methods for working with tuple types.
+/// </summary>
+public static class TupleHelper
 {
-	using System;
-	using System.Collections.Generic;
-	using System.Linq;
-	using System.Runtime.CompilerServices;
+	private static readonly HashSet<Type> _tupleTypes =
+	[
+		typeof(Tuple<>),
+		typeof(Tuple<,>),
+		typeof(Tuple<,,>),
+		typeof(Tuple<,,,>),
+		typeof(Tuple<,,,,>),
+		typeof(Tuple<,,,,,>),
+		typeof(Tuple<,,,,,,>),
+		typeof(Tuple<,,,,,,,>),
+
+		typeof(ValueTuple<>),
+		typeof(ValueTuple<,>),
+		typeof(ValueTuple<,,>),
+		typeof(ValueTuple<,,,>),
+		typeof(ValueTuple<,,,,>),
+		typeof(ValueTuple<,,,,,>),
+		typeof(ValueTuple<,,,,,,>),
+		typeof(ValueTuple<,,,,,,,>),
+	];
 
 	/// <summary>
-	/// Provides helper methods for working with tuple types.
+	/// Determines whether the specified type is a tuple type.
 	/// </summary>
-	public static class TupleHelper
+	/// <param name="tupleType">The type to check.</param>
+	/// <returns>true if the specified type is a tuple; otherwise, false.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="tupleType"/> is null.</exception>
+	public static bool IsTuple(this Type tupleType)
 	{
-		private static readonly HashSet<Type> _tupleTypes =
-		[
-			typeof(Tuple<>),
-			typeof(Tuple<,>),
-			typeof(Tuple<,,>),
-			typeof(Tuple<,,,>),
-			typeof(Tuple<,,,,>),
-			typeof(Tuple<,,,,,>),
-			typeof(Tuple<,,,,,,>),
-			typeof(Tuple<,,,,,,,>),
+		if (tupleType is null)
+			throw new ArgumentNullException(nameof(tupleType));
 
-			typeof(ValueTuple<>),
-			typeof(ValueTuple<,>),
-			typeof(ValueTuple<,,>),
-			typeof(ValueTuple<,,,>),
-			typeof(ValueTuple<,,,,>),
-			typeof(ValueTuple<,,,,,>),
-			typeof(ValueTuple<,,,,,,>),
-			typeof(ValueTuple<,,,,,,,>),
-		];
+		return tupleType.IsGenericType && _tupleTypes.Contains(tupleType.GetGenericTypeDefinition());
+	}
 
-		/// <summary>
-		/// Determines whether the specified type is a tuple type.
-		/// </summary>
-		/// <param name="tupleType">The type to check.</param>
-		/// <returns>true if the specified type is a tuple; otherwise, false.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="tupleType"/> is null.</exception>
-		public static bool IsTuple(this Type tupleType)
-		{
-			if (tupleType is null)
-				throw new ArgumentNullException(nameof(tupleType));
+	/// <summary>
+	/// Returns the values of a <see cref="Tuple{T}"/> as an enumerable collection.
+	/// </summary>
+	/// <typeparam name="T">The type of the tuple element.</typeparam>
+	/// <param name="tuple">The tuple instance.</param>
+	/// <returns>An enumerable collection of tuple element values.</returns>
+	public static IEnumerable<object> ToValues<T>(this Tuple<T> tuple)
+	{
+		yield return tuple.Item1;
+	}
 
-			return tupleType.IsGenericType && _tupleTypes.Contains(tupleType.GetGenericTypeDefinition());
-		}
+	/// <summary>
+	/// Returns the values of a <see cref="Tuple{T1, T2}"/> as an enumerable collection.
+	/// </summary>
+	/// <typeparam name="T1">The type of the first element.</typeparam>
+	/// <typeparam name="T2">The type of the second element.</typeparam>
+	/// <param name="tuple">The tuple instance.</param>
+	/// <returns>An enumerable collection of tuple element values.</returns>
+	public static IEnumerable<object> ToValues<T1, T2>(this Tuple<T1, T2> tuple)
+	{
+		yield return tuple.Item1;
+		yield return tuple.Item2;
+	}
 
-		/// <summary>
-		/// Returns the values of a <see cref="Tuple{T}"/> as an enumerable collection.
-		/// </summary>
-		/// <typeparam name="T">The type of the tuple element.</typeparam>
-		/// <param name="tuple">The tuple instance.</param>
-		/// <returns>An enumerable collection of tuple element values.</returns>
-		public static IEnumerable<object> ToValues<T>(this Tuple<T> tuple)
-		{
-			yield return tuple.Item1;
-		}
+	/// <summary>
+	/// Returns the values of a <see cref="Tuple{T1, T2, T3}"/> as an enumerable collection.
+	/// </summary>
+	/// <typeparam name="T1">The type of the first element.</typeparam>
+	/// <typeparam name="T2">The type of the second element.</typeparam>
+	/// <typeparam name="T3">The type of the third element.</typeparam>
+	/// <param name="tuple">The tuple instance.</param>
+	/// <returns>An enumerable collection of tuple element values.</returns>
+	public static IEnumerable<object> ToValues<T1, T2, T3>(this Tuple<T1, T2, T3> tuple)
+	{
+		yield return tuple.Item1;
+		yield return tuple.Item2;
+		yield return tuple.Item3;
+	}
 
-		/// <summary>
-		/// Returns the values of a <see cref="Tuple{T1, T2}"/> as an enumerable collection.
-		/// </summary>
-		/// <typeparam name="T1">The type of the first element.</typeparam>
-		/// <typeparam name="T2">The type of the second element.</typeparam>
-		/// <param name="tuple">The tuple instance.</param>
-		/// <returns>An enumerable collection of tuple element values.</returns>
-		public static IEnumerable<object> ToValues<T1, T2>(this Tuple<T1, T2> tuple)
-		{
-			yield return tuple.Item1;
-			yield return tuple.Item2;
-		}
+	/// <summary>
+	/// Returns the values of a <see cref="Tuple{T1, T2, T3, T4}"/> as an enumerable collection.
+	/// </summary>
+	/// <typeparam name="T1">The type of the first element.</typeparam>
+	/// <typeparam name="T2">The type of the second element.</typeparam>
+	/// <typeparam name="T3">The type of the third element.</typeparam>
+	/// <typeparam name="T4">The type of the fourth element.</typeparam>
+	/// <param name="tuple">The tuple instance.</param>
+	/// <returns>An enumerable collection of tuple element values.</returns>
+	public static IEnumerable<object> ToValues<T1, T2, T3, T4>(this Tuple<T1, T2, T3, T4> tuple)
+	{
+		yield return tuple.Item1;
+		yield return tuple.Item2;
+		yield return tuple.Item3;
+		yield return tuple.Item4;
+	}
 
-		/// <summary>
-		/// Returns the values of a <see cref="Tuple{T1, T2, T3}"/> as an enumerable collection.
-		/// </summary>
-		/// <typeparam name="T1">The type of the first element.</typeparam>
-		/// <typeparam name="T2">The type of the second element.</typeparam>
-		/// <typeparam name="T3">The type of the third element.</typeparam>
-		/// <param name="tuple">The tuple instance.</param>
-		/// <returns>An enumerable collection of tuple element values.</returns>
-		public static IEnumerable<object> ToValues<T1, T2, T3>(this Tuple<T1, T2, T3> tuple)
-		{
-			yield return tuple.Item1;
-			yield return tuple.Item2;
-			yield return tuple.Item3;
-		}
+	/// <summary>
+	/// Returns the values of a <see cref="Tuple{T1, T2, T3, T4, T5}"/> as an enumerable collection.
+	/// </summary>
+	/// <typeparam name="T1">The type of the first element.</typeparam>
+	/// <typeparam name="T2">The type of the second element.</typeparam>
+	/// <typeparam name="T3">The type of the third element.</typeparam>
+	/// <typeparam name="T4">The type of the fourth element.</typeparam>
+	/// <typeparam name="T5">The type of the fifth element.</typeparam>
+	/// <param name="tuple">The tuple instance.</param>
+	/// <returns>An enumerable collection of tuple element values.</returns>
+	public static IEnumerable<object> ToValues<T1, T2, T3, T4, T5>(this Tuple<T1, T2, T3, T4, T5> tuple)
+	{
+		yield return tuple.Item1;
+		yield return tuple.Item2;
+		yield return tuple.Item3;
+		yield return tuple.Item4;
+		yield return tuple.Item5;
+	}
 
-		/// <summary>
-		/// Returns the values of a <see cref="Tuple{T1, T2, T3, T4}"/> as an enumerable collection.
-		/// </summary>
-		/// <typeparam name="T1">The type of the first element.</typeparam>
-		/// <typeparam name="T2">The type of the second element.</typeparam>
-		/// <typeparam name="T3">The type of the third element.</typeparam>
-		/// <typeparam name="T4">The type of the fourth element.</typeparam>
-		/// <param name="tuple">The tuple instance.</param>
-		/// <returns>An enumerable collection of tuple element values.</returns>
-		public static IEnumerable<object> ToValues<T1, T2, T3, T4>(this Tuple<T1, T2, T3, T4> tuple)
-		{
-			yield return tuple.Item1;
-			yield return tuple.Item2;
-			yield return tuple.Item3;
-			yield return tuple.Item4;
-		}
+	/// <summary>
+	/// Returns the values of a <see cref="Tuple{T1, T2, T3, T4, T5, T6}"/> as an enumerable collection.
+	/// </summary>
+	/// <typeparam name="T1">The type of the first element.</typeparam>
+	/// <typeparam name="T2">The type of the second element.</typeparam>
+	/// <typeparam name="T3">The type of the third element.</typeparam>
+	/// <typeparam name="T4">The type of the fourth element.</typeparam>
+	/// <typeparam name="T5">The type of the fifth element.</typeparam>
+	/// <typeparam name="T6">The type of the sixth element.</typeparam>
+	/// <param name="tuple">The tuple instance.</param>
+	/// <returns>An enumerable collection of tuple element values.</returns>
+	public static IEnumerable<object> ToValues<T1, T2, T3, T4, T5, T6>(this Tuple<T1, T2, T3, T4, T5, T6> tuple)
+	{
+		yield return tuple.Item1;
+		yield return tuple.Item2;
+		yield return tuple.Item3;
+		yield return tuple.Item4;
+		yield return tuple.Item5;
+		yield return tuple.Item6;
+	}
 
-		/// <summary>
-		/// Returns the values of a <see cref="Tuple{T1, T2, T3, T4, T5}"/> as an enumerable collection.
-		/// </summary>
-		/// <typeparam name="T1">The type of the first element.</typeparam>
-		/// <typeparam name="T2">The type of the second element.</typeparam>
-		/// <typeparam name="T3">The type of the third element.</typeparam>
-		/// <typeparam name="T4">The type of the fourth element.</typeparam>
-		/// <typeparam name="T5">The type of the fifth element.</typeparam>
-		/// <param name="tuple">The tuple instance.</param>
-		/// <returns>An enumerable collection of tuple element values.</returns>
-		public static IEnumerable<object> ToValues<T1, T2, T3, T4, T5>(this Tuple<T1, T2, T3, T4, T5> tuple)
-		{
-			yield return tuple.Item1;
-			yield return tuple.Item2;
-			yield return tuple.Item3;
-			yield return tuple.Item4;
-			yield return tuple.Item5;
-		}
+	/// <summary>
+	/// Returns the values of a <see cref="ValueTuple{T}"/> as an enumerable collection.
+	/// </summary>
+	/// <typeparam name="T">The type of the tuple element.</typeparam>
+	/// <param name="tuple">The tuple instance.</param>
+	/// <returns>An enumerable collection of tuple element values.</returns>
+	public static IEnumerable<object> ToValues<T>(this ValueTuple<T> tuple)
+	{
+		yield return tuple.Item1;
+	}
 
-		/// <summary>
-		/// Returns the values of a <see cref="Tuple{T1, T2, T3, T4, T5, T6}"/> as an enumerable collection.
-		/// </summary>
-		/// <typeparam name="T1">The type of the first element.</typeparam>
-		/// <typeparam name="T2">The type of the second element.</typeparam>
-		/// <typeparam name="T3">The type of the third element.</typeparam>
-		/// <typeparam name="T4">The type of the fourth element.</typeparam>
-		/// <typeparam name="T5">The type of the fifth element.</typeparam>
-		/// <typeparam name="T6">The type of the sixth element.</typeparam>
-		/// <param name="tuple">The tuple instance.</param>
-		/// <returns>An enumerable collection of tuple element values.</returns>
-		public static IEnumerable<object> ToValues<T1, T2, T3, T4, T5, T6>(this Tuple<T1, T2, T3, T4, T5, T6> tuple)
-		{
-			yield return tuple.Item1;
-			yield return tuple.Item2;
-			yield return tuple.Item3;
-			yield return tuple.Item4;
-			yield return tuple.Item5;
-			yield return tuple.Item6;
-		}
+	/// <summary>
+	/// Returns the values of a <see cref="ValueTuple{T1, T2}"/> as an enumerable collection.
+	/// </summary>
+	/// <typeparam name="T1">The type of the first element.</typeparam>
+	/// <typeparam name="T2">The type of the second element.</typeparam>
+	/// <param name="tuple">The tuple instance.</param>
+	/// <returns>An enumerable collection of tuple element values.</returns>
+	public static IEnumerable<object> ToValues<T1, T2>(this ValueTuple<T1, T2> tuple)
+	{
+		yield return tuple.Item1;
+		yield return tuple.Item2;
+	}
 
-		/// <summary>
-		/// Returns the values of a <see cref="ValueTuple{T}"/> as an enumerable collection.
-		/// </summary>
-		/// <typeparam name="T">The type of the tuple element.</typeparam>
-		/// <param name="tuple">The tuple instance.</param>
-		/// <returns>An enumerable collection of tuple element values.</returns>
-		public static IEnumerable<object> ToValues<T>(this ValueTuple<T> tuple)
-		{
-			yield return tuple.Item1;
-		}
+	/// <summary>
+	/// Returns the values of a <see cref="ValueTuple{T1, T2, T3}"/> as an enumerable collection.
+	/// </summary>
+	/// <typeparam name="T1">The type of the first element.</typeparam>
+	/// <typeparam name="T2">The type of the second element.</typeparam>
+	/// <typeparam name="T3">The type of the third element.</typeparam>
+	/// <param name="tuple">The tuple instance.</param>
+	/// <returns>An enumerable collection of tuple element values.</returns>
+	public static IEnumerable<object> ToValues<T1, T2, T3>(this ValueTuple<T1, T2, T3> tuple)
+	{
+		yield return tuple.Item1;
+		yield return tuple.Item2;
+		yield return tuple.Item3;
+	}
 
-		/// <summary>
-		/// Returns the values of a <see cref="ValueTuple{T1, T2}"/> as an enumerable collection.
-		/// </summary>
-		/// <typeparam name="T1">The type of the first element.</typeparam>
-		/// <typeparam name="T2">The type of the second element.</typeparam>
-		/// <param name="tuple">The tuple instance.</param>
-		/// <returns>An enumerable collection of tuple element values.</returns>
-		public static IEnumerable<object> ToValues<T1, T2>(this ValueTuple<T1, T2> tuple)
-		{
-			yield return tuple.Item1;
-			yield return tuple.Item2;
-		}
+	/// <summary>
+	/// Returns the values of a <see cref="ValueTuple{T1, T2, T3, T4}"/> as an enumerable collection.
+	/// </summary>
+	/// <typeparam name="T1">The type of the first element.</typeparam>
+	/// <typeparam name="T2">The type of the second element.</typeparam>
+	/// <typeparam name="T3">The type of the third element.</typeparam>
+	/// <typeparam name="T4">The type of the fourth element.</typeparam>
+	/// <param name="tuple">The tuple instance.</param>
+	/// <returns>An enumerable collection of tuple element values.</returns>
+	public static IEnumerable<object> ToValues<T1, T2, T3, T4>(this ValueTuple<T1, T2, T3, T4> tuple)
+	{
+		yield return tuple.Item1;
+		yield return tuple.Item2;
+		yield return tuple.Item3;
+		yield return tuple.Item4;
+	}
 
-		/// <summary>
-		/// Returns the values of a <see cref="ValueTuple{T1, T2, T3}"/> as an enumerable collection.
-		/// </summary>
-		/// <typeparam name="T1">The type of the first element.</typeparam>
-		/// <typeparam name="T2">The type of the second element.</typeparam>
-		/// <typeparam name="T3">The type of the third element.</typeparam>
-		/// <param name="tuple">The tuple instance.</param>
-		/// <returns>An enumerable collection of tuple element values.</returns>
-		public static IEnumerable<object> ToValues<T1, T2, T3>(this ValueTuple<T1, T2, T3> tuple)
-		{
-			yield return tuple.Item1;
-			yield return tuple.Item2;
-			yield return tuple.Item3;
-		}
+	/// <summary>
+	/// Returns the values of a <see cref="ValueTuple{T1, T2, T3, T4, T5}"/> as an enumerable collection.
+	/// </summary>
+	/// <typeparam name="T1">The type of the first element.</typeparam>
+	/// <typeparam name="T2">The type of the second element.</typeparam>
+	/// <typeparam name="T3">The type of the third element.</typeparam>
+	/// <typeparam name="T4">The type of the fourth element.</typeparam>
+	/// <typeparam name="T5">The type of the fifth element.</typeparam>
+	/// <param name="tuple">The tuple instance.</param>
+	/// <returns>An enumerable collection of tuple element values.</returns>
+	public static IEnumerable<object> ToValues<T1, T2, T3, T4, T5>(this ValueTuple<T1, T2, T3, T4, T5> tuple)
+	{
+		yield return tuple.Item1;
+		yield return tuple.Item2;
+		yield return tuple.Item3;
+		yield return tuple.Item4;
+		yield return tuple.Item5;
+	}
 
-		/// <summary>
-		/// Returns the values of a <see cref="ValueTuple{T1, T2, T3, T4}"/> as an enumerable collection.
-		/// </summary>
-		/// <typeparam name="T1">The type of the first element.</typeparam>
-		/// <typeparam name="T2">The type of the second element.</typeparam>
-		/// <typeparam name="T3">The type of the third element.</typeparam>
-		/// <typeparam name="T4">The type of the fourth element.</typeparam>
-		/// <param name="tuple">The tuple instance.</param>
-		/// <returns>An enumerable collection of tuple element values.</returns>
-		public static IEnumerable<object> ToValues<T1, T2, T3, T4>(this ValueTuple<T1, T2, T3, T4> tuple)
-		{
-			yield return tuple.Item1;
-			yield return tuple.Item2;
-			yield return tuple.Item3;
-			yield return tuple.Item4;
-		}
+	/// <summary>
+	/// Returns the values of a <see cref="ValueTuple{T1, T2, T3, T4, T5, T6}"/> as an enumerable collection.
+	/// </summary>
+	/// <typeparam name="T1">The type of the first element.</typeparam>
+	/// <typeparam name="T2">The type of the second element.</typeparam>
+	/// <typeparam name="T3">The type of the third element.</typeparam>
+	/// <typeparam name="T4">The type of the fourth element.</typeparam>
+	/// <typeparam name="T5">The type of the fifth element.</typeparam>
+	/// <typeparam name="T6">The type of the sixth element.</typeparam>
+	/// <param name="tuple">The tuple instance.</param>
+	/// <returns>An enumerable collection of tuple element values.</returns>
+	public static IEnumerable<object> ToValues<T1, T2, T3, T4, T5, T6>(this ValueTuple<T1, T2, T3, T4, T5, T6> tuple)
+	{
+		yield return tuple.Item1;
+		yield return tuple.Item2;
+		yield return tuple.Item3;
+		yield return tuple.Item4;
+		yield return tuple.Item5;
+		yield return tuple.Item6;
+	}
 
-		/// <summary>
-		/// Returns the values of a <see cref="ValueTuple{T1, T2, T3, T4, T5}"/> as an enumerable collection.
-		/// </summary>
-		/// <typeparam name="T1">The type of the first element.</typeparam>
-		/// <typeparam name="T2">The type of the second element.</typeparam>
-		/// <typeparam name="T3">The type of the third element.</typeparam>
-		/// <typeparam name="T4">The type of the fourth element.</typeparam>
-		/// <typeparam name="T5">The type of the fifth element.</typeparam>
-		/// <param name="tuple">The tuple instance.</param>
-		/// <returns>An enumerable collection of tuple element values.</returns>
-		public static IEnumerable<object> ToValues<T1, T2, T3, T4, T5>(this ValueTuple<T1, T2, T3, T4, T5> tuple)
-		{
-			yield return tuple.Item1;
-			yield return tuple.Item2;
-			yield return tuple.Item3;
-			yield return tuple.Item4;
-			yield return tuple.Item5;
-		}
+	/// <summary>
+	/// Creates a tuple from the provided collection of values.
+	/// </summary>
+	/// <param name="values">An enumerable collection of values.</param>
+	/// <param name="isValue">If set to true, a <see cref="ValueTuple"/> is created; otherwise, a <see cref="Tuple"/> is created.</param>
+	/// <returns>The created tuple.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="values"/> is null.</exception>
+	public static object ToTuple(this IEnumerable<object> values, bool isValue)
+	{
+		if (values is null)
+			throw new ArgumentNullException(nameof(values));
 
-		/// <summary>
-		/// Returns the values of a <see cref="ValueTuple{T1, T2, T3, T4, T5, T6}"/> as an enumerable collection.
-		/// </summary>
-		/// <typeparam name="T1">The type of the first element.</typeparam>
-		/// <typeparam name="T2">The type of the second element.</typeparam>
-		/// <typeparam name="T3">The type of the third element.</typeparam>
-		/// <typeparam name="T4">The type of the fourth element.</typeparam>
-		/// <typeparam name="T5">The type of the fifth element.</typeparam>
-		/// <typeparam name="T6">The type of the sixth element.</typeparam>
-		/// <param name="tuple">The tuple instance.</param>
-		/// <returns>An enumerable collection of tuple element values.</returns>
-		public static IEnumerable<object> ToValues<T1, T2, T3, T4, T5, T6>(this ValueTuple<T1, T2, T3, T4, T5, T6> tuple)
-		{
-			yield return tuple.Item1;
-			yield return tuple.Item2;
-			yield return tuple.Item3;
-			yield return tuple.Item4;
-			yield return tuple.Item5;
-			yield return tuple.Item6;
-		}
+		var types = new List<Type>();
+		var args = new List<object>();
 
-		/// <summary>
-		/// Creates a tuple from the provided collection of values.
-		/// </summary>
-		/// <param name="values">An enumerable collection of values.</param>
-		/// <param name="isValue">If set to true, a <see cref="ValueTuple"/> is created; otherwise, a <see cref="Tuple"/> is created.</param>
-		/// <returns>The created tuple.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="values"/> is null.</exception>
-		public static object ToTuple(this IEnumerable<object> values, bool isValue)
+		foreach (var value in values)
 		{
-			if (values is null)
-				throw new ArgumentNullException(nameof(values));
-
-			var types = new List<Type>();
-			var args = new List<object>();
-
-			foreach (var value in values)
-			{
-				types.Add(value?.GetType() ?? typeof(object));
-				args.Add(value);
-			}
+			types.Add(value?.GetType() ?? typeof(object));
+			args.Add(value);
+		}
 
-			var prefix = isValue ? "Value" : string.Empty;
+		var prefix = isValue ? "Value" : string.Empty;
 
-			var genericType = $"System.{prefix}Tuple`{types.Count}".To<Type>();
-			var specificType = genericType.Make(types);
+		var genericType = $"System.{prefix}Tuple`{types.Count}".To<Type>();
+		var specificType = genericType.Make(types);
 
-			return specificType.CreateInstance([.. args]);
-		}
+		return specificType.CreateInstance([.. args]);
+	}
 
-		/// <summary>
-		/// Extracts the values of a tuple instance into an enumerable collection.
-		/// </summary>
-		/// <typeparam name="T">The type of the tuple.</typeparam>
-		/// <param name="tuple">The tuple instance.</param>
-		/// <returns>An enumerable collection of tuple element values.</returns>
-		/// <exception cref="InvalidOperationException">Thrown when the provided object is not a tuple.</exception>
-		public static IEnumerable<object> ToValues<T>(this T tuple)
-		{
+	/// <summary>
+	/// Extracts the values of a tuple instance into an enumerable collection.
+	/// </summary>
+	/// <typeparam name="T">The type of the tuple.</typeparam>
+	/// <param name="tuple">The tuple instance.</param>
+	/// <returns>An enumerable collection of tuple element values.</returns>
+	/// <exception cref="InvalidOperationException">Thrown when the provided object is not a tuple.</exception>
+	public static IEnumerable<object> ToValues<T>(this T tuple)
+	{
 #if NETSTANDARD2_0
-			if (!tuple.GetType().IsTuple())
-				throw new InvalidOperationException($"Type {typeof(T)} is not tuple.");
+		if (!tuple.GetType().IsTuple())
+			throw new InvalidOperationException($"Type {typeof(T)} is not tuple.");
 #else
-			if (tuple is not ITuple)
-				throw new InvalidOperationException($"{tuple} is not tuple.");
+		if (tuple is not ITuple)
+			throw new InvalidOperationException($"{tuple} is not tuple.");
 #endif
 
-			var type = tuple.GetType();
+		var type = tuple.GetType();
 
-			if (type.IsClass)
-			{
-				return type
-					.GetProperties()
-					.Where(m => m.Name.StartsWith("Item"))
-					.OrderBy(m => m.Name)
-					.Select(m => m.GetValue(tuple));
-			}
-			else
-			{
-				return type
-					.GetFields()
-					.Where(m => m.Name.StartsWith("Item"))
-					.OrderBy(m => m.Name)
-					.Select(m => m.GetValue(tuple));
-			}
+		if (type.IsClass)
+		{
+			return type
+				.GetProperties()
+				.Where(m => m.Name.StartsWith("Item"))
+				.OrderBy(m => m.Name)
+				.Select(m => m.GetValue(tuple));
 		}
-
-		/// <summary>
-		/// Recursively unwraps all inner exceptions from the provided exception.
-		/// </summary>
-		/// <param name="exception">The exception to unwrap.</param>
-		/// <returns>An enumerable collection of exceptions, including the original exception and all nested inner exceptions.</returns>
-		public static IEnumerable<Exception> UnwrapExceptions(this Exception exception)
+		else
 		{
-			if (exception == null)
-				yield break;
+			return type
+				.GetFields()
+				.Where(m => m.Name.StartsWith("Item"))
+				.OrderBy(m => m.Name)
+				.Select(m => m.GetValue(tuple));
+		}
+	}
+
+	/// <summary>
+	/// Recursively unwraps all inner exceptions from the provided exception.
+	/// </summary>
+	/// <param name="exception">The exception to unwrap.</param>
+	/// <returns>An enumerable collection of exceptions, including the original exception and all nested inner exceptions.</returns>
+	public static IEnumerable<Exception> UnwrapExceptions(this Exception exception)
+	{
+		if (exception == null)
+			yield break;
 
-			yield return exception;
+		yield return exception;
 
-			if (exception is AggregateException ae)
-				foreach (var innerException in ae.InnerExceptions.SelectMany(ie => ie.UnwrapExceptions()))
-					yield return innerException;
+		if (exception is AggregateException ae)
+			foreach (var innerException in ae.InnerExceptions.SelectMany(ie => ie.UnwrapExceptions()))
+				yield return innerException;
 
-			if (exception.InnerException != null)
-				foreach (var innerException in exception.InnerException.UnwrapExceptions())
-					yield return innerException;
-		}
+		if (exception.InnerException != null)
+			foreach (var innerException in exception.InnerException.UnwrapExceptions())
+				yield return innerException;
 	}
 }
diff --git a/Common/TypeHelper.cs b/Common/TypeHelper.cs
index ef9bf299..2d9b251f 100644
--- a/Common/TypeHelper.cs
+++ b/Common/TypeHelper.cs
@@ -1,489 +1,488 @@
-namespace Ecng.Common
+namespace Ecng.Common;
+
+using System;
+using System.Collections.Generic;
+using System.Dynamic;
+using System.Reflection;
+using System.Runtime.Serialization;
+using System.Security.Cryptography;
+using System.Runtime.CompilerServices;
+
+/// <summary>
+/// Provides helper methods for working with types and related operations.
+/// </summary>
+public static class TypeHelper
 {
-	using System;
-	using System.Collections.Generic;
-	using System.Dynamic;
-	using System.Reflection;
-	using System.Runtime.Serialization;
-	using System.Security.Cryptography;
-	using System.Runtime.CompilerServices;
+	private static readonly FieldInfo _remoteStackTraceString;
+
+	static TypeHelper()
+	{
+		// Get the _remoteStackTraceString of the Exception class
+		_remoteStackTraceString = typeof(Exception)
+			.GetField("_remoteStackTraceString",
+				BindingFlags.Instance | BindingFlags.NonPublic); // MS.Net
+
+		if (_remoteStackTraceString is null)
+			_remoteStackTraceString = typeof(Exception)
+			.GetField("remote_stack_trace",
+				BindingFlags.Instance | BindingFlags.NonPublic); // Mono
+	}
+
+	private static readonly Type _enumType = typeof(Enum);
 
 	/// <summary>
-	/// Provides helper methods for working with types and related operations.
+	/// Creates an instance of the specified type using the given arguments.
 	/// </summary>
-	public static class TypeHelper
+	/// <param name="type">The type to instantiate.</param>
+	/// <param name="args">The constructor arguments.</param>
+	/// <returns>Returns the created instance as an object.</returns>
+	public static object CreateInstance(this Type type, params object[] args)
+		=> type.CreateInstance<object>(args);
+
+	/// <summary>
+	/// Creates an instance of a specified type T using the given arguments.
+	/// </summary>
+	/// <typeparam name="T">The type to instantiate.</typeparam>
+	/// <param name="type">The type to instantiate.</param>
+	/// <param name="args">The constructor arguments.</param>
+	/// <returns>Returns the created instance as T.</returns>
+	public static T CreateInstance<T>(this Type type, params object[] args)
 	{
-		private static readonly FieldInfo _remoteStackTraceString;
+		if (type is null)
+			throw new ArgumentNullException(nameof(type));
 
-		static TypeHelper()
-		{
-			// Get the _remoteStackTraceString of the Exception class
-			_remoteStackTraceString = typeof(Exception)
-				.GetField("_remoteStackTraceString",
-					BindingFlags.Instance | BindingFlags.NonPublic); // MS.Net
-
-			if (_remoteStackTraceString is null)
-				_remoteStackTraceString = typeof(Exception)
-				.GetField("remote_stack_trace",
-					BindingFlags.Instance | BindingFlags.NonPublic); // Mono
-		}
-
-		private static readonly Type _enumType = typeof(Enum);
-
-		/// <summary>
-		/// Creates an instance of the specified type using the given arguments.
-		/// </summary>
-		/// <param name="type">The type to instantiate.</param>
-		/// <param name="args">The constructor arguments.</param>
-		/// <returns>Returns the created instance as an object.</returns>
-		public static object CreateInstance(this Type type, params object[] args)
-			=> type.CreateInstance<object>(args);
-
-		/// <summary>
-		/// Creates an instance of a specified type T using the given arguments.
-		/// </summary>
-		/// <typeparam name="T">The type to instantiate.</typeparam>
-		/// <param name="type">The type to instantiate.</param>
-		/// <param name="args">The constructor arguments.</param>
-		/// <returns>Returns the created instance as T.</returns>
-		public static T CreateInstance<T>(this Type type, params object[] args)
-		{
-			if (type is null)
-				throw new ArgumentNullException(nameof(type));
-
-			if (args is null)
-				throw new ArgumentNullException(nameof(args));
-
-			var obj = type is ITypeConstructor ctor
-				? ctor.CreateInstance(args)
-				: Activator.CreateInstance(type, args);
-
-			return obj.To<T>();
-		}
-
-		/// <summary>
-		/// Makes a generic type using the provided type arguments.
-		/// </summary>
-		/// <param name="type">The generic type definition.</param>
-		/// <param name="args">The type arguments.</param>
-		/// <returns>Returns the constructed generic type.</returns>
-		public static Type Make(this Type type, params Type[] args)
-		{
-			if (type is null)
-				throw new ArgumentNullException(nameof(type));
-
-			if (args is null)
-				throw new ArgumentNullException(nameof(args));
-
-			return type.MakeGenericType(args);
-		}
-
-		/// <summary>
-		/// Makes a generic type using a list of provided type arguments.
-		/// </summary>
-		/// <param name="type">The generic type definition.</param>
-		/// <param name="args">The type arguments as an IEnumerable.</param>
-		/// <returns>Returns the constructed generic type.</returns>
-		public static Type Make(this Type type, IEnumerable<Type> args)
-		{
-			return type.Make([.. args]);
-		}
-
-		/// <summary>
-		/// Determines whether a type is considered primitive, including common system types.
-		/// </summary>
-		/// <param name="type">The type to check.</param>
-		/// <returns>Returns true if the type is primitive or commonly handled as a primitive.</returns>
-		public static bool IsPrimitive(this Type type)
-		{
-			if (type is null)
-				throw new ArgumentNullException(nameof(type));
-
-			return (
-						type.IsPrimitive ||
-						type.IsEnum() ||
-						type == typeof(decimal) ||
-						type == typeof(string) ||
-						type == typeof(DateTime) ||
-						type == typeof(DateTimeOffset) ||
-						type == typeof(Guid) ||
-						type == typeof(byte[]) ||
-						type == typeof(TimeSpan) ||
-						type == typeof(TimeZoneInfo)
-					);
-		}
-
-		/// <summary>
-		/// Determines if a type is numeric, including floating-point and decimal types.
-		/// </summary>
-		/// <param name="type">The type to check.</param>
-		/// <returns>Returns true if the type is numeric.</returns>
-		public static bool IsNumeric(this Type type)
-			=> Type.GetTypeCode(type) switch
-			{
-				TypeCode.Byte or
-				TypeCode.SByte or
-				TypeCode.UInt16 or
-				TypeCode.UInt32 or
-				TypeCode.UInt64 or
-				TypeCode.Int16 or
-				TypeCode.Int32 or
-				TypeCode.Int64 or
-				TypeCode.Decimal or
-				TypeCode.Double or
-				TypeCode.Single
-					=> true,
-				_ => false,
-			};
-
-		/// <summary>
-		/// Determines if a type is an integer numeric type.
-		/// </summary>
-		/// <param name="type">The type to check.</param>
-		/// <returns>Returns true if the type is an integer numeric type.</returns>
-		public static bool IsNumericInteger(this Type type)
-			=> Type.GetTypeCode(type) switch
-			{
-				TypeCode.Byte or
-				TypeCode.SByte or
-				TypeCode.UInt16 or
-				TypeCode.UInt32 or
-				TypeCode.UInt64 or
-				TypeCode.Int16 or
-				TypeCode.Int32 or
-				TypeCode.Int64
-					=> true,
-				_ => false,
-			};
-
-		/// <summary>
-		/// Retrieves the type name as a string either in assembly-qualified form or not.
-		/// </summary>
-		/// <param name="type">The type to convert.</param>
-		/// <param name="isAssemblyQualifiedName">True to return the assembly-qualified name.</param>
-		/// <returns>Returns the string representation of the type.</returns>
-		public static string GetTypeAsString(this Type type, bool isAssemblyQualifiedName)
-		{
-			if (type is null)
-				throw new ArgumentNullException(nameof(type));
-
-			return type.TryGetCSharpAlias().IsEmpty(type.GetTypeName(isAssemblyQualifiedName));
-		}
-
-		/// <summary>
-		/// Determines whether the specified type is a struct.
-		/// </summary>
-		/// <param name="type">The type to check.</param>
-		/// <returns>Returns true if the type is a struct.</returns>
-		public static bool IsStruct(this Type type)
-		{
-			if (type is null)
-				throw new ArgumentNullException(nameof(type));
-
-			return type.IsValueType && !type.IsEnum();
-		}
-
-		/// <summary>
-		/// Determines whether the specified type is an enum.
-		/// </summary>
-		/// <param name="type">The type to check.</param>
-		/// <returns>Returns true if the type is an enum.</returns>
-		public static bool IsEnum(this Type type)
-		{
-			if (type is null)
-				throw new ArgumentNullException(nameof(type));
-
-			//
-			// 2 times faster than Type.IsEnum
-			//
-			return type.BaseType == _enumType;
-		}
-
-		/// <summary>
-		/// Determines whether the specified type is an attribute.
-		/// </summary>
-		/// <param name="type">The type to check.</param>
-		/// <returns>Returns true if the type is an attribute.</returns>
-		public static bool IsAttribute(this Type type)
-			=> type.Is<Attribute>();
-
-		/// <summary>
-		/// Determines whether the specified type is a delegate.
-		/// </summary>
-		/// <param name="type">The type to check.</param>
-		/// <returns>Returns true if the type is a delegate.</returns>
-		public static bool IsDelegate(this Type type)
-			=> type.Is<Delegate>();
-
-		/// <summary>
-		/// Creates an uninitialized instance of the specified generic type parameter.
-		/// </summary>
-		/// <typeparam name="TEntity">The type to instantiate.</typeparam>
-		/// <returns>Returns the newly created uninitialized instance.</returns>
-		public static TEntity CreateUnitialized<TEntity>()
-		{
-			return (TEntity)typeof(TEntity).CreateUnitialized();
-		}
-
-		/// <summary>
-		/// Creates an uninitialized instance of the specified type.
-		/// </summary>
-		/// <param name="type">The type to instantiate.</param>
-		/// <returns>Returns the newly created uninitialized instance.</returns>
-		public static object CreateUnitialized(this Type type)
-		{
-			if (type is null)
-				throw new ArgumentNullException(nameof(type));
-
-			return FormatterServices.GetUninitializedObject(type);
-		}
-
-		/// <summary>
-		/// Disposes the source if it implements IDisposable.
-		/// </summary>
-		/// <typeparam name="TSource">The type of the source.</typeparam>
-		/// <param name="source">The instance to dispose.</param>
-		public static void DoDispose<TSource>(this TSource source)
-		{
-			if (source is IDisposable disposable)
-				disposable.Dispose();
-		}
+		if (args is null)
+			throw new ArgumentNullException(nameof(args));
 
-		private static readonly Lazy<string> _applicationName = new(() =>
-		{
-			var asm = Assembly.GetEntryAssembly();
-			if (asm is null)
-				return "None";
-			var attr = asm.GetAttribute<AssemblyTitleAttribute>();
-			return attr != null ? attr.Title : asm.GetName().Name;
-		});
-
-		/// <summary>
-		/// Gets the name of the application.
-		/// </summary>
-		public static string ApplicationName => _applicationName.Value;
-
-		private static readonly Lazy<string> _applicationNameWithVersion = new(() =>
-		{
-			var asm = Assembly.GetEntryAssembly();
+		var obj = type is ITypeConstructor ctor
+			? ctor.CreateInstance(args)
+			: Activator.CreateInstance(type, args);
 
-			if (asm is null)
-				return "None";
+		return obj.To<T>();
+	}
 
-			return ApplicationName + " v" + asm.GetName().Version;
-		});
+	/// <summary>
+	/// Makes a generic type using the provided type arguments.
+	/// </summary>
+	/// <param name="type">The generic type definition.</param>
+	/// <param name="args">The type arguments.</param>
+	/// <returns>Returns the constructed generic type.</returns>
+	public static Type Make(this Type type, params Type[] args)
+	{
+		if (type is null)
+			throw new ArgumentNullException(nameof(type));
 
-		/// <summary>
-		/// Gets the name of the application with version.
-		/// </summary>
-		public static string ApplicationNameWithVersion => _applicationNameWithVersion.Value;
+		if (args is null)
+			throw new ArgumentNullException(nameof(args));
 
-		// http://stackoverflow.com/questions/8517159/how-to-detect-at-runtime-that-net-version-4-5-currently-running-your-code
+		return type.MakeGenericType(args);
+	}
 
-		/// <summary>
-		/// Determines if the current environment is .NET 4.5 or newer.
-		/// </summary>
-		/// <returns>Returns true if .NET 4.5 or newer is running.</returns>
-		public static bool IsNet45OrNewer()
-		{
-			// Class "ReflectionContext" exists from .NET 4.5 onwards.
-			return Type.GetType("System.Reflection.ReflectionContext", false) != null;
-		}
-
-		/// <summary>
-		/// Gets the fully qualified name of a type or its assembly-qualified name.
-		/// </summary>
-		/// <param name="type">The type to convert.</param>
-		/// <param name="isAssemblyQualifiedName">Whether to return the assembly-qualified name.</param>
-		/// <returns>Returns the string representation of the type name.</returns>
-		public static string GetTypeName(this Type type, bool isAssemblyQualifiedName)
+	/// <summary>
+	/// Makes a generic type using a list of provided type arguments.
+	/// </summary>
+	/// <param name="type">The generic type definition.</param>
+	/// <param name="args">The type arguments as an IEnumerable.</param>
+	/// <returns>Returns the constructed generic type.</returns>
+	public static Type Make(this Type type, IEnumerable<Type> args)
+	{
+		return type.Make([.. args]);
+	}
+
+	/// <summary>
+	/// Determines whether a type is considered primitive, including common system types.
+	/// </summary>
+	/// <param name="type">The type to check.</param>
+	/// <returns>Returns true if the type is primitive or commonly handled as a primitive.</returns>
+	public static bool IsPrimitive(this Type type)
+	{
+		if (type is null)
+			throw new ArgumentNullException(nameof(type));
+
+		return (
+					type.IsPrimitive ||
+					type.IsEnum() ||
+					type == typeof(decimal) ||
+					type == typeof(string) ||
+					type == typeof(DateTime) ||
+					type == typeof(DateTimeOffset) ||
+					type == typeof(Guid) ||
+					type == typeof(byte[]) ||
+					type == typeof(TimeSpan) ||
+					type == typeof(TimeZoneInfo)
+				);
+	}
+
+	/// <summary>
+	/// Determines if a type is numeric, including floating-point and decimal types.
+	/// </summary>
+	/// <param name="type">The type to check.</param>
+	/// <returns>Returns true if the type is numeric.</returns>
+	public static bool IsNumeric(this Type type)
+		=> Type.GetTypeCode(type) switch
 		{
-			if (type is null)
-				throw new ArgumentNullException(nameof(type));
-
-			return isAssemblyQualifiedName
-				? type.AssemblyQualifiedName
-				: $"{type.FullName}, {type.Assembly.GetName().Name}";
-		}
-
-		/// <summary>
-		/// Gets the default value for the specified type.
-		/// </summary>
-		/// <param name="type">The type to get the default value for.</param>
-		/// <returns>Returns the default value as an object.</returns>
-		public static object GetDefaultValue(this Type type)
+			TypeCode.Byte or
+			TypeCode.SByte or
+			TypeCode.UInt16 or
+			TypeCode.UInt32 or
+			TypeCode.UInt64 or
+			TypeCode.Int16 or
+			TypeCode.Int32 or
+			TypeCode.Int64 or
+			TypeCode.Decimal or
+			TypeCode.Double or
+			TypeCode.Single
+				=> true,
+			_ => false,
+		};
+
+	/// <summary>
+	/// Determines if a type is an integer numeric type.
+	/// </summary>
+	/// <param name="type">The type to check.</param>
+	/// <returns>Returns true if the type is an integer numeric type.</returns>
+	public static bool IsNumericInteger(this Type type)
+		=> Type.GetTypeCode(type) switch
 		{
-			return type.IsValueType ? Activator.CreateInstance(type) : null;
-		}
+			TypeCode.Byte or
+			TypeCode.SByte or
+			TypeCode.UInt16 or
+			TypeCode.UInt32 or
+			TypeCode.UInt64 or
+			TypeCode.Int16 or
+			TypeCode.Int32 or
+			TypeCode.Int64
+				=> true,
+			_ => false,
+		};
 
-		// http://stackoverflow.com/questions/57383/in-c-how-can-i-rethrow-innerexception-without-losing-stack-trace
+	/// <summary>
+	/// Retrieves the type name as a string either in assembly-qualified form or not.
+	/// </summary>
+	/// <param name="type">The type to convert.</param>
+	/// <param name="isAssemblyQualifiedName">True to return the assembly-qualified name.</param>
+	/// <returns>Returns the string representation of the type.</returns>
+	public static string GetTypeAsString(this Type type, bool isAssemblyQualifiedName)
+	{
+		if (type is null)
+			throw new ArgumentNullException(nameof(type));
 
-		/// <summary>
-		/// Throws the specified exception while preserving the original stack trace.
-		/// </summary>
-		/// <param name="ex">The exception to throw.</param>
-		public static void Throw(this Exception ex)
-		{
-			if (ex is null)
-				throw new ArgumentNullException(nameof(ex));
+		return type.TryGetCSharpAlias().IsEmpty(type.GetTypeName(isAssemblyQualifiedName));
+	}
+
+	/// <summary>
+	/// Determines whether the specified type is a struct.
+	/// </summary>
+	/// <param name="type">The type to check.</param>
+	/// <returns>Returns true if the type is a struct.</returns>
+	public static bool IsStruct(this Type type)
+	{
+		if (type is null)
+			throw new ArgumentNullException(nameof(type));
+
+		return type.IsValueType && !type.IsEnum();
+	}
+
+	/// <summary>
+	/// Determines whether the specified type is an enum.
+	/// </summary>
+	/// <param name="type">The type to check.</param>
+	/// <returns>Returns true if the type is an enum.</returns>
+	public static bool IsEnum(this Type type)
+	{
+		if (type is null)
+			throw new ArgumentNullException(nameof(type));
+
+		//
+		// 2 times faster than Type.IsEnum
+		//
+		return type.BaseType == _enumType;
+	}
+
+	/// <summary>
+	/// Determines whether the specified type is an attribute.
+	/// </summary>
+	/// <param name="type">The type to check.</param>
+	/// <returns>Returns true if the type is an attribute.</returns>
+	public static bool IsAttribute(this Type type)
+		=> type.Is<Attribute>();
+
+	/// <summary>
+	/// Determines whether the specified type is a delegate.
+	/// </summary>
+	/// <param name="type">The type to check.</param>
+	/// <returns>Returns true if the type is a delegate.</returns>
+	public static bool IsDelegate(this Type type)
+		=> type.Is<Delegate>();
+
+	/// <summary>
+	/// Creates an uninitialized instance of the specified generic type parameter.
+	/// </summary>
+	/// <typeparam name="TEntity">The type to instantiate.</typeparam>
+	/// <returns>Returns the newly created uninitialized instance.</returns>
+	public static TEntity CreateUnitialized<TEntity>()
+	{
+		return (TEntity)typeof(TEntity).CreateUnitialized();
+	}
+
+	/// <summary>
+	/// Creates an uninitialized instance of the specified type.
+	/// </summary>
+	/// <param name="type">The type to instantiate.</param>
+	/// <returns>Returns the newly created uninitialized instance.</returns>
+	public static object CreateUnitialized(this Type type)
+	{
+		if (type is null)
+			throw new ArgumentNullException(nameof(type));
+
+		return FormatterServices.GetUninitializedObject(type);
+	}
+
+	/// <summary>
+	/// Disposes the source if it implements IDisposable.
+	/// </summary>
+	/// <typeparam name="TSource">The type of the source.</typeparam>
+	/// <param name="source">The instance to dispose.</param>
+	public static void DoDispose<TSource>(this TSource source)
+	{
+		if (source is IDisposable disposable)
+			disposable.Dispose();
+	}
+
+	private static readonly Lazy<string> _applicationName = new(() =>
+	{
+		var asm = Assembly.GetEntryAssembly();
+		if (asm is null)
+			return "None";
+		var attr = asm.GetAttribute<AssemblyTitleAttribute>();
+		return attr != null ? attr.Title : asm.GetName().Name;
+	});
+
+	/// <summary>
+	/// Gets the name of the application.
+	/// </summary>
+	public static string ApplicationName => _applicationName.Value;
+
+	private static readonly Lazy<string> _applicationNameWithVersion = new(() =>
+	{
+		var asm = Assembly.GetEntryAssembly();
+
+		if (asm is null)
+			return "None";
 
-			_remoteStackTraceString.SetValue(ex, ex.StackTrace + Environment.NewLine);
+		return ApplicationName + " v" + asm.GetName().Version;
+	});
 
-			throw ex;
-		}
+	/// <summary>
+	/// Gets the name of the application with version.
+	/// </summary>
+	public static string ApplicationNameWithVersion => _applicationNameWithVersion.Value;
+
+	// http://stackoverflow.com/questions/8517159/how-to-detect-at-runtime-that-net-version-4-5-currently-running-your-code
+
+	/// <summary>
+	/// Determines if the current environment is .NET 4.5 or newer.
+	/// </summary>
+	/// <returns>Returns true if .NET 4.5 or newer is running.</returns>
+	public static bool IsNet45OrNewer()
+	{
+		// Class "ReflectionContext" exists from .NET 4.5 onwards.
+		return Type.GetType("System.Reflection.ReflectionContext", false) != null;
+	}
+
+	/// <summary>
+	/// Gets the fully qualified name of a type or its assembly-qualified name.
+	/// </summary>
+	/// <param name="type">The type to convert.</param>
+	/// <param name="isAssemblyQualifiedName">Whether to return the assembly-qualified name.</param>
+	/// <returns>Returns the string representation of the type name.</returns>
+	public static string GetTypeName(this Type type, bool isAssemblyQualifiedName)
+	{
+		if (type is null)
+			throw new ArgumentNullException(nameof(type));
+
+		return isAssemblyQualifiedName
+			? type.AssemblyQualifiedName
+			: $"{type.FullName}, {type.Assembly.GetName().Name}";
+	}
+
+	/// <summary>
+	/// Gets the default value for the specified type.
+	/// </summary>
+	/// <param name="type">The type to get the default value for.</param>
+	/// <returns>Returns the default value as an object.</returns>
+	public static object GetDefaultValue(this Type type)
+	{
+		return type.IsValueType ? Activator.CreateInstance(type) : null;
+	}
+
+	// http://stackoverflow.com/questions/57383/in-c-how-can-i-rethrow-innerexception-without-losing-stack-trace
+
+	/// <summary>
+	/// Throws the specified exception while preserving the original stack trace.
+	/// </summary>
+	/// <param name="ex">The exception to throw.</param>
+	public static void Throw(this Exception ex)
+	{
+		if (ex is null)
+			throw new ArgumentNullException(nameof(ex));
+
+		_remoteStackTraceString.SetValue(ex, ex.StackTrace + Environment.NewLine);
+
+		throw ex;
+	}
 
-		/// <summary>
-		/// Generates a salt byte array of the specified size.
-		/// </summary>
-		/// <param name="saltSize">The size of the salt array to create.</param>
-		/// <returns>Returns a byte array representing the salt.</returns>
-		public static byte[] GenerateSalt(int saltSize)
+	/// <summary>
+	/// Generates a salt byte array of the specified size.
+	/// </summary>
+	/// <param name="saltSize">The size of the salt array to create.</param>
+	/// <returns>Returns a byte array representing the salt.</returns>
+	public static byte[] GenerateSalt(int saltSize)
 #if NET5_0_OR_GREATER
-			=> RandomNumberGenerator.GetBytes(saltSize);
+		=> RandomNumberGenerator.GetBytes(saltSize);
 #else
-		{
-			var salt = new byte[saltSize];
+	{
+		var salt = new byte[saltSize];
 
-			using var saltGen = new RNGCryptoServiceProvider();
-			saltGen.GetBytes(salt);
+		using var saltGen = new RNGCryptoServiceProvider();
+		saltGen.GetBytes(salt);
 
-			return salt;
-		}
+		return salt;
+	}
 #endif
 
-		/// <summary>
-		/// Creates a scope for the specified value with optional ownership.
-		/// </summary>
-		/// <typeparam name="T">The type of the resource.</typeparam>
-		/// <param name="value">The resource to be scoped.</param>
-		/// <param name="ownInstance">Whether the scope owns the instance.</param>
-		/// <returns>Returns the newly created Scope.</returns>
-		public static Scope<T> ToScope<T>(this T value, bool ownInstance = true)
-		{
-			return new Scope<T>(value, ownInstance);
-		}
-
-		/// <summary>
-		/// Returns either a single exception or an aggregate if there are multiple exceptions.
-		/// </summary>
-		/// <param name="errors">A collection of exceptions.</param>
-		/// <returns>Returns one exception or an AggregateException.</returns>
-		public static Exception SingleOrAggr(this IList<Exception> errors)
-		{
-			if (errors is null)
-				throw new ArgumentNullException(nameof(errors));
-
-			return errors.Count == 1 ? errors[0] : new AggregateException(errors);
-		}
-
-		/// <summary>
-		/// Checks if a value is null and throws an exception if it is.
-		/// </summary>
-		/// <typeparam name="T">The reference type to check.</typeparam>
-		/// <param name="value">The value to check for null.</param>
-		/// <param name="paramName">The name of the parameter.</param>
-		/// <returns>Returns the provided value if not null.</returns>
-		public static T CheckOnNull<T>(this T value, string paramName = "value")
-			where T : class
-		{
-			if (value is null)
-				throw new ArgumentNullException(paramName);
-
-			return value;
-		}
-
-		/// <summary>
-		/// Retrieves the platform attribute for the specified type.
-		/// </summary>
-		/// <param name="type">The type to inspect.</param>
-		/// <returns>Returns the platform value defined by TargetPlatformAttribute or AnyCPU.</returns>
-		public static Platforms GetPlatform(this Type type) => type.GetAttribute<TargetPlatformAttribute>()?.Platform ?? Platforms.AnyCPU;
-
-		/// <summary>
-		/// Extracts the high word from the integer.
-		/// </summary>
-		/// <param name="iValue">The integer value.</param>
-		/// <returns>Returns the high word.</returns>
-		public static int HiWord(this int iValue)
-		{
-			return (iValue >> 16) & 0xFFFF;
-		}
-
-		/// <summary>
-		/// Extracts the low word from the integer.
-		/// </summary>
-		/// <param name="iValue">The integer value.</param>
-		/// <returns>Returns the low word.</returns>
-		public static int LoWord(this int iValue)
-		{
-			return iValue & 0xFFFF;
-		}
-
-		// https://stackoverflow.com/a/30528667
-
-		/// <summary>
-		/// Checks if a dynamic or regular object has a property with the specified name.
-		/// </summary>
-		/// <param name="settings">The object to inspect.</param>
-		/// <param name="name">The property name.</param>
-		/// <returns>Returns true if the property exists.</returns>
-		public static bool HasProperty(this object settings, string name)
-		{
-			if (settings is ExpandoObject)
-				return ((IDictionary<string, object>)settings).ContainsKey(name);
-
-			return settings.GetType().GetProperty(name) != null;
-		}
-
-		/// <summary>
-		/// Indicates whether a type is the specified base type or derives from it.
-		/// </summary>
-		/// <typeparam name="TBase">The base type to check.</typeparam>
-		/// <param name="type">The type to compare.</param>
-		/// <param name="canSame">Allows checking if the types are the same.</param>
-		/// <returns>Returns true if type is or derives from the base type.</returns>
-		public static bool Is<TBase>(this Type type, bool canSame = true)
-			=> type.Is(typeof(TBase), canSame);
-
-		/// <summary>
-		/// Indicates whether a type is the specified base type or derives from it.
-		/// </summary>
-		/// <param name="type">The type to compare.</param>
-		/// <param name="baseType">The base type.</param>
-		/// <param name="canSame">Allows checking if the types are the same.</param>
-		/// <returns>Returns true if type is or derives from the base type.</returns>
-		public static bool Is(this Type type, Type baseType, bool canSame = true)
-			=> baseType.CheckOnNull(nameof(baseType)).IsAssignableFrom(type) && (canSame || type != baseType);
-
-		/// <summary>
-		/// Determines if the specified type is generated by a compiler.
-		/// </summary>
-		/// <param name="type">The type to check.</param>
-		/// <returns>Returns true if the type has a CompilerGeneratedAttribute.</returns>
-		public static bool IsAutoGenerated(this Type type)
-			=> type.GetAttribute<CompilerGeneratedAttribute>() is not null;
-
-		/// <summary>
-		/// Ensures the static constructor for a type is run.
-		/// </summary>
-		/// <param name="type">The type to use.</param>
-		public static void EnsureRunClass(this Type type)
-			=> RuntimeHelpers.RunClassConstructor(type.TypeHandle);
-
-		/// <summary>
-		/// Checks if a string is a valid web link.
-		/// </summary>
-		/// <param name="link">The link to check.</param>
-		/// <returns>Returns true if the link is a valid absolute URI.</returns>
-		public static bool IsValidWebLink(this string link)
-			=> Uri.TryCreate(link, UriKind.Absolute, out var uri) && uri.IsWebLink();
-
-		/// <summary>
-		/// Checks if a URI is a web-based link (http, https, or ftp).
-		/// </summary>
-		/// <param name="uri">The URI to check.</param>
-		/// <returns>Returns true if the URI is web-based.</returns>
-		public static bool IsWebLink(this Uri uri)
-			=> uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps || uri.Scheme == Uri.UriSchemeFtp;
+	/// <summary>
+	/// Creates a scope for the specified value with optional ownership.
+	/// </summary>
+	/// <typeparam name="T">The type of the resource.</typeparam>
+	/// <param name="value">The resource to be scoped.</param>
+	/// <param name="ownInstance">Whether the scope owns the instance.</param>
+	/// <returns>Returns the newly created Scope.</returns>
+	public static Scope<T> ToScope<T>(this T value, bool ownInstance = true)
+	{
+		return new Scope<T>(value, ownInstance);
 	}
+
+	/// <summary>
+	/// Returns either a single exception or an aggregate if there are multiple exceptions.
+	/// </summary>
+	/// <param name="errors">A collection of exceptions.</param>
+	/// <returns>Returns one exception or an AggregateException.</returns>
+	public static Exception SingleOrAggr(this IList<Exception> errors)
+	{
+		if (errors is null)
+			throw new ArgumentNullException(nameof(errors));
+
+		return errors.Count == 1 ? errors[0] : new AggregateException(errors);
+	}
+
+	/// <summary>
+	/// Checks if a value is null and throws an exception if it is.
+	/// </summary>
+	/// <typeparam name="T">The reference type to check.</typeparam>
+	/// <param name="value">The value to check for null.</param>
+	/// <param name="paramName">The name of the parameter.</param>
+	/// <returns>Returns the provided value if not null.</returns>
+	public static T CheckOnNull<T>(this T value, string paramName = "value")
+		where T : class
+	{
+		if (value is null)
+			throw new ArgumentNullException(paramName);
+
+		return value;
+	}
+
+	/// <summary>
+	/// Retrieves the platform attribute for the specified type.
+	/// </summary>
+	/// <param name="type">The type to inspect.</param>
+	/// <returns>Returns the platform value defined by TargetPlatformAttribute or AnyCPU.</returns>
+	public static Platforms GetPlatform(this Type type) => type.GetAttribute<TargetPlatformAttribute>()?.Platform ?? Platforms.AnyCPU;
+
+	/// <summary>
+	/// Extracts the high word from the integer.
+	/// </summary>
+	/// <param name="iValue">The integer value.</param>
+	/// <returns>Returns the high word.</returns>
+	public static int HiWord(this int iValue)
+	{
+		return (iValue >> 16) & 0xFFFF;
+	}
+
+	/// <summary>
+	/// Extracts the low word from the integer.
+	/// </summary>
+	/// <param name="iValue">The integer value.</param>
+	/// <returns>Returns the low word.</returns>
+	public static int LoWord(this int iValue)
+	{
+		return iValue & 0xFFFF;
+	}
+
+	// https://stackoverflow.com/a/30528667
+
+	/// <summary>
+	/// Checks if a dynamic or regular object has a property with the specified name.
+	/// </summary>
+	/// <param name="settings">The object to inspect.</param>
+	/// <param name="name">The property name.</param>
+	/// <returns>Returns true if the property exists.</returns>
+	public static bool HasProperty(this object settings, string name)
+	{
+		if (settings is ExpandoObject)
+			return ((IDictionary<string, object>)settings).ContainsKey(name);
+
+		return settings.GetType().GetProperty(name) != null;
+	}
+
+	/// <summary>
+	/// Indicates whether a type is the specified base type or derives from it.
+	/// </summary>
+	/// <typeparam name="TBase">The base type to check.</typeparam>
+	/// <param name="type">The type to compare.</param>
+	/// <param name="canSame">Allows checking if the types are the same.</param>
+	/// <returns>Returns true if type is or derives from the base type.</returns>
+	public static bool Is<TBase>(this Type type, bool canSame = true)
+		=> type.Is(typeof(TBase), canSame);
+
+	/// <summary>
+	/// Indicates whether a type is the specified base type or derives from it.
+	/// </summary>
+	/// <param name="type">The type to compare.</param>
+	/// <param name="baseType">The base type.</param>
+	/// <param name="canSame">Allows checking if the types are the same.</param>
+	/// <returns>Returns true if type is or derives from the base type.</returns>
+	public static bool Is(this Type type, Type baseType, bool canSame = true)
+		=> baseType.CheckOnNull(nameof(baseType)).IsAssignableFrom(type) && (canSame || type != baseType);
+
+	/// <summary>
+	/// Determines if the specified type is generated by a compiler.
+	/// </summary>
+	/// <param name="type">The type to check.</param>
+	/// <returns>Returns true if the type has a CompilerGeneratedAttribute.</returns>
+	public static bool IsAutoGenerated(this Type type)
+		=> type.GetAttribute<CompilerGeneratedAttribute>() is not null;
+
+	/// <summary>
+	/// Ensures the static constructor for a type is run.
+	/// </summary>
+	/// <param name="type">The type to use.</param>
+	public static void EnsureRunClass(this Type type)
+		=> RuntimeHelpers.RunClassConstructor(type.TypeHandle);
+
+	/// <summary>
+	/// Checks if a string is a valid web link.
+	/// </summary>
+	/// <param name="link">The link to check.</param>
+	/// <returns>Returns true if the link is a valid absolute URI.</returns>
+	public static bool IsValidWebLink(this string link)
+		=> Uri.TryCreate(link, UriKind.Absolute, out var uri) && uri.IsWebLink();
+
+	/// <summary>
+	/// Checks if a URI is a web-based link (http, https, or ftp).
+	/// </summary>
+	/// <param name="uri">The URI to check.</param>
+	/// <returns>Returns true if the URI is web-based.</returns>
+	public static bool IsWebLink(this Uri uri)
+		=> uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps || uri.Scheme == Uri.UriSchemeFtp;
 }
\ No newline at end of file
diff --git a/Common/Watch.cs b/Common/Watch.cs
index d9b7e808..0a5ad708 100644
--- a/Common/Watch.cs
+++ b/Common/Watch.cs
@@ -1,26 +1,25 @@
-namespace Ecng.Common
-{
-	using System;
-	using System.Diagnostics;
+namespace Ecng.Common;
+
+using System;
+using System.Diagnostics;
 
+/// <summary>
+/// Provides utility methods for timing the execution of code.
+/// </summary>
+public static class Watch
+{
 	/// <summary>
-	/// Provides utility methods for timing the execution of code.
+	/// Executes the specified action, measures its execution time, and returns the elapsed time.
 	/// </summary>
-	public static class Watch
+	/// <param name="action">The action to execute.</param>
+	/// <returns>
+	/// A <see cref="TimeSpan"/> representing the elapsed time during the execution of the action.
+	/// </returns>
+	public static TimeSpan Do(Action action)
 	{
-		/// <summary>
-		/// Executes the specified action, measures its execution time, and returns the elapsed time.
-		/// </summary>
-		/// <param name="action">The action to execute.</param>
-		/// <returns>
-		/// A <see cref="TimeSpan"/> representing the elapsed time during the execution of the action.
-		/// </returns>
-		public static TimeSpan Do(Action action)
-		{
-			var watch = Stopwatch.StartNew();
-			action();
-			watch.Stop();
-			return watch.Elapsed;
-		}
+		var watch = Stopwatch.StartNew();
+		action();
+		watch.Stop();
+		return watch.Elapsed;
 	}
 }
\ No newline at end of file
diff --git a/Common/Wrapper.cs b/Common/Wrapper.cs
index e0b541a4..deb38d0a 100644
--- a/Common/Wrapper.cs
+++ b/Common/Wrapper.cs
@@ -1,165 +1,164 @@
-namespace Ecng.Common
-{
-	#region Using Directives
+namespace Ecng.Common;
 
-	using System;
-	using System.Collections;
-	using System.Collections.Generic;
-	using System.Linq;
+#region Using Directives
 
-	#endregion
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+
+#endregion
+
+/// <summary>
+/// Represents an abstract wrapper class for a value of type <typeparamref name="T"/> that supports equality, cloning, and disposal.
+/// </summary>
+/// <typeparam name="T">The type of the wrapped value.</typeparam>
+[Serializable]
+public abstract class Wrapper<T> : Equatable<Wrapper<T>>, IDisposable
+{
+	#region Wrapper.ctor()
 
 	/// <summary>
-	/// Represents an abstract wrapper class for a value of type <typeparamref name="T"/> that supports equality, cloning, and disposal.
+	/// Initializes a new instance of the <see cref="Wrapper{T}"/> class.
 	/// </summary>
-	/// <typeparam name="T">The type of the wrapped value.</typeparam>
-	[Serializable]
-	public abstract class Wrapper<T> : Equatable<Wrapper<T>>, IDisposable
+	protected Wrapper()
 	{
-		#region Wrapper.ctor()
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="Wrapper{T}"/> class.
-		/// </summary>
-		protected Wrapper()
-		{
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="Wrapper{T}"/> class with the specified value.
+	/// </summary>
+	/// <param name="value">The value to wrap.</param>
+	protected Wrapper(T value)
+	{
+		Value = value;
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="Wrapper{T}"/> class with the specified value.
-		/// </summary>
-		/// <param name="value">The value to wrap.</param>
-		protected Wrapper(T value)
-		{
-			Value = value;
-		}
+	#endregion
 
-		#endregion
+	#region Properties
 
-		#region Properties
+	/// <summary>
+	/// Gets or sets the wrapped value.
+	/// </summary>
+	public virtual T Value { get; set; }
+
+	/// <summary>
+	/// Gets a value indicating whether the wrapped value is not equal to the default value of type <typeparamref name="T"/>.
+	/// </summary>
+	public bool HasValue => !ReferenceEquals(Value, default(T));
 
-		/// <summary>
-		/// Gets or sets the wrapped value.
-		/// </summary>
-		public virtual T Value { get; set; }
+	#endregion
 
-		/// <summary>
-		/// Gets a value indicating whether the wrapped value is not equal to the default value of type <typeparamref name="T"/>.
-		/// </summary>
-		public bool HasValue => !ReferenceEquals(Value, default(T));
+	#region Operators
 
-		#endregion
+	/// <summary>
+	/// Defines an explicit conversion operator from <see cref="Wrapper{T}"/> to <typeparamref name="T"/>.
+	/// </summary>
+	/// <param name="wrapper">The wrapper instance.</param>
+	/// <returns>The wrapped value.</returns>
+	public static explicit operator T(Wrapper<T> wrapper)
+	{
+		return wrapper.Value;
+	}
 
-		#region Operators
+	#endregion
 
-		/// <summary>
-		/// Defines an explicit conversion operator from <see cref="Wrapper{T}"/> to <typeparamref name="T"/>.
-		/// </summary>
-		/// <param name="wrapper">The wrapper instance.</param>
-		/// <returns>The wrapped value.</returns>
-		public static explicit operator T(Wrapper<T> wrapper)
-		{
-			return wrapper.Value;
-		}
+	#region Equality Members
 
-		#endregion
+	/// <summary>
+	/// Determines whether the wrapped value of this instance equals the wrapped value of another instance.
+	/// </summary>
+	/// <param name="other">Another instance of <see cref="Wrapper{T}"/> to compare with.</param>
+	/// <returns><c>true</c> if the wrapped values are equal; otherwise, <c>false</c>.</returns>
+	protected override bool OnEquals(Wrapper<T> other)
+	{
+		if (Value is IEnumerable<T>)
+			return ((IEnumerable<T>)Value).SequenceEqual((IEnumerable<T>)other.Value);
+		else
+			return Value.Equals(other.Value);
+	}
 
-		#region Equality Members
+	/// <summary>
+	/// Returns a hash code for this instance based on the wrapped value.
+	/// </summary>
+	/// <returns>A hash code for the current object.</returns>
+	public override int GetHashCode()
+	{
+		int hash = 0;
 
-		/// <summary>
-		/// Determines whether the wrapped value of this instance equals the wrapped value of another instance.
-		/// </summary>
-		/// <param name="other">Another instance of <see cref="Wrapper{T}"/> to compare with.</param>
-		/// <returns><c>true</c> if the wrapped values are equal; otherwise, <c>false</c>.</returns>
-		protected override bool OnEquals(Wrapper<T> other)
+		if (HasValue)
 		{
-			if (Value is IEnumerable<T>)
-				return ((IEnumerable<T>)Value).SequenceEqual((IEnumerable<T>)other.Value);
+			if (Value is ICollection)
+				throw new NotImplementedException();
 			else
-				return Value.Equals(other.Value);
+				hash = Value.GetHashCode();
 		}
 
-		/// <summary>
-		/// Returns a hash code for this instance based on the wrapped value.
-		/// </summary>
-		/// <returns>A hash code for the current object.</returns>
-		public override int GetHashCode()
-		{
-			int hash = 0;
-
-			if (HasValue)
-			{
-				if (Value is ICollection)
-					throw new NotImplementedException();
-				else
-					hash = Value.GetHashCode();
-			}
-
-			return hash;
-		}
+		return hash;
+	}
 
-		#endregion
+	#endregion
 
-		#region IDisposable Members
+	#region IDisposable Members
 
-		/// <summary>
-		/// Gets a value indicating whether this instance has already been disposed.
-		/// </summary>
-		public bool IsDisposed { get; private set; }
+	/// <summary>
+	/// Gets a value indicating whether this instance has already been disposed.
+	/// </summary>
+	public bool IsDisposed { get; private set; }
 
-		/// <summary>
-		/// Releases all resources used by the current instance.
-		/// </summary>
-		public void Dispose()
+	/// <summary>
+	/// Releases all resources used by the current instance.
+	/// </summary>
+	public void Dispose()
+	{
+		lock (this)
 		{
-			lock (this)
+			if (!IsDisposed)
 			{
-				if (!IsDisposed)
-				{
-					DisposeManaged();
-					DisposeNative();
-					IsDisposed = true;
-					GC.SuppressFinalize(this);
-				}
+				DisposeManaged();
+				DisposeNative();
+				IsDisposed = true;
+				GC.SuppressFinalize(this);
 			}
 		}
+	}
 
-		/// <summary>
-		/// Releases managed resources used by the current instance.
-		/// </summary>
-		protected virtual void DisposeManaged()
-		{
-			Value.DoDispose();
-		}
-
-		/// <summary>
-		/// Releases unmanaged (native) resources used by the current instance.
-		/// </summary>
-		protected virtual void DisposeNative()
-		{
-		}
+	/// <summary>
+	/// Releases managed resources used by the current instance.
+	/// </summary>
+	protected virtual void DisposeManaged()
+	{
+		Value.DoDispose();
+	}
 
-		/// <summary>
-		/// Finalizes an instance of the <see cref="Wrapper{T}"/> class.
-		/// </summary>
-		~Wrapper()
-		{
-			DisposeNative();
-		}
+	/// <summary>
+	/// Releases unmanaged (native) resources used by the current instance.
+	/// </summary>
+	protected virtual void DisposeNative()
+	{
+	}
 
-		#endregion
+	/// <summary>
+	/// Finalizes an instance of the <see cref="Wrapper{T}"/> class.
+	/// </summary>
+	~Wrapper()
+	{
+		DisposeNative();
+	}
 
-		#region Object Overrides
+	#endregion
 
-		/// <summary>
-		/// Returns a string that represents the current instance.
-		/// </summary>
-		/// <returns>A string representation of the wrapped value, or an empty string if no value is present.</returns>
-		public override string ToString()
-		{
-			return HasValue ? Value.To<string>() : string.Empty;
-		}
+	#region Object Overrides
 
-		#endregion
+	/// <summary>
+	/// Returns a string that represents the current instance.
+	/// </summary>
+	/// <returns>A string representation of the wrapped value, or an empty string if no value is present.</returns>
+	public override string ToString()
+	{
+		return HasValue ? Value.To<string>() : string.Empty;
 	}
+
+	#endregion
 }
\ No newline at end of file
diff --git a/Common/XmlHelper.cs b/Common/XmlHelper.cs
index e77f8199..68f108ce 100644
--- a/Common/XmlHelper.cs
+++ b/Common/XmlHelper.cs
@@ -1,103 +1,102 @@
-namespace Ecng.Common
-{
-	using System;
-	using System.Linq;
-	using System.Xml;
-	using System.Xml.Linq;
+namespace Ecng.Common;
+
+using System;
+using System.Linq;
+using System.Xml;
+using System.Xml.Linq;
 
+/// <summary>
+/// Provides helper extension methods for working with XML elements, attributes, and XML strings.
+/// </summary>
+public static class XmlHelper
+{
 	/// <summary>
-	/// Provides helper extension methods for working with XML elements, attributes, and XML strings.
+	/// Retrieves the value of the child element with the specified name and converts it to the specified type.
 	/// </summary>
-	public static class XmlHelper
+	/// <typeparam name="T">The type to which the element's value should be converted.</typeparam>
+	/// <param name="parent">The parent XML element.</param>
+	/// <param name="name">The name of the child element.</param>
+	/// <param name="defaultValue">The default value to return if the element is not found.</param>
+	/// <returns>The converted value of the child element, or the default value if the element does not exist.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when the parent element is null.</exception>
+	public static T GetElementValue<T>(this XElement parent, XName name, T defaultValue = default)
 	{
-		/// <summary>
-		/// Retrieves the value of the child element with the specified name and converts it to the specified type.
-		/// </summary>
-		/// <typeparam name="T">The type to which the element's value should be converted.</typeparam>
-		/// <param name="parent">The parent XML element.</param>
-		/// <param name="name">The name of the child element.</param>
-		/// <param name="defaultValue">The default value to return if the element is not found.</param>
-		/// <returns>The converted value of the child element, or the default value if the element does not exist.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when the parent element is null.</exception>
-		public static T GetElementValue<T>(this XElement parent, XName name, T defaultValue = default)
-		{
-			if (parent is null)
-				throw new ArgumentNullException(nameof(parent));
+		if (parent is null)
+			throw new ArgumentNullException(nameof(parent));
 
-			var elem = parent.Element(name);
-			return elem is null ? defaultValue : elem.Value.To<T>();
-		}
+		var elem = parent.Element(name);
+		return elem is null ? defaultValue : elem.Value.To<T>();
+	}
 
-		/// <summary>
-		/// Retrieves the value of the attribute with the specified name and converts it to the specified type.
-		/// </summary>
-		/// <typeparam name="T">The type to which the attribute's value should be converted.</typeparam>
-		/// <param name="elem">The XML element containing the attribute.</param>
-		/// <param name="name">The name of the attribute.</param>
-		/// <param name="defaultValue">The default value to return if the attribute is not found.</param>
-		/// <returns>The converted value of the attribute, or the default value if the attribute does not exist.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when the XML element is null.</exception>
-		public static T GetAttributeValue<T>(this XElement elem, XName name, T defaultValue = default)
-		{
-			if (elem is null)
-				throw new ArgumentNullException(nameof(elem));
+	/// <summary>
+	/// Retrieves the value of the attribute with the specified name and converts it to the specified type.
+	/// </summary>
+	/// <typeparam name="T">The type to which the attribute's value should be converted.</typeparam>
+	/// <param name="elem">The XML element containing the attribute.</param>
+	/// <param name="name">The name of the attribute.</param>
+	/// <param name="defaultValue">The default value to return if the attribute is not found.</param>
+	/// <returns>The converted value of the attribute, or the default value if the attribute does not exist.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when the XML element is null.</exception>
+	public static T GetAttributeValue<T>(this XElement elem, XName name, T defaultValue = default)
+	{
+		if (elem is null)
+			throw new ArgumentNullException(nameof(elem));
 
-			var attr = elem.Attribute(name);
-			return attr is null ? defaultValue : attr.Value.To<T>();
-		}
+		var attr = elem.Attribute(name);
+		return attr is null ? defaultValue : attr.Value.To<T>();
+	}
 
-		/// <summary>
-		/// Writes an attribute with the specified name and value to the XmlWriter.
-		/// </summary>
-		/// <param name="writer">The XML writer.</param>
-		/// <param name="name">The name of the attribute to write.</param>
-		/// <param name="value">The value of the attribute. If null, an empty string is written.</param>
-		/// <returns>The same instance of the XmlWriter to allow for method chaining.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when the XmlWriter is null.</exception>
-		public static XmlWriter WriteAttribute(this XmlWriter writer, string name, object value)
-		{
-			if (writer is null)
-				throw new ArgumentNullException(nameof(writer));
+	/// <summary>
+	/// Writes an attribute with the specified name and value to the XmlWriter.
+	/// </summary>
+	/// <param name="writer">The XML writer.</param>
+	/// <param name="name">The name of the attribute to write.</param>
+	/// <param name="value">The value of the attribute. If null, an empty string is written.</param>
+	/// <returns>The same instance of the XmlWriter to allow for method chaining.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when the XmlWriter is null.</exception>
+	public static XmlWriter WriteAttribute(this XmlWriter writer, string name, object value)
+	{
+		if (writer is null)
+			throw new ArgumentNullException(nameof(writer));
 
-			writer.WriteAttributeString(name, value != null ? value.To<string>() : string.Empty);
+		writer.WriteAttributeString(name, value != null ? value.To<string>() : string.Empty);
 
-			return writer;
-		}
+		return writer;
+	}
 
-		/// <summary>
-		/// Compares two XmlNode objects based on their OuterXml representation.
-		/// </summary>
-		/// <param name="first">The first XmlNode to compare.</param>
-		/// <param name="second">The second XmlNode to compare.</param>
-		/// <returns>True if both XmlNodes have identical OuterXml representations; otherwise, false.</returns>
-		/// <exception cref="ArgumentNullException">
-		/// Thrown when the first or second XmlNode is null.
-		/// </exception>
-		public static bool Compare(this XmlNode first, XmlNode second)
-		{
-			if (first is null)
-				throw new ArgumentNullException(nameof(first));
+	/// <summary>
+	/// Compares two XmlNode objects based on their OuterXml representation.
+	/// </summary>
+	/// <param name="first">The first XmlNode to compare.</param>
+	/// <param name="second">The second XmlNode to compare.</param>
+	/// <returns>True if both XmlNodes have identical OuterXml representations; otherwise, false.</returns>
+	/// <exception cref="ArgumentNullException">
+	/// Thrown when the first or second XmlNode is null.
+	/// </exception>
+	public static bool Compare(this XmlNode first, XmlNode second)
+	{
+		if (first is null)
+			throw new ArgumentNullException(nameof(first));
 
-			if (second is null)
-				throw new ArgumentNullException(nameof(second));
+		if (second is null)
+			throw new ArgumentNullException(nameof(second));
 
-			return first.OuterXml == second.OuterXml;
-		}
+		return first.OuterXml == second.OuterXml;
+	}
 
-		/// <summary>
-		/// Determines whether the specified string contains only valid XML characters.
-		/// </summary>
-		/// <param name="value">The string to check.</param>
-		/// <returns>True if all characters in the string are valid XML characters; otherwise, false.</returns>
-		public static bool IsXmlString(this string value)
-			=> value.All(IsXmlChar);
+	/// <summary>
+	/// Determines whether the specified string contains only valid XML characters.
+	/// </summary>
+	/// <param name="value">The string to check.</param>
+	/// <returns>True if all characters in the string are valid XML characters; otherwise, false.</returns>
+	public static bool IsXmlString(this string value)
+		=> value.All(IsXmlChar);
 
-		/// <summary>
-		/// Determines whether the specified character is a valid XML character.
-		/// </summary>
-		/// <param name="c">The character to check.</param>
-		/// <returns>True if the character is a valid XML character; otherwise, false.</returns>
-		public static bool IsXmlChar(this char c)
-			=> XmlConvert.IsXmlChar(c);
-	}
+	/// <summary>
+	/// Determines whether the specified character is a valid XML character.
+	/// </summary>
+	/// <param name="c">The character to check.</param>
+	/// <returns>True if the character is a valid XML character; otherwise, false.</returns>
+	public static bool IsXmlChar(this char c)
+		=> XmlConvert.IsXmlChar(c);
 }
\ No newline at end of file
diff --git a/Compilation.Roslyn/RoslynCompiler.cs b/Compilation.Roslyn/RoslynCompiler.cs
index db934c2a..b0e1ec84 100644
--- a/Compilation.Roslyn/RoslynCompiler.cs
+++ b/Compilation.Roslyn/RoslynCompiler.cs
@@ -1,227 +1,226 @@
-namespace Ecng.Compilation.Roslyn
+namespace Ecng.Compilation.Roslyn;
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Ecng.Common;
+using Ecng.Compilation;
+using Ecng.Localization;
+
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.VisualBasic;
+
+/// <summary>
+/// Represents a Roslyn compiler.
+/// </summary>
+/// <param name="extension">The file extension of the source files that the compiler supports.</param>
+public abstract class RoslynCompiler(string extension) : ICompiler
 {
-	using System;
-	using System.Collections.Generic;
-	using System.IO;
-	using System.Linq;
-	using System.Reflection;
-	using System.Threading;
-	using System.Threading.Tasks;
-
-	using Ecng.Common;
-	using Ecng.Compilation;
-	using Ecng.Localization;
-
-	using Microsoft.CodeAnalysis;
-	using Microsoft.CodeAnalysis.CSharp;
-	using Microsoft.CodeAnalysis.Diagnostics;
-	using Microsoft.CodeAnalysis.VisualBasic;
-
-	/// <summary>
-	/// Represents a Roslyn compiler.
-	/// </summary>
-	/// <param name="extension">The file extension of the source files that the compiler supports.</param>
-	public abstract class RoslynCompiler(string extension) : ICompiler
+	private static readonly Dictionary<string, string> _redirects = new()
 	{
-		private static readonly Dictionary<string, string> _redirects = new()
-		{
-			{ "System.Collections.Immutable, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Collections.Immutable.dll"},
-			{ "System.IO.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.IO.FileSystem.dll"},
-			//{ "System.IO.FileSystem, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.IO.FileSystem.dll"},
-			//{ "System.Security.Cryptography.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Security.Cryptography.Primitives.dll"},
-		};
+		{ "System.Collections.Immutable, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Collections.Immutable.dll"},
+		{ "System.IO.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.IO.FileSystem.dll"},
+		//{ "System.IO.FileSystem, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.IO.FileSystem.dll"},
+		//{ "System.Security.Cryptography.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", "System.Security.Cryptography.Primitives.dll"},
+	};
 
-		static RoslynCompiler()
+	static RoslynCompiler()
+	{
+		AppDomain.CurrentDomain.AssemblyResolve += (_, args) =>
 		{
-			AppDomain.CurrentDomain.AssemblyResolve += (_, args) =>
+			if (_redirects.ContainsKey(args.Name))
 			{
-				if (_redirects.ContainsKey(args.Name))
-				{
-					var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, _redirects[args.Name]);
-					return Assembly.LoadFrom(path);
-				}
+				var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, _redirects[args.Name]);
+				return Assembly.LoadFrom(path);
+			}
 
-				return null;
-			};
-		}
+			return null;
+		};
+	}
 
-		bool ICompiler.IsAssemblyPersistable { get; } = true;
-		string ICompiler.Extension { get; } = extension;
+	bool ICompiler.IsAssemblyPersistable { get; } = true;
+	string ICompiler.Extension { get; } = extension;
 
-		/// <inheritdoc />
-		public abstract bool IsTabsSupported { get; }
-		/// <inheritdoc />
-		public abstract bool IsCaseSensitive { get; }
-		/// <inheritdoc />
-		public abstract bool IsReferencesSupported { get; }
+	/// <inheritdoc />
+	public abstract bool IsTabsSupported { get; }
+	/// <inheritdoc />
+	public abstract bool IsCaseSensitive { get; }
+	/// <inheritdoc />
+	public abstract bool IsReferencesSupported { get; }
 
-		private Compilation Create(string name, IEnumerable<string> sources, IEnumerable<(string name, byte[] body)> refs, CancellationToken cancellationToken)
-		{
-			if (sources is null)
-				throw new ArgumentNullException(nameof(sources));
+	private Compilation Create(string name, IEnumerable<string> sources, IEnumerable<(string name, byte[] body)> refs, CancellationToken cancellationToken)
+	{
+		if (sources is null)
+			throw new ArgumentNullException(nameof(sources));
 
-			if (refs is null)
-				throw new ArgumentNullException(nameof(refs));
+		if (refs is null)
+			throw new ArgumentNullException(nameof(refs));
 
-			var assemblyName = name + Path.GetRandomFileName();
+		var assemblyName = name + Path.GetRandomFileName();
 
-			var references = refs.Select(r => MetadataReference.CreateFromImage(r.body)).ToArray();
+		var references = refs.Select(r => MetadataReference.CreateFromImage(r.body)).ToArray();
 
-			return Create(assemblyName, sources, references, cancellationToken);
-		}
+		return Create(assemblyName, sources, references, cancellationToken);
+	}
 
-		/// <summary>
-		/// Creates a new compilation instance.
-		/// </summary>
-		/// <param name="assemblyName">The name of the assembly.</param>
-		/// <param name="sources">The source code files as strings.</param>
-		/// <param name="references">A collection of references.</param>
-		/// <param name="cancellationToken"><see cref="CancellationToken"/></param>
-		/// <returns><see cref="Compilation"/></returns>
-		protected abstract Compilation Create(
-			string assemblyName,
-			IEnumerable<string> sources,
-			PortableExecutableReference[] references,
-			CancellationToken cancellationToken);
-
-		async Task<CompilationError[]> ICompiler.Analyse(object analyzer, IEnumerable<object> analyzerSettings, string name, IEnumerable<string> sources, IEnumerable<(string name, byte[] body)> refs, CancellationToken cancellationToken)
-		{
-			if (analyzer is null)
-				throw new ArgumentNullException(nameof(analyzer));
+	/// <summary>
+	/// Creates a new compilation instance.
+	/// </summary>
+	/// <param name="assemblyName">The name of the assembly.</param>
+	/// <param name="sources">The source code files as strings.</param>
+	/// <param name="references">A collection of references.</param>
+	/// <param name="cancellationToken"><see cref="CancellationToken"/></param>
+	/// <returns><see cref="Compilation"/></returns>
+	protected abstract Compilation Create(
+		string assemblyName,
+		IEnumerable<string> sources,
+		PortableExecutableReference[] references,
+		CancellationToken cancellationToken);
+
+	async Task<CompilationError[]> ICompiler.Analyse(object analyzer, IEnumerable<object> analyzerSettings, string name, IEnumerable<string> sources, IEnumerable<(string name, byte[] body)> refs, CancellationToken cancellationToken)
+	{
+		if (analyzer is null)
+			throw new ArgumentNullException(nameof(analyzer));
 
-			if (analyzerSettings is null)
-				throw new ArgumentNullException(nameof(analyzerSettings));
+		if (analyzerSettings is null)
+			throw new ArgumentNullException(nameof(analyzerSettings));
 
-			var compilation = Create(name, sources, refs, cancellationToken);
+		var compilation = Create(name, sources, refs, cancellationToken);
 
-			var compilationWithAnalyzers = compilation.WithAnalyzers(
-				[(DiagnosticAnalyzer)analyzer],
-				new AnalyzerOptions([.. analyzerSettings.Cast<AdditionalText>()]));
+		var compilationWithAnalyzers = compilation.WithAnalyzers(
+			[(DiagnosticAnalyzer)analyzer],
+			new AnalyzerOptions([.. analyzerSettings.Cast<AdditionalText>()]));
 
-			static CompilationErrorTypes ToType(DiagnosticSeverity severity)
-				=> severity switch
-				{
-					DiagnosticSeverity.Info => CompilationErrorTypes.Info,
-					DiagnosticSeverity.Warning => CompilationErrorTypes.Warning,
-					DiagnosticSeverity.Error => CompilationErrorTypes.Error,
-					_ => throw new ArgumentOutOfRangeException(severity.To<string>()),
-				};
+		static CompilationErrorTypes ToType(DiagnosticSeverity severity)
+			=> severity switch
+			{
+				DiagnosticSeverity.Info => CompilationErrorTypes.Info,
+				DiagnosticSeverity.Warning => CompilationErrorTypes.Warning,
+				DiagnosticSeverity.Error => CompilationErrorTypes.Error,
+				_ => throw new ArgumentOutOfRangeException(severity.To<string>()),
+			};
+
+		var analyzerDiagnostics = await compilationWithAnalyzers.GetAllDiagnosticsAsync(cancellationToken);
+		return [.. analyzerDiagnostics.Select(e =>
+		{
+			var lineSpan = e.Location.GetLineSpan();
 
-			var analyzerDiagnostics = await compilationWithAnalyzers.GetAllDiagnosticsAsync(cancellationToken);
-			return [.. analyzerDiagnostics.Select(e =>
+			return new CompilationError
 			{
-				var lineSpan = e.Location.GetLineSpan();
+				Type = ToType(e.Severity),
+				Message = e.GetMessage(),
+				Line = lineSpan.StartLinePosition.Line,
+				Character = lineSpan.StartLinePosition.Character,
+				Id = e.Id,
+			};
+		}).Distinct()];
+	}
 
-				return new CompilationError
-				{
-					Type = ToType(e.Severity),
-					Message = e.GetMessage(),
-					Line = lineSpan.StartLinePosition.Line,
-					Character = lineSpan.StartLinePosition.Character,
-					Id = e.Id,
-				};
-			}).Distinct()];
-		}
+	Task<CompilationResult> ICompiler.Compile(string name, IEnumerable<string> sources, IEnumerable<(string name, byte[] body)> refs, CancellationToken cancellationToken)
+	{
+		var compilation = Create(name, sources, refs, cancellationToken);
 
-		Task<CompilationResult> ICompiler.Compile(string name, IEnumerable<string> sources, IEnumerable<(string name, byte[] body)> refs, CancellationToken cancellationToken)
-		{
-			var compilation = Create(name, sources, refs, cancellationToken);
+		using var ms = new MemoryStream();
 
-			using var ms = new MemoryStream();
+		byte[] getBody()
+		{
+			ms.Seek(0, SeekOrigin.Begin);
+			return ms.To<byte[]>();
+		}
 
-			byte[] getBody()
-			{
-				ms.Seek(0, SeekOrigin.Begin);
-				return ms.To<byte[]>();
-			}
+		var result = compilation.Emit(ms, cancellationToken: cancellationToken);
 
-			var result = compilation.Emit(ms, cancellationToken: cancellationToken);
+		var compilationResult = new AssemblyCompilationResult(result.Diagnostics.Select(diagnostic =>
+		{
+			var pos = diagnostic.Location.GetLineSpan().StartLinePosition;
 
-			var compilationResult = new AssemblyCompilationResult(result.Diagnostics.Select(diagnostic =>
+			var error = new CompilationError
 			{
-				var pos = diagnostic.Location.GetLineSpan().StartLinePosition;
-
-				var error = new CompilationError
+				Id = diagnostic.Id,
+				Line = pos.Line,
+				Character = pos.Character,
+				Message = diagnostic.GetMessage(),
+				Type = diagnostic.Severity switch
 				{
-					Id = diagnostic.Id,
-					Line = pos.Line,
-					Character = pos.Character,
-					Message = diagnostic.GetMessage(),
-					Type = diagnostic.Severity switch
-					{
-						DiagnosticSeverity.Hidden or DiagnosticSeverity.Info => CompilationErrorTypes.Info,
-						DiagnosticSeverity.Warning => CompilationErrorTypes.Warning,
-						DiagnosticSeverity.Error => CompilationErrorTypes.Error,
-						_ => throw new ArgumentOutOfRangeException(nameof(diagnostic), diagnostic.Severity, "Invalid value.".Localize()),
-					}
-				};
-
-				return error;
-			}), result.Success ? getBody() : null);
-
-			return ((CompilationResult)compilationResult).FromResult();
-		}
+					DiagnosticSeverity.Hidden or DiagnosticSeverity.Info => CompilationErrorTypes.Info,
+					DiagnosticSeverity.Warning => CompilationErrorTypes.Warning,
+					DiagnosticSeverity.Error => CompilationErrorTypes.Error,
+					_ => throw new ArgumentOutOfRangeException(nameof(diagnostic), diagnostic.Severity, "Invalid value.".Localize()),
+				}
+			};
+
+			return error;
+		}), result.Success ? getBody() : null);
 
-		ICompilerContext ICompiler.CreateContext() => new AssemblyLoadContextTracker();
+		return ((CompilationResult)compilationResult).FromResult();
 	}
 
+	ICompilerContext ICompiler.CreateContext() => new AssemblyLoadContextTracker();
+}
+
+/// <summary>
+/// Represents a C# compiler that supports compiling source files into an assembly.
+/// </summary>
+public class CSharpCompiler : RoslynCompiler
+{
 	/// <summary>
-	/// Represents a C# compiler that supports compiling source files into an assembly.
+	/// Initializes a new instance of the <see cref="CSharpCompiler"/> class.
 	/// </summary>
-	public class CSharpCompiler : RoslynCompiler
+	public CSharpCompiler()
+		: base(FileExts.CSharp)
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="CSharpCompiler"/> class.
-		/// </summary>
-		public CSharpCompiler()
-			: base(FileExts.CSharp)
-		{
-		}
-
-		/// <inheritdoc />
-		public override bool IsTabsSupported => true;
-		/// <inheritdoc />
-		public override bool IsCaseSensitive => true;
-		/// <inheritdoc />
-		public override bool IsReferencesSupported => true;
-
-		/// <inheritdoc />
-		protected override Compilation Create(string assemblyName, IEnumerable<string> sources, PortableExecutableReference[] references, CancellationToken cancellationToken)
-			=> CSharpCompilation.Create(
-				assemblyName,
-				sources.Select(source => CSharpSyntaxTree.ParseText(source, cancellationToken: cancellationToken)),
-				references,
-				new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary)
-			);
 	}
 
+	/// <inheritdoc />
+	public override bool IsTabsSupported => true;
+	/// <inheritdoc />
+	public override bool IsCaseSensitive => true;
+	/// <inheritdoc />
+	public override bool IsReferencesSupported => true;
+
+	/// <inheritdoc />
+	protected override Compilation Create(string assemblyName, IEnumerable<string> sources, PortableExecutableReference[] references, CancellationToken cancellationToken)
+		=> CSharpCompilation.Create(
+			assemblyName,
+			sources.Select(source => CSharpSyntaxTree.ParseText(source, cancellationToken: cancellationToken)),
+			references,
+			new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary)
+		);
+}
+
+/// <summary>
+/// Represents a Visual Basic compiler that supports compiling source files into an assembly.
+/// </summary>
+public class VisualBasicCompiler : RoslynCompiler
+{
 	/// <summary>
-	/// Represents a Visual Basic compiler that supports compiling source files into an assembly.
+	/// Initializes a new instance of the <see cref="VisualBasicCompiler"/> class.
 	/// </summary>
-	public class VisualBasicCompiler : RoslynCompiler
+	public VisualBasicCompiler()
+		: base(FileExts.VisualBasic)
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="VisualBasicCompiler"/> class.
-		/// </summary>
-		public VisualBasicCompiler()
-			: base(FileExts.VisualBasic)
-		{
-		}
-
-		/// <inheritdoc />
-		public override bool IsTabsSupported => true;
-		/// <inheritdoc />
-		public override bool IsCaseSensitive => false;
-		/// <inheritdoc />
-		public override bool IsReferencesSupported => true;
-
-		/// <inheritdoc />
-		protected override Compilation Create(string assemblyName, IEnumerable<string> sources, PortableExecutableReference[] references, CancellationToken cancellationToken)
-			=> VisualBasicCompilation.Create(
-				assemblyName,
-				sources.Select(source => VisualBasicSyntaxTree.ParseText(source, cancellationToken: cancellationToken)),
-				references,
-				new VisualBasicCompilationOptions(OutputKind.DynamicallyLinkedLibrary)
-			);
 	}
+
+	/// <inheritdoc />
+	public override bool IsTabsSupported => true;
+	/// <inheritdoc />
+	public override bool IsCaseSensitive => false;
+	/// <inheritdoc />
+	public override bool IsReferencesSupported => true;
+
+	/// <inheritdoc />
+	protected override Compilation Create(string assemblyName, IEnumerable<string> sources, PortableExecutableReference[] references, CancellationToken cancellationToken)
+		=> VisualBasicCompilation.Create(
+			assemblyName,
+			sources.Select(source => VisualBasicSyntaxTree.ParseText(source, cancellationToken: cancellationToken)),
+			references,
+			new VisualBasicCompilationOptions(OutputKind.DynamicallyLinkedLibrary)
+		);
 }
\ No newline at end of file
diff --git a/Compilation/CompilationErrorTypes.cs b/Compilation/CompilationErrorTypes.cs
index cf2a9395..ad548cfe 100644
--- a/Compilation/CompilationErrorTypes.cs
+++ b/Compilation/CompilationErrorTypes.cs
@@ -1,23 +1,22 @@
-namespace Ecng.Compilation
+namespace Ecng.Compilation;
+
+/// <summary>
+/// Represents the type of a compilation error.
+/// </summary>
+public enum CompilationErrorTypes
 {
 	/// <summary>
-	/// Represents the type of a compilation error.
+	/// Represents an informational message.
 	/// </summary>
-	public enum CompilationErrorTypes
-	{
-		/// <summary>
-		/// Represents an informational message.
-		/// </summary>
-		Info,
+	Info,
 
-		/// <summary>
-		/// Represents a warning message.
-		/// </summary>
-		Warning,
+	/// <summary>
+	/// Represents a warning message.
+	/// </summary>
+	Warning,
 
-		/// <summary>
-		/// Represents an error message.
-		/// </summary>
-		Error,
-	}
+	/// <summary>
+	/// Represents an error message.
+	/// </summary>
+	Error,
 }
\ No newline at end of file
diff --git a/Compilation/CompilationResult.cs b/Compilation/CompilationResult.cs
index 42d5249d..1311e3c2 100644
--- a/Compilation/CompilationResult.cs
+++ b/Compilation/CompilationResult.cs
@@ -2,7 +2,6 @@ namespace Ecng.Compilation;
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 
 /// <summary>
diff --git a/Compilation/ICompiler.cs b/Compilation/ICompiler.cs
index d129d5d1..01895489 100644
--- a/Compilation/ICompiler.cs
+++ b/Compilation/ICompiler.cs
@@ -1,65 +1,64 @@
-namespace Ecng.Compilation
-{
-	using System.Collections.Generic;
-	using System.Threading;
-	using System.Threading.Tasks;
+namespace Ecng.Compilation;
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
 
+/// <summary>
+/// Defines the contract for a compiler that supports compiling source files into an assembly.
+/// </summary>
+public interface ICompiler
+{
 	/// <summary>
-	/// Defines the contract for a compiler that supports compiling source files into an assembly.
+	/// Gets a value indicating whether the compiled assembly can be persisted.
 	/// </summary>
-	public interface ICompiler
-	{
-		/// <summary>
-		/// Gets a value indicating whether the compiled assembly can be persisted.
-		/// </summary>
-		bool IsAssemblyPersistable { get; }
+	bool IsAssemblyPersistable { get; }
 
-		/// <summary>
-		/// Gets the file extension used by the compiler.
-		/// </summary>
-		string Extension { get; }
+	/// <summary>
+	/// Gets the file extension used by the compiler.
+	/// </summary>
+	string Extension { get; }
 
-		/// <summary>
-		/// Gets a value indicating whether the compiler supports tabs in the source code.
-		/// </summary>
-		bool IsTabsSupported { get; }
+	/// <summary>
+	/// Gets a value indicating whether the compiler supports tabs in the source code.
+	/// </summary>
+	bool IsTabsSupported { get; }
 
-		/// <summary>
-		/// Gets a value indicating whether the language is case sensitive.
-		/// </summary>
-		bool IsCaseSensitive { get; }
+	/// <summary>
+	/// Gets a value indicating whether the language is case sensitive.
+	/// </summary>
+	bool IsCaseSensitive { get; }
 
-		/// <summary>
-		/// Gets a value indicating whether the compiler supports external references.
-		/// </summary>
-		bool IsReferencesSupported { get; }
+	/// <summary>
+	/// Gets a value indicating whether the compiler supports external references.
+	/// </summary>
+	bool IsReferencesSupported { get; }
 
-		/// <summary>
-		/// Creates a new compiler context.
-		/// </summary>
-		/// <returns>A new instance of <see cref="ICompilerContext"/>.</returns>
-		ICompilerContext CreateContext();
+	/// <summary>
+	/// Creates a new compiler context.
+	/// </summary>
+	/// <returns>A new instance of <see cref="ICompilerContext"/>.</returns>
+	ICompilerContext CreateContext();
 
-		/// <summary>
-		/// Analyzes the provided source code using the specified analyzer and settings.
-		/// </summary>
-		/// <param name="analyzer">The analyzer used to perform the analysis.</param>
-		/// <param name="analyzerSettings">The settings applied to the analyzer.</param>
-		/// <param name="name">The name of the compilation unit.</param>
-		/// <param name="sources">The source code files as strings.</param>
-		/// <param name="refs">A collection of references as tuples containing the name and binary content.</param>
-		/// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
-		/// <returns>A task that represents the asynchronous analysis operation. The task result contains an array of <see cref="CompilationError"/> instances.</returns>
-		Task<CompilationError[]> Analyse(object analyzer, IEnumerable<object> analyzerSettings, string name, IEnumerable<string> sources, IEnumerable<(string name, byte[] body)> refs, CancellationToken cancellationToken = default);
+	/// <summary>
+	/// Analyzes the provided source code using the specified analyzer and settings.
+	/// </summary>
+	/// <param name="analyzer">The analyzer used to perform the analysis.</param>
+	/// <param name="analyzerSettings">The settings applied to the analyzer.</param>
+	/// <param name="name">The name of the compilation unit.</param>
+	/// <param name="sources">The source code files as strings.</param>
+	/// <param name="refs">A collection of references as tuples containing the name and binary content.</param>
+	/// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
+	/// <returns>A task that represents the asynchronous analysis operation. The task result contains an array of <see cref="CompilationError"/> instances.</returns>
+	Task<CompilationError[]> Analyse(object analyzer, IEnumerable<object> analyzerSettings, string name, IEnumerable<string> sources, IEnumerable<(string name, byte[] body)> refs, CancellationToken cancellationToken = default);
 
-		/// <summary>
-		/// Compiles the provided source code files with the specified references.
-		/// </summary>
-		/// <param name="name">The name of the compilation unit.</param>
-		/// <param name="sources">The source code files as strings.</param>
-		/// <param name="refs">A collection of references as tuples containing the name and binary content.</param>
-		/// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
-		/// <returns>A task that represents the asynchronous compile operation. The task result contains a <see cref="CompilationResult"/>.</returns>
-		Task<CompilationResult> Compile(string name, IEnumerable<string> sources, IEnumerable<(string name, byte[] body)> refs, CancellationToken cancellationToken = default);
-	}
+	/// <summary>
+	/// Compiles the provided source code files with the specified references.
+	/// </summary>
+	/// <param name="name">The name of the compilation unit.</param>
+	/// <param name="sources">The source code files as strings.</param>
+	/// <param name="refs">A collection of references as tuples containing the name and binary content.</param>
+	/// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
+	/// <returns>A task that represents the asynchronous compile operation. The task result contains a <see cref="CompilationResult"/>.</returns>
+	Task<CompilationResult> Compile(string name, IEnumerable<string> sources, IEnumerable<(string name, byte[] body)> refs, CancellationToken cancellationToken = default);
 }
\ No newline at end of file
diff --git a/ComponentModel/BaseObservableCollection.cs b/ComponentModel/BaseObservableCollection.cs
index ab83e14e..012611ae 100644
--- a/ComponentModel/BaseObservableCollection.cs
+++ b/ComponentModel/BaseObservableCollection.cs
@@ -1,47 +1,46 @@
-namespace Ecng.ComponentModel
+namespace Ecng.ComponentModel;
+
+using System;
+
+/// <summary>
+/// Base class for custom observable collections.
+/// </summary>
+public abstract class BaseObservableCollection
 {
-	using System;
+	private int _maxCount = -1;
 
 	/// <summary>
-	/// Base class for custom observable collections.
+	/// Max number of elements before collection will auto trim itself. -1 to disable.
 	/// </summary>
-	public abstract class BaseObservableCollection
+	public int MaxCount
 	{
-		private int _maxCount = -1;
-
-		/// <summary>
-		/// Max number of elements before collection will auto trim itself. -1 to disable.
-		/// </summary>
-		public int MaxCount
+		get => _maxCount;
+		set
 		{
-			get => _maxCount;
-			set
-			{
-				if (value < -1 || value == 0)
-					throw new ArgumentOutOfRangeException();
-
-				_maxCount = value;
-			}
+			if (value < -1 || value == 0)
+				throw new ArgumentOutOfRangeException();
+
+			_maxCount = value;
 		}
+	}
 
-		/// <summary>
-		/// </summary>
-		public abstract int Count { get; }
+	/// <summary>
+	/// </summary>
+	public abstract int Count { get; }
 
-		/// <summary>
-		/// </summary>
-		public abstract int RemoveRange(int index, int count);
+	/// <summary>
+	/// </summary>
+	public abstract int RemoveRange(int index, int count);
 
-		/// <summary>
-		/// Check current count and trim if necessary.
-		/// </summary>
-		protected void CheckCount()
-		{
-			if (MaxCount == -1)
-				return;
+	/// <summary>
+	/// Check current count and trim if necessary.
+	/// </summary>
+	protected void CheckCount()
+	{
+		if (MaxCount == -1)
+			return;
 
-			if(Count > 1.5 * MaxCount)
-				RemoveRange(0, Count - MaxCount);
-		}
+		if(Count > 1.5 * MaxCount)
+			RemoveRange(0, Count - MaxCount);
 	}
 }
\ No newline at end of file
diff --git a/ComponentModel/ComparisonOperatorExtensions.cs b/ComponentModel/ComparisonOperatorExtensions.cs
index 9ce7d7c9..697912e0 100644
--- a/ComponentModel/ComparisonOperatorExtensions.cs
+++ b/ComponentModel/ComparisonOperatorExtensions.cs
@@ -1,70 +1,69 @@
-namespace Ecng.ComponentModel
-{
-	using System;
+namespace Ecng.ComponentModel;
+
+using System;
 
-	using Ecng.Common;
+using Ecng.Common;
 
+/// <summary>
+/// Provides extension methods for comparing string values using a specified comparison operator.
+/// </summary>
+public static class LikeComparesExtensions
+{
 	/// <summary>
-	/// Provides extension methods for comparing string values using a specified comparison operator.
+	/// Determines if the specified string value matches a pattern based on the provided comparison operator.
 	/// </summary>
-	public static class LikeComparesExtensions
+	/// <param name="value">The string value to evaluate.</param>
+	/// <param name="like">The pattern to compare against.</param>
+	/// <param name="likeCompare">The comparison operator to use for the evaluation.</param>
+	/// <returns>
+	/// True if the value satisfies the comparison; otherwise, false.
+	/// </returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="value"/> is null.</exception>
+	/// <exception cref="ArgumentOutOfRangeException">Thrown when the comparison operator is not supported.</exception>
+	public static bool Like(this string value, string like, ComparisonOperator? likeCompare)
 	{
-		/// <summary>
-		/// Determines if the specified string value matches a pattern based on the provided comparison operator.
-		/// </summary>
-		/// <param name="value">The string value to evaluate.</param>
-		/// <param name="like">The pattern to compare against.</param>
-		/// <param name="likeCompare">The comparison operator to use for the evaluation.</param>
-		/// <returns>
-		/// True if the value satisfies the comparison; otherwise, false.
-		/// </returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="value"/> is null.</exception>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown when the comparison operator is not supported.</exception>
-		public static bool Like(this string value, string like, ComparisonOperator? likeCompare)
-		{
-			if (value is null)
-				throw new ArgumentNullException(nameof(value));
-
-			if (like.IsEmpty())
-				return true;
+		if (value is null)
+			throw new ArgumentNullException(nameof(value));
 
-			return likeCompare switch
-			{
-				ComparisonOperator.In or null => value.ContainsIgnoreCase(like),
-				ComparisonOperator.Greater or ComparisonOperator.GreaterOrEqual => value.StartsWithIgnoreCase(like),
-				ComparisonOperator.Less or ComparisonOperator.LessOrEqual => value.EndsWithIgnoreCase(like),
-				ComparisonOperator.Equal => value.EqualsIgnoreCase(like),
-				ComparisonOperator.NotEqual => !value.ContainsIgnoreCase(like),
-				_ => throw new ArgumentOutOfRangeException(nameof(likeCompare)),
-			};
-		}
+		if (like.IsEmpty())
+			return true;
 
-		/// <summary>
-		/// Converts a pattern into an expression according to the specified comparison operator.
-		/// </summary>
-		/// <param name="like">The pattern to convert.</param>
-		/// <param name="likeCompare">
-		/// The comparison operator that determines how the expression is formed. 
-		/// Defaults to ComparisonOperator.In if null.
-		/// </param>
-		/// <returns>A string expression representing the pattern.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="like"/> is empty.</exception>
-		/// <exception cref="NotSupportedException">Thrown when the NotEqual operator is used.</exception>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown when the comparison operator is not supported.</exception>
-		public static string ToExpression(this string like, ComparisonOperator? likeCompare = default)
+		return likeCompare switch
 		{
-			if (like.IsEmpty())
-				throw new ArgumentNullException(nameof(like));
+			ComparisonOperator.In or null => value.ContainsIgnoreCase(like),
+			ComparisonOperator.Greater or ComparisonOperator.GreaterOrEqual => value.StartsWithIgnoreCase(like),
+			ComparisonOperator.Less or ComparisonOperator.LessOrEqual => value.EndsWithIgnoreCase(like),
+			ComparisonOperator.Equal => value.EqualsIgnoreCase(like),
+			ComparisonOperator.NotEqual => !value.ContainsIgnoreCase(like),
+			_ => throw new ArgumentOutOfRangeException(nameof(likeCompare)),
+		};
+	}
 
-			return likeCompare switch
-			{
-				ComparisonOperator.In or null => $"%{like}%",
-				ComparisonOperator.Greater or ComparisonOperator.GreaterOrEqual => $"{like}%",
-				ComparisonOperator.Less or ComparisonOperator.LessOrEqual => $"%{like}",
-				ComparisonOperator.Equal => like,
-				ComparisonOperator.NotEqual => throw new NotSupportedException(),
-				_ => throw new ArgumentOutOfRangeException(nameof(likeCompare)),
-			};
-		}
+	/// <summary>
+	/// Converts a pattern into an expression according to the specified comparison operator.
+	/// </summary>
+	/// <param name="like">The pattern to convert.</param>
+	/// <param name="likeCompare">
+	/// The comparison operator that determines how the expression is formed. 
+	/// Defaults to ComparisonOperator.In if null.
+	/// </param>
+	/// <returns>A string expression representing the pattern.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="like"/> is empty.</exception>
+	/// <exception cref="NotSupportedException">Thrown when the NotEqual operator is used.</exception>
+	/// <exception cref="ArgumentOutOfRangeException">Thrown when the comparison operator is not supported.</exception>
+	public static string ToExpression(this string like, ComparisonOperator? likeCompare = default)
+	{
+		if (like.IsEmpty())
+			throw new ArgumentNullException(nameof(like));
+
+		return likeCompare switch
+		{
+			ComparisonOperator.In or null => $"%{like}%",
+			ComparisonOperator.Greater or ComparisonOperator.GreaterOrEqual => $"{like}%",
+			ComparisonOperator.Less or ComparisonOperator.LessOrEqual => $"%{like}",
+			ComparisonOperator.Equal => like,
+			ComparisonOperator.NotEqual => throw new NotSupportedException(),
+			_ => throw new ArgumentOutOfRangeException(nameof(likeCompare)),
+		};
 	}
 }
\ No newline at end of file
diff --git a/ComponentModel/ConvertibleObservableCollection.cs b/ComponentModel/ConvertibleObservableCollection.cs
index d2ec58fa..5bd2cc67 100644
--- a/ComponentModel/ConvertibleObservableCollection.cs
+++ b/ComponentModel/ConvertibleObservableCollection.cs
@@ -1,3 +1,5 @@
+namespace Ecng.ComponentModel;
+
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -6,8 +8,6 @@
 
 using Ecng.Collections;
 
-namespace Ecng.ComponentModel;
-
 /// <summary>
 /// Collection which maps items to another type to display.
 /// </summary>
diff --git a/ComponentModel/CustomObjectWrapper.cs b/ComponentModel/CustomObjectWrapper.cs
index 2f5713b0..92c08500 100644
--- a/ComponentModel/CustomObjectWrapper.cs
+++ b/ComponentModel/CustomObjectWrapper.cs
@@ -1,165 +1,164 @@
-namespace Ecng.ComponentModel
+namespace Ecng.ComponentModel;
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+
+using Ecng.Common;
+
+/// <summary>
+/// Create instance.
+/// </summary>
+/// <param name="obj">Parent chart element or indicator.</param>
+public abstract class CustomObjectWrapper<T>(T obj) : Disposable, INotifyPropertyChanged, ICustomTypeDescriptor where T : class
 {
-	using System;
-	using System.Collections.Generic;
-	using System.ComponentModel;
-	using System.Linq;
+	/// <inheritdoc />
+	public event PropertyChangedEventHandler PropertyChanged;
 
-	using Ecng.Common;
+	/// <summary>
+	/// Call <see cref="PropertyChanged"/> event.
+	/// </summary>
+	/// <param name="name">Member name.</param>
+	protected virtual void OnPropertyChanged(string name) => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
 
 	/// <summary>
-	/// Create instance.
+	/// Specialization of <see cref="PropertyDescriptor"/>.
 	/// </summary>
-	/// <param name="obj">Parent chart element or indicator.</param>
-	public abstract class CustomObjectWrapper<T>(T obj) : Disposable, INotifyPropertyChanged, ICustomTypeDescriptor where T : class
+	/// <remarks>
+	/// Create instance.
+	/// </remarks>
+	protected class ProxyPropDescriptor(PropertyDescriptor orig, object owner) : NamedPropertyDescriptor(orig)
 	{
-		/// <inheritdoc />
-		public event PropertyChangedEventHandler PropertyChanged;
+		private readonly PropertyDescriptor _orig = orig;
 
 		/// <summary>
-		/// Call <see cref="PropertyChanged"/> event.
+		/// Parent object.
 		/// </summary>
-		/// <param name="name">Member name.</param>
-		protected virtual void OnPropertyChanged(string name) => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
+		public object Owner { get; } = owner;
 
-		/// <summary>
-		/// Specialization of <see cref="PropertyDescriptor"/>.
-		/// </summary>
-		/// <remarks>
-		/// Create instance.
-		/// </remarks>
-		protected class ProxyPropDescriptor(PropertyDescriptor orig, object owner) : NamedPropertyDescriptor(orig)
-		{
-			private readonly PropertyDescriptor _orig = orig;
-
-			/// <summary>
-			/// Parent object.
-			/// </summary>
-			public object Owner { get; } = owner;
-
-			/// <inheritdoc />
-			public override object GetValue(object c)  => _orig.GetValue(c);
-			/// <inheritdoc />
-			public override void SetValue(object c, object value) => throw new NotSupportedException();
-
-			/// <inheritdoc />
-			public override bool CanResetValue(object c) => false;
-			/// <inheritdoc />
-			public override void ResetValue(object c) => throw new NotSupportedException();
-
-			/// <inheritdoc />
-			public override bool ShouldSerializeValue(object c) => false;
-
-			/// <inheritdoc />
-			public override Type ComponentType => Owner.GetType();
-			/// <inheritdoc />
-			public override bool IsReadOnly => true;
-			/// <inheritdoc />
-			public override Type PropertyType => _orig.PropertyType;
-		}
+		/// <inheritdoc />
+		public override object GetValue(object c)  => _orig.GetValue(c);
+		/// <inheritdoc />
+		public override void SetValue(object c, object value) => throw new NotSupportedException();
 
-		/// <summary>
-		/// Specialization of <see cref="EventDescriptor"/>.
-		/// </summary>
-		/// <remarks>
-		/// Create instance.
-		/// </remarks>
-		protected class ProxyEventDescriptor(EventDescriptor orig, object owner) : EventDescriptor(orig)
-		{
-			private readonly EventDescriptor _orig = orig;
-
-			/// <summary>
-			/// Parent object.
-			/// </summary>
-			public object Owner { get; } = owner;
-
-			/// <inheritdoc />
-			public override void AddEventHandler(object component, Delegate value) => _orig.AddEventHandler(component, value);
-			/// <inheritdoc />
-			public override void RemoveEventHandler(object component, Delegate value) => _orig.RemoveEventHandler(component, value);
-
-			/// <inheritdoc />
-			public override Type ComponentType => Owner.GetType();
-			/// <inheritdoc />
-			public override Type EventType => _orig.EventType;
-			/// <inheritdoc />
-			public override bool IsMulticast => _orig.IsMulticast;
-		}
+		/// <inheritdoc />
+		public override bool CanResetValue(object c) => false;
+		/// <inheritdoc />
+		public override void ResetValue(object c) => throw new NotSupportedException();
+
+		/// <inheritdoc />
+		public override bool ShouldSerializeValue(object c) => false;
+
+		/// <inheritdoc />
+		public override Type ComponentType => Owner.GetType();
+		/// <inheritdoc />
+		public override bool IsReadOnly => true;
+		/// <inheritdoc />
+		public override Type PropertyType => _orig.PropertyType;
+	}
+
+	/// <summary>
+	/// Specialization of <see cref="EventDescriptor"/>.
+	/// </summary>
+	/// <remarks>
+	/// Create instance.
+	/// </remarks>
+	protected class ProxyEventDescriptor(EventDescriptor orig, object owner) : EventDescriptor(orig)
+	{
+		private readonly EventDescriptor _orig = orig;
 
 		/// <summary>
 		/// Parent object.
 		/// </summary>
-		public T Obj { get; } = obj ?? throw new ArgumentNullException(nameof(obj));
+		public object Owner { get; } = owner;
+
+		/// <inheritdoc />
+		public override void AddEventHandler(object component, Delegate value) => _orig.AddEventHandler(component, value);
+		/// <inheritdoc />
+		public override void RemoveEventHandler(object component, Delegate value) => _orig.RemoveEventHandler(component, value);
 
-		object ICustomTypeDescriptor.GetPropertyOwner(PropertyDescriptor pd) => Obj;
+		/// <inheritdoc />
+		public override Type ComponentType => Owner.GetType();
+		/// <inheritdoc />
+		public override Type EventType => _orig.EventType;
+		/// <inheritdoc />
+		public override bool IsMulticast => _orig.IsMulticast;
+	}
 
-		AttributeCollection ICustomTypeDescriptor.GetAttributes() => TypeDescriptor.GetAttributes(Obj, true);
+	/// <summary>
+	/// Parent object.
+	/// </summary>
+	public T Obj { get; } = obj ?? throw new ArgumentNullException(nameof(obj));
 
-		string ICustomTypeDescriptor.GetClassName() => TypeDescriptor.GetClassName(Obj, true);
+	object ICustomTypeDescriptor.GetPropertyOwner(PropertyDescriptor pd) => Obj;
 
-		string ICustomTypeDescriptor.GetComponentName() => TypeDescriptor.GetComponentName(Obj, true);
+	AttributeCollection ICustomTypeDescriptor.GetAttributes() => TypeDescriptor.GetAttributes(Obj, true);
 
-		TypeConverter ICustomTypeDescriptor.GetConverter() => TypeDescriptor.GetConverter(Obj, true);
+	string ICustomTypeDescriptor.GetClassName() => TypeDescriptor.GetClassName(Obj, true);
 
-		EventDescriptor ICustomTypeDescriptor.GetDefaultEvent() => TypeDescriptor.GetDefaultEvent(Obj, true);
+	string ICustomTypeDescriptor.GetComponentName() => TypeDescriptor.GetComponentName(Obj, true);
 
-		PropertyDescriptor ICustomTypeDescriptor.GetDefaultProperty() => TypeDescriptor.GetDefaultProperty(Obj, true);
+	TypeConverter ICustomTypeDescriptor.GetConverter() => TypeDescriptor.GetConverter(Obj, true);
 
-		object ICustomTypeDescriptor.GetEditor(Type editorBaseType) => TypeDescriptor.GetEditor(Obj, editorBaseType, true);
+	EventDescriptor ICustomTypeDescriptor.GetDefaultEvent() => TypeDescriptor.GetDefaultEvent(Obj, true);
 
-		EventDescriptorCollection ICustomTypeDescriptor.GetEvents(Attribute[] attributes) => ((ICustomTypeDescriptor)this).GetEvents();
+	PropertyDescriptor ICustomTypeDescriptor.GetDefaultProperty() => TypeDescriptor.GetDefaultProperty(Obj, true);
 
-		PropertyDescriptorCollection ICustomTypeDescriptor.GetProperties(Attribute[] attributes) => ((ICustomTypeDescriptor)this).GetProperties();
+	object ICustomTypeDescriptor.GetEditor(Type editorBaseType) => TypeDescriptor.GetEditor(Obj, editorBaseType, true);
 
-		/// <summary>
-		/// Get property list from wrapped object.
-		/// </summary>
-		protected virtual IEnumerable<EventDescriptor> OnGetEvents()
-		{
-			return Obj is null
-				? null
-				: TypeDescriptor.GetEvents(Obj, true)
-					.OfType<EventDescriptor>()
-					.Select(ed => new ProxyEventDescriptor(ed, this));
-		}
+	EventDescriptorCollection ICustomTypeDescriptor.GetEvents(Attribute[] attributes) => ((ICustomTypeDescriptor)this).GetEvents();
 
-		/// <summary>
-		/// Get property list from wrapped object.
-		/// </summary>
-		protected virtual IEnumerable<PropertyDescriptor> OnGetProperties()
-		{
-			return Obj is null
-				? null
-				: TypeDescriptor.GetProperties(Obj, true)
-					.Typed()
-					.Select(pd => new ProxyPropDescriptor(pd, this));
-		}
+	PropertyDescriptorCollection ICustomTypeDescriptor.GetProperties(Attribute[] attributes) => ((ICustomTypeDescriptor)this).GetProperties();
 
-		private EventDescriptorCollection _eventCollection;
+	/// <summary>
+	/// Get property list from wrapped object.
+	/// </summary>
+	protected virtual IEnumerable<EventDescriptor> OnGetEvents()
+	{
+		return Obj is null
+			? null
+			: TypeDescriptor.GetEvents(Obj, true)
+				.OfType<EventDescriptor>()
+				.Select(ed => new ProxyEventDescriptor(ed, this));
+	}
 
-		EventDescriptorCollection ICustomTypeDescriptor.GetEvents()
-		{
-			if(_eventCollection != null)
-				return _eventCollection;
+	/// <summary>
+	/// Get property list from wrapped object.
+	/// </summary>
+	protected virtual IEnumerable<PropertyDescriptor> OnGetProperties()
+	{
+		return Obj is null
+			? null
+			: TypeDescriptor.GetProperties(Obj, true)
+				.Typed()
+				.Select(pd => new ProxyPropDescriptor(pd, this));
+	}
 
-			_eventCollection = new EventDescriptorCollection(OnGetEvents()?.ToArray() ?? []);
+	private EventDescriptorCollection _eventCollection;
 
+	EventDescriptorCollection ICustomTypeDescriptor.GetEvents()
+	{
+		if(_eventCollection != null)
 			return _eventCollection;
-		}
 
-		private PropertyDescriptorCollection _propCollection;
+		_eventCollection = new EventDescriptorCollection(OnGetEvents()?.ToArray() ?? []);
 
-		PropertyDescriptorCollection ICustomTypeDescriptor.GetProperties()
-		{
-			if(_propCollection != null)
-				return _propCollection;
+		return _eventCollection;
+	}
 
-			_propCollection = new PropertyDescriptorCollection(OnGetProperties()?.ToArray() ?? []);
+	private PropertyDescriptorCollection _propCollection;
 
+	PropertyDescriptorCollection ICustomTypeDescriptor.GetProperties()
+	{
+		if(_propCollection != null)
 			return _propCollection;
-		}
 
-		/// <inheritdoc />
-		public override string ToString() => Obj?.ToString();
+		_propCollection = new PropertyDescriptorCollection(OnGetProperties()?.ToArray() ?? []);
+
+		return _propCollection;
 	}
+
+	/// <inheritdoc />
+	public override string ToString() => Obj?.ToString();
 }
\ No newline at end of file
diff --git a/ComponentModel/DispatcherNotifiableObject.cs b/ComponentModel/DispatcherNotifiableObject.cs
index d73f579f..a201a907 100644
--- a/ComponentModel/DispatcherNotifiableObject.cs
+++ b/ComponentModel/DispatcherNotifiableObject.cs
@@ -1,85 +1,85 @@
-namespace Ecng.ComponentModel
-{
-	using System;
-	using System.Threading.Tasks;
-	using System.Collections.Generic;
-	using System.ComponentModel;
-	using System.Linq;
+namespace Ecng.ComponentModel;
 
-	using Ecng.Collections;
+using System;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
 
-	class DispatcherNotifiableObjectTimer
-	{
-		private readonly TimeSpan _minInterval = TimeSpan.FromMilliseconds(100);
-		private TimeSpan _interval = TimeSpan.FromMilliseconds(1000);
+using Ecng.Collections;
+
+class DispatcherNotifiableObjectTimer
+{
+	private readonly TimeSpan _minInterval = TimeSpan.FromMilliseconds(100);
+	private TimeSpan _interval = TimeSpan.FromMilliseconds(1000);
 
-		public event Action Tick;
+	public event Action Tick;
 
-		public TimeSpan Interval
+	public TimeSpan Interval
+	{
+		get => _interval;
+		set
 		{
-			get => _interval;
-			set
-			{
-				if (value > _interval)
-					return;
+			if (value > _interval)
+				return;
 
-				if (value < _minInterval)
-					value = _minInterval;
+			if (value < _minInterval)
+				value = _minInterval;
 
-				_interval = value;
-			}
+			_interval = value;
 		}
+	}
 
-		public DispatcherNotifiableObjectTimer() => Task.Run(TimerTask);
+	public DispatcherNotifiableObjectTimer() => Task.Run(TimerTask);
 
-		private async Task TimerTask()
+	private async Task TimerTask()
+	{
+		while (true)
 		{
-			while (true)
-			{
-				await Task.Delay(_interval);
-				Tick?.Invoke();
-			}
-			// ReSharper disable once FunctionNeverReturns
+			await Task.Delay(_interval);
+			Tick?.Invoke();
 		}
-
-		private static readonly Lazy<DispatcherNotifiableObjectTimer> _instance = new(true);
-		public static DispatcherNotifiableObjectTimer Instance => _instance.Value;
+		// ReSharper disable once FunctionNeverReturns
 	}
-	
-	/// <summary>
-	/// Forward <see cref="INotifyPropertyChanged"/> notifications to dispatcher thread.
-	/// Multiple notifications for the same property may be forwarded only once.
-	/// </summary>
-	public class DispatcherNotifiableObject<T> : CustomObjectWrapper<T>
-		where T : class, INotifyPropertyChanged
+
+	private static readonly Lazy<DispatcherNotifiableObjectTimer> _instance = new(true);
+	public static DispatcherNotifiableObjectTimer Instance => _instance.Value;
+}
+
+/// <summary>
+/// Forward <see cref="INotifyPropertyChanged"/> notifications to dispatcher thread.
+/// Multiple notifications for the same property may be forwarded only once.
+/// </summary>
+public class DispatcherNotifiableObject<T> : CustomObjectWrapper<T>
+	where T : class, INotifyPropertyChanged
     {
-		private static DispatcherNotifiableObjectTimer Timer => DispatcherNotifiableObjectTimer.Instance;
+	private static DispatcherNotifiableObjectTimer Timer => DispatcherNotifiableObjectTimer.Instance;
 
-		/// <summary>
-		/// </summary>
-		protected TimeSpan NotifyInterval
+	/// <summary>
+	/// </summary>
+	protected TimeSpan NotifyInterval
         {
             get => _notifyInterval;
             set
             {
                 _notifyInterval = value;
-				Timer.Interval = value;
+			Timer.Interval = value;
             }
         }
 
-		private readonly IDispatcher _dispatcher;
-		private readonly SynchronizedSet<string> _names = [];
+	private readonly IDispatcher _dispatcher;
+	private readonly SynchronizedSet<string> _names = [];
         private DateTime _nextTime;
         private TimeSpan _notifyInterval;
 
         /// <summary>
         /// </summary>
         public DispatcherNotifiableObject(IDispatcher dispatcher, T obj)
-			: base(obj)
+		: base(obj)
         {
-			_dispatcher = dispatcher ?? throw new ArgumentNullException(nameof(dispatcher));
-			NotifyInterval = TimeSpan.FromMilliseconds(333);
-			Timer.Tick += NotifiableObjectGuiWrapperTimerOnTick;
+		_dispatcher = dispatcher ?? throw new ArgumentNullException(nameof(dispatcher));
+		NotifyInterval = TimeSpan.FromMilliseconds(333);
+		Timer.Tick += NotifiableObjectGuiWrapperTimerOnTick;
 
             Obj.PropertyChanged += (_, args) => _names.Add(args.PropertyName);
         }
@@ -109,13 +109,13 @@ private void NotifiableObjectGuiWrapperTimerOnTick()
             if (names.Length == 0)
                 return;
 
-			_dispatcher.InvokeAsync(() => names.ForEach(OnPropertyChanged));
+		_dispatcher.InvokeAsync(() => names.ForEach(OnPropertyChanged));
         }
 
         /// <inheritdoc />
         protected override void DisposeManaged()
         {
-			Timer.Tick -= NotifiableObjectGuiWrapperTimerOnTick;
+		Timer.Tick -= NotifiableObjectGuiWrapperTimerOnTick;
 
             base.DisposeManaged();
         }
@@ -128,14 +128,13 @@ protected override void DisposeManaged()
         protected override IEnumerable<EventDescriptor> OnGetEvents()
         {
             var descriptor = TypeDescriptor
-				.GetEvents(this, true)
-				.OfType<EventDescriptor>()
-				.First(ed => ed.Name == nameof(PropertyChanged));
+			.GetEvents(this, true)
+			.OfType<EventDescriptor>()
+			.First(ed => ed.Name == nameof(PropertyChanged));
 
             return
                 base.OnGetEvents()
                     .Where(ed => ed.Name != nameof(PropertyChanged))
                     .Concat([descriptor]);
         }
-    }
-}
\ No newline at end of file
+    }
\ No newline at end of file
diff --git a/ComponentModel/DispatcherObservableCollection.cs b/ComponentModel/DispatcherObservableCollection.cs
index 159a5e2e..f45f7855 100644
--- a/ComponentModel/DispatcherObservableCollection.cs
+++ b/ComponentModel/DispatcherObservableCollection.cs
@@ -1,368 +1,367 @@
-namespace Ecng.ComponentModel
-{
-	using System;
-	using System.Collections;
-	using System.Collections.Generic;
-	using System.Linq;
+namespace Ecng.ComponentModel;
 
-	using Ecng.Collections;
-	using Ecng.Common;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
 
-	/// <summary>
-	/// The class represents a synchronized collection that can be used in WPF applications.
-	/// </summary>
-	public class DispatcherObservableCollection<TItem>(IDispatcher dispatcher, IListEx<TItem> items) : BaseObservableCollection, ISynchronizedCollection<TItem>, IListEx<TItem>, IList
+using Ecng.Collections;
+using Ecng.Common;
+
+/// <summary>
+/// The class represents a synchronized collection that can be used in WPF applications.
+/// </summary>
+public class DispatcherObservableCollection<TItem>(IDispatcher dispatcher, IListEx<TItem> items) : BaseObservableCollection, ISynchronizedCollection<TItem>, IListEx<TItem>, IList
+{
+	private enum ActionTypes
 	{
-		private enum ActionTypes
+		Add,
+		Remove,
+		Clear,
+		CopyTo,
+		Insert,
+		RemoveAt,
+		Set
+	}
+
+	private class CollectionAction
+	{
+		public CollectionAction(ActionTypes type, params TItem[] items)
 		{
-			Add,
-			Remove,
-			Clear,
-			CopyTo,
-			Insert,
-			RemoveAt,
-			Set
+			Type = type;
+			Items = items ?? throw new ArgumentNullException(nameof(items));
 		}
 
-		private class CollectionAction
+		public CollectionAction(ActionTypes type, int index, int count)
 		{
-			public CollectionAction(ActionTypes type, params TItem[] items)
-			{
-				Type = type;
-				Items = items ?? throw new ArgumentNullException(nameof(items));
-			}
+			Type = type;
+			Index = index;
+			Count = count;
+		}
 
-			public CollectionAction(ActionTypes type, int index, int count)
-			{
-				Type = type;
-				Index = index;
-				Count = count;
-			}
+		public ActionTypes Type { get; }
+		public TItem[] Items { get; }
+		public int Index { get; set; }
+		public int Count { get; }
+	}
 
-			public ActionTypes Type { get; }
-			public TItem[] Items { get; }
-			public int Index { get; set; }
-			public int Count { get; }
-		}
+	private readonly SynchronizedList<TItem> _syncCopy = [];
+	private readonly Queue<CollectionAction> _pendingActions = [];
+	private bool _isTimerStarted;
 
-		private readonly SynchronizedList<TItem> _syncCopy = [];
-		private readonly Queue<CollectionAction> _pendingActions = [];
-		private bool _isTimerStarted;
+	/// <summary>
+	/// </summary>
+	public event Action BeforeUpdate;
+	/// <summary>
+	/// </summary>
+	public event Action AfterUpdate;
 
-		/// <summary>
-		/// </summary>
-		public event Action BeforeUpdate;
-		/// <summary>
-		/// </summary>
-		public event Action AfterUpdate;
+	/// <summary>
+	/// </summary>
+	public IListEx<TItem> Items { get; } = items ?? throw new ArgumentNullException(nameof(items));
 
-		/// <summary>
-		/// </summary>
-		public IListEx<TItem> Items { get; } = items ?? throw new ArgumentNullException(nameof(items));
+	/// <summary>
+	/// </summary>
+	public IDispatcher Dispatcher { get; } = dispatcher ?? throw new ArgumentNullException(nameof(dispatcher));
 
-		/// <summary>
-		/// </summary>
-		public IDispatcher Dispatcher { get; } = dispatcher ?? throw new ArgumentNullException(nameof(dispatcher));
+	/// <summary>
+	/// </summary>
+	public event Action<IEnumerable<TItem>> AddedRange
+	{
+		add => Items.AddedRange += value;
+		remove => Items.AddedRange -= value;
+	}
 
-		/// <summary>
-		/// </summary>
-		public event Action<IEnumerable<TItem>> AddedRange
-		{
-			add => Items.AddedRange += value;
-			remove => Items.AddedRange -= value;
-		}
+	/// <summary>
+	/// </summary>
+	public event Action<IEnumerable<TItem>> RemovedRange
+	{
+		add => Items.RemovedRange += value;
+		remove => Items.RemovedRange -= value;
+	}
 
-		/// <summary>
-		/// </summary>
-		public event Action<IEnumerable<TItem>> RemovedRange
-		{
-			add => Items.RemovedRange += value;
-			remove => Items.RemovedRange -= value;
-		}
+	/// <summary>
+	/// </summary>
+	public virtual void AddRange(IEnumerable<TItem> items)
+	{
+		var arr = items.ToArray();
 
-		/// <summary>
-		/// </summary>
-		public virtual void AddRange(IEnumerable<TItem> items)
-		{
-			var arr = items.ToArray();
+		_syncCopy.AddRange(arr);
 
-			_syncCopy.AddRange(arr);
+		if (Dispatcher.CheckAccess())
+			Items.AddRange(arr);
+		else
+			AddAction(new(ActionTypes.Add, arr));
 
-			if (Dispatcher.CheckAccess())
-				Items.AddRange(arr);
-			else
-				AddAction(new(ActionTypes.Add, arr));
+		CheckCount();
+	}
 
-			CheckCount();
-		}
+	/// <summary>
+	/// Remove range of items.
+	/// </summary>
+	/// <param name="items">Items.</param>
+	public virtual void RemoveRange(IEnumerable<TItem> items)
+	{
+		var arr = items.ToArray();
 
-		/// <summary>
-		/// Remove range of items.
-		/// </summary>
-		/// <param name="items">Items.</param>
-		public virtual void RemoveRange(IEnumerable<TItem> items)
-		{
-			var arr = items.ToArray();
+		_syncCopy.RemoveRange(arr);
 
-			_syncCopy.RemoveRange(arr);
+		if (Dispatcher.CheckAccess())
+			Items.RemoveRange(arr);
+		else
+			AddAction(new(ActionTypes.Remove, arr));
+	}
 
-			if (Dispatcher.CheckAccess())
-				Items.RemoveRange(arr);
-			else
-				AddAction(new(ActionTypes.Remove, arr));
-		}
+	/// <inheritdoc />
+	public override int RemoveRange(int index, int count)
+	{
+		if (index < 0)
+			throw new ArgumentOutOfRangeException(nameof(index));
 
-		/// <inheritdoc />
-		public override int RemoveRange(int index, int count)
-		{
-			if (index < 0)
-				throw new ArgumentOutOfRangeException(nameof(index));
+		if (count <= 0)
+			throw new ArgumentOutOfRangeException(nameof(count));
 
-			if (count <= 0)
-				throw new ArgumentOutOfRangeException(nameof(count));
+		var retVal = _syncCopy.RemoveRange(index, count);
 
-			var retVal = _syncCopy.RemoveRange(index, count);
+		if (Dispatcher.CheckAccess())
+			Items.RemoveRange(index, count);
+		else
+			AddAction(new(ActionTypes.Remove, index, count));
 
-			if (Dispatcher.CheckAccess())
-				Items.RemoveRange(index, count);
-			else
-				AddAction(new(ActionTypes.Remove, index, count));
+		return retVal;
+	}
 
-			return retVal;
-		}
+	/// <inheritdoc />
+	public IEnumerator<TItem> GetEnumerator()
+		=> _syncCopy.GetEnumerator();
 
-		/// <inheritdoc />
-		public IEnumerator<TItem> GetEnumerator()
-			=> _syncCopy.GetEnumerator();
+	IEnumerator IEnumerable.GetEnumerator()
+		=> GetEnumerator();
 
-		IEnumerator IEnumerable.GetEnumerator()
-			=> GetEnumerator();
+	/// <inheritdoc />
+	public virtual void Add(TItem item)
+	{
+		_syncCopy.Add(item);
 
-		/// <inheritdoc />
-		public virtual void Add(TItem item)
-		{
-			_syncCopy.Add(item);
+		if (Dispatcher.CheckAccess())
+			Items.Add(item);
+		else
+			AddAction(new(ActionTypes.Add, item));
+
+		CheckCount();
+	}
 
+	/// <inheritdoc />
+	public virtual bool Remove(TItem item)
+	{
+		var removed = _syncCopy.Remove(item);
+
+		if (removed)
+		{
 			if (Dispatcher.CheckAccess())
-				Items.Add(item);
+				Items.Remove(item);
 			else
-				AddAction(new(ActionTypes.Add, item));
-
-			CheckCount();
+				AddAction(new(ActionTypes.Remove, item));
 		}
 
-		/// <inheritdoc />
-		public virtual bool Remove(TItem item)
-		{
-			var removed = _syncCopy.Remove(item);
+		return removed;
+	}
 
-			if (removed)
-			{
-				if (Dispatcher.CheckAccess())
-					Items.Remove(item);
-				else
-					AddAction(new(ActionTypes.Remove, item));
-			}
+	int IList.Add(object value)
+	{
+		Add((TItem)value);
+		return Count - 1;
+	}
 
-			return removed;
-		}
+	bool IList.Contains(object value)
+		=> Contains((TItem)value);
 
-		int IList.Add(object value)
-		{
-			Add((TItem)value);
-			return Count - 1;
-		}
+	/// <inheritdoc cref="ICollection{T}" />
+	public virtual void Clear()
+	{
+		_syncCopy.Clear();
 
-		bool IList.Contains(object value)
-			=> Contains((TItem)value);
+		if (Dispatcher.CheckAccess())
+			Items.Clear();
+		else
+			AddAction(new(ActionTypes.Clear));
+	}
 
-		/// <inheritdoc cref="ICollection{T}" />
-		public virtual void Clear()
-		{
-			_syncCopy.Clear();
+	int IList.IndexOf(object value)
+		=> IndexOf((TItem)value);
 
-			if (Dispatcher.CheckAccess())
-				Items.Clear();
-			else
-				AddAction(new(ActionTypes.Clear));
-		}
+	void IList.Insert(int index, object value)
+		=> Insert(index, (TItem)value);
 
-		int IList.IndexOf(object value)
-			=> IndexOf((TItem)value);
+	void IList.Remove(object value)
+		=> Remove((TItem)value);
 
-		void IList.Insert(int index, object value)
-			=> Insert(index, (TItem)value);
+	/// <inheritdoc />
+	public bool Contains(TItem item)
+		=> _syncCopy.Contains(item);
 
-		void IList.Remove(object value)
-			=> Remove((TItem)value);
+	/// <inheritdoc />
+	public void CopyTo(TItem[] array, int arrayIndex)
+		=> _syncCopy.CopyTo(array, arrayIndex);
 
-		/// <inheritdoc />
-		public bool Contains(TItem item)
-			=> _syncCopy.Contains(item);
+	void ICollection.CopyTo(Array array, int index)
+		=> CopyTo((TItem[])array, index);
 
-		/// <inheritdoc />
-		public void CopyTo(TItem[] array, int arrayIndex)
-			=> _syncCopy.CopyTo(array, arrayIndex);
+	/// <inheritdoc cref="ICollection{T}" />
+	public override int Count => _syncCopy.Count;
 
-		void ICollection.CopyTo(Array array, int index)
-			=> CopyTo((TItem[])array, index);
+	object ICollection.SyncRoot => SyncRoot;
 
-		/// <inheritdoc cref="ICollection{T}" />
-		public override int Count => _syncCopy.Count;
+	bool ICollection.IsSynchronized => true;
 
-		object ICollection.SyncRoot => SyncRoot;
+	/// <inheritdoc cref="IList{T}" />
+	public bool IsReadOnly => false;
 
-		bool ICollection.IsSynchronized => true;
+	bool IList.IsFixedSize => false;
 
-		/// <inheritdoc cref="IList{T}" />
-		public bool IsReadOnly => false;
+	/// <inheritdoc />
+	public int IndexOf(TItem item)
+		=> _syncCopy.IndexOf(item);
 
-		bool IList.IsFixedSize => false;
+	/// <inheritdoc />
+	public void Insert(int index, TItem item)
+	{
+		_syncCopy.Insert(index, item);
 
-		/// <inheritdoc />
-		public int IndexOf(TItem item)
-			=> _syncCopy.IndexOf(item);
+		if (Dispatcher.CheckAccess())
+			Items.Insert(index, item);
+		else
+			AddAction(new(ActionTypes.Insert, item) { Index = index });
+	}
 
-		/// <inheritdoc />
-		public void Insert(int index, TItem item)
-		{
-			_syncCopy.Insert(index, item);
+	/// <inheritdoc cref="IList{T}" />
+	public void RemoveAt(int index)
+	{
+		_syncCopy.RemoveAt(index);
 
-			if (Dispatcher.CheckAccess())
-				Items.Insert(index, item);
-			else
-				AddAction(new(ActionTypes.Insert, item) { Index = index });
-		}
+		if (Dispatcher.CheckAccess())
+			Items.RemoveAt(index);
+		else
+			AddAction(new(ActionTypes.RemoveAt) { Index = index });
+	}
 
-		/// <inheritdoc cref="IList{T}" />
-		public void RemoveAt(int index)
+	object IList.this[int index]
+	{
+		get => this[index];
+		set => this[index] = (TItem)value;
+	}
+
+	/// <inheritdoc />
+	public TItem this[int index]
+	{
+		get => _syncCopy[index];
+		set
 		{
-			_syncCopy.RemoveAt(index);
+			_syncCopy[index] = value;
 
 			if (Dispatcher.CheckAccess())
-				Items.RemoveAt(index);
+				Items[index] = value;
 			else
-				AddAction(new(ActionTypes.RemoveAt) { Index = index });
+				AddAction(new(ActionTypes.Set, value) { Index = index });
 		}
+	}
 
-		object IList.this[int index]
-		{
-			get => this[index];
-			set => this[index] = (TItem)value;
-		}
+	private void AddAction(CollectionAction item)
+	{
+		if (item == null)
+			throw new ArgumentNullException(nameof(item));
 
-		/// <inheritdoc />
-		public TItem this[int index]
+		lock (SyncRoot)
 		{
-			get => _syncCopy[index];
-			set
-			{
-				_syncCopy[index] = value;
+			_pendingActions.Enqueue(item);
 
-				if (Dispatcher.CheckAccess())
-					Items[index] = value;
-				else
-					AddAction(new(ActionTypes.Set, value) { Index = index });
-			}
+			if (_isTimerStarted)
+				return;
+
+			_isTimerStarted = true;
 		}
 
-		private void AddAction(CollectionAction item)
-		{
-			if (item == null)
-				throw new ArgumentNullException(nameof(item));
+		ThreadingHelper
+			.Timer(OnFlush)
+			.Interval(TimeSpan.FromMilliseconds(300), new TimeSpan(-1));
+	}
+
+	private void OnFlush()
+	{
+		List<CollectionAction> pendingActions;
+		var hasClear = false;
+		Exception error = null;
 
+		try
+		{
 			lock (SyncRoot)
 			{
-				_pendingActions.Enqueue(item);
+				pendingActions = [.. _pendingActions];
+				_pendingActions.Clear();
+				_isTimerStarted = false;
+			}
 
-				if (_isTimerStarted)
-					return;
+			for (var i = 0; i < pendingActions.Count; i++)
+			{
+				if (pendingActions[i].Type != ActionTypes.Clear)
+					continue;
 
-				_isTimerStarted = true;
+				pendingActions.RemoveRange(0, i + 1);
+				hasClear = true;
+				i = -1;
 			}
-
-			ThreadingHelper
-				.Timer(OnFlush)
-				.Interval(TimeSpan.FromMilliseconds(300), new TimeSpan(-1));
 		}
-
-		private void OnFlush()
+		catch (Exception ex)
 		{
-			List<CollectionAction> pendingActions;
-			var hasClear = false;
-			Exception error = null;
-
-			try
-			{
-				lock (SyncRoot)
-				{
-					pendingActions = [.. _pendingActions];
-					_pendingActions.Clear();
-					_isTimerStarted = false;
-				}
+			error = ex;
+			pendingActions = [];
+		}
 
-				for (var i = 0; i < pendingActions.Count; i++)
-				{
-					if (pendingActions[i].Type != ActionTypes.Clear)
-						continue;
+		Dispatcher.InvokeAsync(() =>
+		{
+			BeforeUpdate?.Invoke();
 
-					pendingActions.RemoveRange(0, i + 1);
-					hasClear = true;
-					i = -1;
-				}
-			}
-			catch (Exception ex)
-			{
-				error = ex;
-				pendingActions = [];
-			}
+			if (hasClear)
+				Items.Clear();
 
-			Dispatcher.InvokeAsync(() =>
+			foreach (var action in pendingActions)
 			{
-				BeforeUpdate?.Invoke();
-
-				if (hasClear)
-					Items.Clear();
-
-				foreach (var action in pendingActions)
+				switch (action.Type)
 				{
-					switch (action.Type)
-					{
-						case ActionTypes.Add:
-							Items.AddRange(action.Items);
-							break;
-						case ActionTypes.Remove:
-							if (action.Items != null)
-								Items.RemoveRange(action.Items);
-							else
-								Items.RemoveRange(action.Index, action.Count);
-							break;
-						case ActionTypes.CopyTo:
-							Items.CopyTo(action.Items, action.Index);
-							break;
-						case ActionTypes.Insert:
-							Items.Insert(action.Index, action.Items[0]);
-							break;
-						case ActionTypes.RemoveAt:
-							Items.RemoveAt(action.Index);
-							break;
-						case ActionTypes.Set:
-							Items[action.Index] = action.Items[0];
-							break;
-						default:
-							throw new ArgumentOutOfRangeException(action.Type.To<string>());
-					}
+					case ActionTypes.Add:
+						Items.AddRange(action.Items);
+						break;
+					case ActionTypes.Remove:
+						if (action.Items != null)
+							Items.RemoveRange(action.Items);
+						else
+							Items.RemoveRange(action.Index, action.Count);
+						break;
+					case ActionTypes.CopyTo:
+						Items.CopyTo(action.Items, action.Index);
+						break;
+					case ActionTypes.Insert:
+						Items.Insert(action.Index, action.Items[0]);
+						break;
+					case ActionTypes.RemoveAt:
+						Items.RemoveAt(action.Index);
+						break;
+					case ActionTypes.Set:
+						Items[action.Index] = action.Items[0];
+						break;
+					default:
+						throw new ArgumentOutOfRangeException(action.Type.To<string>());
 				}
+			}
 
-				AfterUpdate?.Invoke();
-
-				if (error != null)
-					throw error;
-			});
-		}
+			AfterUpdate?.Invoke();
 
-		/// <summary>
-		/// </summary>
-		public SyncObject SyncRoot => _syncCopy.SyncRoot;
+			if (error != null)
+				throw error;
+		});
 	}
+
+	/// <summary>
+	/// </summary>
+	public SyncObject SyncRoot => _syncCopy.SyncRoot;
 }
diff --git a/ComponentModel/DocAttribute.cs b/ComponentModel/DocAttribute.cs
index 1ebdc5de..ae8ca09b 100644
--- a/ComponentModel/DocAttribute.cs
+++ b/ComponentModel/DocAttribute.cs
@@ -1,21 +1,20 @@
-namespace Ecng.ComponentModel
-{
-	using System;
+namespace Ecng.ComponentModel;
+
+using System;
 
-	using Ecng.Common;
+using Ecng.Common;
 
+/// <summary>
+/// Online doc url attribute.
+/// </summary>
+/// <remarks>
+/// Initializes a new instance of the <see cref="DocAttribute"/>.
+/// </remarks>
+/// <param name="docUrl">Online doc url.</param>
+public class DocAttribute(string docUrl) : Attribute
+{
 	/// <summary>
-	/// Online doc url attribute.
+	/// Online doc url.
 	/// </summary>
-	/// <remarks>
-	/// Initializes a new instance of the <see cref="DocAttribute"/>.
-	/// </remarks>
-	/// <param name="docUrl">Online doc url.</param>
-	public class DocAttribute(string docUrl) : Attribute
-	{
-		/// <summary>
-		/// Online doc url.
-		/// </summary>
-		public string DocUrl { get; } = docUrl.ThrowIfEmpty(nameof(docUrl));
-	}
+	public string DocUrl { get; } = docUrl.ThrowIfEmpty(nameof(docUrl));
 }
\ No newline at end of file
diff --git a/ComponentModel/EditorExtensionAttribute.cs b/ComponentModel/EditorExtensionAttribute.cs
index c9a3c2ec..9d4cea1d 100644
--- a/ComponentModel/EditorExtensionAttribute.cs
+++ b/ComponentModel/EditorExtensionAttribute.cs
@@ -1,31 +1,30 @@
-namespace Ecng.ComponentModel
-{
-	using System;
+namespace Ecng.ComponentModel;
+
+using System;
 
+/// <summary>
+/// Specifies editor extension options for enums and properties.
+/// </summary>
+[AttributeUsage(AttributeTargets.Enum | AttributeTargets.Property)]
+public class EditorExtensionAttribute : Attribute
+{
 	/// <summary>
-	/// Specifies editor extension options for enums and properties.
+	/// Gets or sets a value indicating whether auto-complete is enabled.
 	/// </summary>
-	[AttributeUsage(AttributeTargets.Enum | AttributeTargets.Property)]
-	public class EditorExtensionAttribute : Attribute
-	{
-		/// <summary>
-		/// Gets or sets a value indicating whether auto-complete is enabled.
-		/// </summary>
-		public bool AutoComplete { get; set; }
+	public bool AutoComplete { get; set; }
 
-		/// <summary>
-		/// Gets or sets a value indicating whether the items should be sorted.
-		/// </summary>
-		public bool Sorted { get; set; }
+	/// <summary>
+	/// Gets or sets a value indicating whether the items should be sorted.
+	/// </summary>
+	public bool Sorted { get; set; }
 
-		/// <summary>
-		/// Gets or sets a value indicating whether obsolete items should be included.
-		/// </summary>
-		public bool IncludeObsolete { get; set; }
+	/// <summary>
+	/// Gets or sets a value indicating whether obsolete items should be included.
+	/// </summary>
+	public bool IncludeObsolete { get; set; }
 
-		/// <summary>
-		/// Gets or sets a value indicating whether the count of selected items should be displayed.
-		/// </summary>
-		public bool ShowSelectedItemsCount { get; set; }
-	}
+	/// <summary>
+	/// Gets or sets a value indicating whether the count of selected items should be displayed.
+	/// </summary>
+	public bool ShowSelectedItemsCount { get; set; }
 }
\ No newline at end of file
diff --git a/ComponentModel/EntityProperty.cs b/ComponentModel/EntityProperty.cs
index c83ce97d..e5fec3e6 100644
--- a/ComponentModel/EntityProperty.cs
+++ b/ComponentModel/EntityProperty.cs
@@ -1,54 +1,53 @@
-namespace Ecng.ComponentModel
+namespace Ecng.ComponentModel;
+
+using System.Collections.Generic;
+
+/// <summary>
+/// Represents an entity property with hierarchical structure.
+/// </summary>
+public class EntityProperty
 {
-	using System.Collections.Generic;
+	/// <summary>
+	/// Gets or sets the unique name of the property.
+	/// </summary>
+	public string Name { get; set; }
+
+	/// <summary>
+	/// Gets or sets the display name of the property.
+	/// </summary>
+	public string DisplayName { get; set; }
+
+	/// <summary>
+	/// Gets or sets the description of the property.
+	/// </summary>
+	public string Description { get; set; }
+
+	/// <summary>
+	/// Gets or sets the parent property in the hierarchy.
+	/// </summary>
+	public EntityProperty Parent { get; set; }
+
+	/// <summary>
+	/// Gets or sets the collection of child properties.
+	/// </summary>
+	public IEnumerable<EntityProperty> Properties { get; set; }
+
+	/// <summary>
+	/// Gets the full display name, which includes the names of the parent properties.
+	/// </summary>
+	public string FullDisplayName => Parent is null ? DisplayName : $"{Parent.FullDisplayName} -> {DisplayName}";
+
+	/// <summary>
+	/// Gets the name of the parent property. Returns an empty string if there is no parent.
+	/// </summary>
+	public string ParentName => Parent is null ? string.Empty : Parent.Name;
 
 	/// <summary>
-	/// Represents an entity property with hierarchical structure.
+	/// Returns a string that represents the current entity property.
 	/// </summary>
-	public class EntityProperty
+	/// <returns>A string representation of the entity property including its name and full display name.</returns>
+	public override string ToString()
 	{
-		/// <summary>
-		/// Gets or sets the unique name of the property.
-		/// </summary>
-		public string Name { get; set; }
-
-		/// <summary>
-		/// Gets or sets the display name of the property.
-		/// </summary>
-		public string DisplayName { get; set; }
-
-		/// <summary>
-		/// Gets or sets the description of the property.
-		/// </summary>
-		public string Description { get; set; }
-
-		/// <summary>
-		/// Gets or sets the parent property in the hierarchy.
-		/// </summary>
-		public EntityProperty Parent { get; set; }
-
-		/// <summary>
-		/// Gets or sets the collection of child properties.
-		/// </summary>
-		public IEnumerable<EntityProperty> Properties { get; set; }
-
-		/// <summary>
-		/// Gets the full display name, which includes the names of the parent properties.
-		/// </summary>
-		public string FullDisplayName => Parent is null ? DisplayName : $"{Parent.FullDisplayName} -> {DisplayName}";
-
-		/// <summary>
-		/// Gets the name of the parent property. Returns an empty string if there is no parent.
-		/// </summary>
-		public string ParentName => Parent is null ? string.Empty : Parent.Name;
-
-		/// <summary>
-		/// Returns a string that represents the current entity property.
-		/// </summary>
-		/// <returns>A string representation of the entity property including its name and full display name.</returns>
-		public override string ToString()
-		{
-			return $"{Name} ({FullDisplayName})";
-		}
+		return $"{Name} ({FullDisplayName})";
 	}
 }
diff --git a/ComponentModel/EntityPropertyHelper.cs b/ComponentModel/EntityPropertyHelper.cs
index 2d4b57a2..a5ce6704 100644
--- a/ComponentModel/EntityPropertyHelper.cs
+++ b/ComponentModel/EntityPropertyHelper.cs
@@ -1,287 +1,286 @@
-namespace Ecng.ComponentModel
-{
-	using System;
-	using System.Collections;
-	using System.Collections.Generic;
-	using System.Linq;
-	using System.Reflection;
+namespace Ecng.ComponentModel;
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
 
-	using Ecng.Common;
-	using Ecng.Reflection;
+using Ecng.Common;
+using Ecng.Reflection;
 
+/// <summary>
+/// Provides helper methods for retrieving entity properties from a specified type.
+/// </summary>
+public static class EntityPropertyHelper
+{
 	/// <summary>
-	/// Provides helper methods for retrieving entity properties from a specified type.
+	/// Retrieves the entity properties for the specified type.
 	/// </summary>
-	public static class EntityPropertyHelper
+	/// <param name="type">The type to retrieve entity properties from.</param>
+	/// <param name="filter">An optional filter to apply to the property information.</param>
+	/// <returns>An enumerable collection of <see cref="EntityProperty"/>.</returns>
+	public static IEnumerable<EntityProperty> GetEntityProperties(this Type type, Func<PropertyInfo, bool> filter = null)
 	{
-		/// <summary>
-		/// Retrieves the entity properties for the specified type.
-		/// </summary>
-		/// <param name="type">The type to retrieve entity properties from.</param>
-		/// <param name="filter">An optional filter to apply to the property information.</param>
-		/// <returns>An enumerable collection of <see cref="EntityProperty"/>.</returns>
-		public static IEnumerable<EntityProperty> GetEntityProperties(this Type type, Func<PropertyInfo, bool> filter = null)
-		{
-			return type.GetEntityProperties(null, filter);
-		}
-
-		/// <summary>
-		/// Retrieves the entity properties for the specified type with a specified parent entity property.
-		/// </summary>
-		/// <param name="type">The type to retrieve entity properties from.</param>
-		/// <param name="parent">The parent <see cref="EntityProperty"/> in the hierarchy.</param>
-		/// <param name="filter">An optional filter to apply to the property information.</param>
-		/// <returns>An enumerable collection of <see cref="EntityProperty"/>.</returns>
-		public static IEnumerable<EntityProperty> GetEntityProperties(this Type type, EntityProperty parent, Func<PropertyInfo, bool> filter = null)
-		{
-			return type.GetEntityProperties(parent, [], filter ?? (p => true));
-		}
+		return type.GetEntityProperties(null, filter);
+	}
 
-		private static IEnumerable<EntityProperty> GetEntityProperties(this Type type, EntityProperty parent, HashSet<Type> processed, Func<PropertyInfo, bool> filter)
-		{
-			if (processed.Contains(type))
-				yield break;
+	/// <summary>
+	/// Retrieves the entity properties for the specified type with a specified parent entity property.
+	/// </summary>
+	/// <param name="type">The type to retrieve entity properties from.</param>
+	/// <param name="parent">The parent <see cref="EntityProperty"/> in the hierarchy.</param>
+	/// <param name="filter">An optional filter to apply to the property information.</param>
+	/// <returns>An enumerable collection of <see cref="EntityProperty"/>.</returns>
+	public static IEnumerable<EntityProperty> GetEntityProperties(this Type type, EntityProperty parent, Func<PropertyInfo, bool> filter = null)
+	{
+		return type.GetEntityProperties(parent, [], filter ?? (p => true));
+	}
 
-			type = type.GetUnderlyingType() ?? type;
+	private static IEnumerable<EntityProperty> GetEntityProperties(this Type type, EntityProperty parent, HashSet<Type> processed, Func<PropertyInfo, bool> filter)
+	{
+		if (processed.Contains(type))
+			yield break;
 
-			var propertyInfos = type
-				.GetMembers<PropertyInfo>(BindingFlags.Public | BindingFlags.Instance)
-				.Where(filter);
+		type = type.GetUnderlyingType() ?? type;
 
-			var names = new HashSet<string>();
+		var propertyInfos = type
+			.GetMembers<PropertyInfo>(BindingFlags.Public | BindingFlags.Instance)
+			.Where(filter);
 
-			processed.Add(type);
+		var names = new HashSet<string>();
 
-			foreach (var pi in propertyInfos)
-			{
-				var name = (parent != null ? parent.Name + "." : string.Empty) + pi.Name;
+		processed.Add(type);
 
-				if (!names.Add(name))
-					continue;
+		foreach (var pi in propertyInfos)
+		{
+			var name = (parent != null ? parent.Name + "." : string.Empty) + pi.Name;
 
-				var prop = new EntityProperty
-				{
-					Name = name,
-					Parent = parent,
-					DisplayName = pi.GetDisplayName(),
-					Description = pi.GetDescription()
-				};
+			if (!names.Add(name))
+				continue;
 
-				var propType = pi.PropertyType;
+			var prop = new EntityProperty
+			{
+				Name = name,
+				Parent = parent,
+				DisplayName = pi.GetDisplayName(),
+				Description = pi.GetDescription()
+			};
 
-				if (!propType.IsPrimitive())
-				{
-					prop.Properties = GetEntityProperties(propType, prop, processed, filter);
-				}
+			var propType = pi.PropertyType;
 
-				yield return prop;
+			if (!propType.IsPrimitive())
+			{
+				prop.Properties = GetEntityProperties(propType, prop, processed, filter);
 			}
 
-			processed.Remove(type);
+			yield return prop;
 		}
 
-		/// <summary>
-		/// Gets the type of a nested property specified by its name.
-		/// </summary>
-		/// <param name="type">The type that contains the property.</param>
-		/// <param name="name">The dot-separated name of the property.</param>
-		/// <param name="getVirtualProp">An optional function to retrieve the type of a virtual property.</param>
-		/// <returns>The <see cref="Type"/> of the property if found; otherwise, null.</returns>
-		public static Type GetPropType(this Type type, string name, Func<Type, string, Type> getVirtualProp = null)
-		{
-			if (type is null)
-				throw new ArgumentNullException(nameof(type));
+		processed.Remove(type);
+	}
 
-			if (name is null)
-				throw new ArgumentNullException(nameof(name));
+	/// <summary>
+	/// Gets the type of a nested property specified by its name.
+	/// </summary>
+	/// <param name="type">The type that contains the property.</param>
+	/// <param name="name">The dot-separated name of the property.</param>
+	/// <param name="getVirtualProp">An optional function to retrieve the type of a virtual property.</param>
+	/// <returns>The <see cref="Type"/> of the property if found; otherwise, null.</returns>
+	public static Type GetPropType(this Type type, string name, Func<Type, string, Type> getVirtualProp = null)
+	{
+		if (type is null)
+			throw new ArgumentNullException(nameof(type));
 
-			getVirtualProp ??= (t, n) => null;
+		if (name is null)
+			throw new ArgumentNullException(nameof(name));
 
-			type = type.GetUnderlyingType() ?? type;
+		getVirtualProp ??= (t, n) => null;
 
-			foreach (var p in name.Split('.'))
-			{
-				var part = p;
+		type = type.GetUnderlyingType() ?? type;
 
-				var brIdx = part.IndexOf('[');
-				var index = brIdx != -1 ? part.Substring(brIdx + 1, part.IndexOf(']') - (brIdx + 1)) : null;
+		foreach (var p in name.Split('.'))
+		{
+			var part = p;
 
-				if (index is not null)
-					part = part.Substring(0, brIdx);
+			var brIdx = part.IndexOf('[');
+			var index = brIdx != -1 ? part.Substring(brIdx + 1, part.IndexOf(']') - (brIdx + 1)) : null;
 
-				var info = type.GetProperty(part);
+			if (index is not null)
+				part = part.Substring(0, brIdx);
 
-				if (info is null)
-				{
-					var virtualPropType = getVirtualProp(type, part);
+			var info = type.GetProperty(part);
 
-					if (virtualPropType is null)
-						return null;
+			if (info is null)
+			{
+				var virtualPropType = getVirtualProp(type, part);
 
-					type = virtualPropType;
-				}
-				else
-					type = info.PropertyType;
+				if (virtualPropType is null)
+					return null;
 
-				type = type.GetUnderlyingType() ?? type;
+				type = virtualPropType;
+			}
+			else
+				type = info.PropertyType;
 
-				if (type is not null && index is not null)
+			type = type.GetUnderlyingType() ?? type;
+
+			if (type is not null && index is not null)
+			{
+				if (type.Is<IList>())
 				{
-					if (type.Is<IList>())
-					{
-						type = type.GetItemType();
-					}
-					else if (type.Is<IDictionary>())
-					{
-						type = typeof(object);
-					}
-					else if (type.GetGenericType(typeof(IDictionary<,>)) is not null)
-					{
-						type = type.GetGenericArguments()[1];
-					}
-					else
-						return null;
+					type = type.GetItemType();
+				}
+				else if (type.Is<IDictionary>())
+				{
+					type = typeof(object);
+				}
+				else if (type.GetGenericType(typeof(IDictionary<,>)) is not null)
+				{
+					type = type.GetGenericArguments()[1];
 				}
+				else
+					return null;
 			}
-
-			return type;
 		}
 
-		/// <summary>
-		/// Gets the value of a nested property from an object.
-		/// </summary>
-		/// <param name="entity">The object to retrieve the value from.</param>
-		/// <param name="name">The dot-separated name of the property.</param>
-		/// <param name="getVirtualProp">An optional function to retrieve the value of a virtual property.</param>
-		/// <param name="vars">An optional dictionary of variables for indexing.</param>
-		/// <returns>The value of the property if found; otherwise, null.</returns>
-		public static object GetPropValue(this object entity, string name, Func<object, string, object> getVirtualProp = null, IDictionary<string, object> vars = null)
-		{
-			var value = entity;
+		return type;
+	}
 
-			getVirtualProp ??= (t, n) => null;
+	/// <summary>
+	/// Gets the value of a nested property from an object.
+	/// </summary>
+	/// <param name="entity">The object to retrieve the value from.</param>
+	/// <param name="name">The dot-separated name of the property.</param>
+	/// <param name="getVirtualProp">An optional function to retrieve the value of a virtual property.</param>
+	/// <param name="vars">An optional dictionary of variables for indexing.</param>
+	/// <returns>The value of the property if found; otherwise, null.</returns>
+	public static object GetPropValue(this object entity, string name, Func<object, string, object> getVirtualProp = null, IDictionary<string, object> vars = null)
+	{
+		var value = entity;
 
-			foreach (var p in name.Split('.'))
-			{
-				var part = p;
+		getVirtualProp ??= (t, n) => null;
 
-				if (value is null)
-					return null;
+		foreach (var p in name.Split('.'))
+		{
+			var part = p;
 
-				var brIdx = part.IndexOf('[');
-				var index = brIdx != -1 ? part.Substring(brIdx + 1, part.IndexOf(']') - (brIdx + 1)) : null;
+			if (value is null)
+				return null;
 
-				if (index is not null)
-					part = part.Substring(0, brIdx);
+			var brIdx = part.IndexOf('[');
+			var index = brIdx != -1 ? part.Substring(brIdx + 1, part.IndexOf(']') - (brIdx + 1)) : null;
 
-				var info = value.GetType().GetProperty(part);
+			if (index is not null)
+				part = part.Substring(0, brIdx);
 
-				if (info is null)
-				{
-					var virtualPropValue = getVirtualProp(value, part);
+			var info = value.GetType().GetProperty(part);
 
-					if (virtualPropValue is null)
-						return null;
+			if (info is null)
+			{
+				var virtualPropValue = getVirtualProp(value, part);
 
-					value = virtualPropValue;
-				}
-				else
-					value = info.GetValue(value, null);
+				if (virtualPropValue is null)
+					return null;
+
+				value = virtualPropValue;
+			}
+			else
+				value = info.GetValue(value, null);
 
-				if (value is not null && index is not null)
+			if (value is not null && index is not null)
+			{
+				if (value is IList list)
 				{
-					if (value is IList list)
+					if (!int.TryParse(index, out var i))
 					{
-						if (!int.TryParse(index, out var i))
-						{
-							if (vars is null)
-								throw new InvalidOperationException($"{index} is not index.");
-
-							i = vars[index].To<int>();
-						}
-
-						if (i < 0 || i >= list.Count)
-							return null;
+						if (vars is null)
+							throw new InvalidOperationException($"{index} is not index.");
 
-						value = list[i];
+						i = vars[index].To<int>();
 					}
-					else if (value is IDictionary dict)
-					{
-						object key = index;
 
-						var type = dict.GetType();
+					if (i < 0 || i >= list.Count)
+						return null;
 
-						if (type.IsGenericType)
-						{
-							var argTypes = type.GetGenericArguments();
-							key = key.To(argTypes[0]);
-						}
+					value = list[i];
+				}
+				else if (value is IDictionary dict)
+				{
+					object key = index;
 
-						if (!dict.Contains(key))
-							return null;
+					var type = dict.GetType();
 
-						value = dict[key];
+					if (type.IsGenericType)
+					{
+						var argTypes = type.GetGenericArguments();
+						key = key.To(argTypes[0]);
 					}
-					else
+
+					if (!dict.Contains(key))
 						return null;
+
+					value = dict[key];
 				}
+				else
+					return null;
 			}
-
-			return value;
 		}
 
-		/// <summary>
-		/// Retrieves variable names from a nested property path for the specified type.
-		/// </summary>
-		/// <param name="type">The type that contains the property.</param>
-		/// <param name="name">The dot-separated property path.</param>
-		/// <param name="getVirtualProp">An optional function to retrieve the type of a virtual property.</param>
-		/// <returns>An enumerable collection of variable names present in the property path.</returns>
-		public static IEnumerable<string> GetVars(this Type type, string name, Func<Type, string, Type> getVirtualProp = null)
-		{
-			if (type is null)
-				throw new ArgumentNullException(nameof(type));
+		return value;
+	}
 
-			if (name is null)
-				throw new ArgumentNullException(nameof(name));
+	/// <summary>
+	/// Retrieves variable names from a nested property path for the specified type.
+	/// </summary>
+	/// <param name="type">The type that contains the property.</param>
+	/// <param name="name">The dot-separated property path.</param>
+	/// <param name="getVirtualProp">An optional function to retrieve the type of a virtual property.</param>
+	/// <returns>An enumerable collection of variable names present in the property path.</returns>
+	public static IEnumerable<string> GetVars(this Type type, string name, Func<Type, string, Type> getVirtualProp = null)
+	{
+		if (type is null)
+			throw new ArgumentNullException(nameof(type));
 
-			getVirtualProp ??= (t, n) => null;
+		if (name is null)
+			throw new ArgumentNullException(nameof(name));
 
-			type = type.GetUnderlyingType() ?? type;
+		getVirtualProp ??= (t, n) => null;
 
-			foreach (var p in name.Split('.'))
-			{
-				var part = p;
+		type = type.GetUnderlyingType() ?? type;
 
-				var brIdx = part.IndexOf('[');
-				var index = brIdx != -1 ? part.Substring(brIdx + 1, part.IndexOf(']') - (brIdx + 1)) : null;
+		foreach (var p in name.Split('.'))
+		{
+			var part = p;
 
-				if (index is not null)
-					part = part.Substring(0, brIdx);
+			var brIdx = part.IndexOf('[');
+			var index = brIdx != -1 ? part.Substring(brIdx + 1, part.IndexOf(']') - (brIdx + 1)) : null;
 
-				var info = type.GetProperty(part);
+			if (index is not null)
+				part = part.Substring(0, brIdx);
 
-				if (info is null)
-				{
-					var virtualPropType = getVirtualProp(type, part);
+			var info = type.GetProperty(part);
 
-					if (virtualPropType is null)
-						yield break;
+			if (info is null)
+			{
+				var virtualPropType = getVirtualProp(type, part);
 
-					type = virtualPropType;
-				}
-				else
-					type = info.PropertyType;
+				if (virtualPropType is null)
+					yield break;
 
-				type = type.GetUnderlyingType() ?? type;
+				type = virtualPropType;
+			}
+			else
+				type = info.PropertyType;
+
+			type = type.GetUnderlyingType() ?? type;
 
-				if (type is not null && index is not null)
+			if (type is not null && index is not null)
+			{
+				if (type.Is<IList>())
 				{
-					if (type.Is<IList>())
-					{
-						if (!int.TryParse(index, out _))
-							yield return index;
-					}
+					if (!int.TryParse(index, out _))
+						yield return index;
 				}
 			}
 		}
diff --git a/ComponentModel/Extensions.cs b/ComponentModel/Extensions.cs
index b3c5853d..5e990ab1 100644
--- a/ComponentModel/Extensions.cs
+++ b/ComponentModel/Extensions.cs
@@ -1,676 +1,675 @@
-namespace Ecng.ComponentModel
+namespace Ecng.ComponentModel;
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+using Ecng.Collections;
+using Ecng.Common;
+using Ecng.Serialization;
+using Ecng.Localization;
+
+/// <summary>
+/// Provides a collection of extension methods for components, attributes, and debugging.
+/// </summary>
+public static class Extensions
 {
-	using System;
-	using System.Collections.Generic;
-	using System.ComponentModel;
-	using System.ComponentModel.DataAnnotations;
-	using System.Linq;
-	using System.Reflection;
-	using System.Runtime.InteropServices;
-
-	using Ecng.Collections;
-	using Ecng.Common;
-	using Ecng.Serialization;
-	using Ecng.Localization;
-
 	/// <summary>
-	/// Provides a collection of extension methods for components, attributes, and debugging.
+	/// Retrieves the display name for the given attribute provider using DisplayAttribute or DisplayNameAttribute.
 	/// </summary>
-	public static class Extensions
+	/// <param name="provider">The custom attribute provider.</param>
+	/// <param name="defaultValue">The default value if no display name is found.</param>
+	/// <returns>The display name.</returns>
+	public static string GetDisplayName(this ICustomAttributeProvider provider, string defaultValue = null)
 	{
-		/// <summary>
-		/// Retrieves the display name for the given attribute provider using DisplayAttribute or DisplayNameAttribute.
-		/// </summary>
-		/// <param name="provider">The custom attribute provider.</param>
-		/// <param name="defaultValue">The default value if no display name is found.</param>
-		/// <returns>The display name.</returns>
-		public static string GetDisplayName(this ICustomAttributeProvider provider, string defaultValue = null)
-		{
-			if (provider is Assembly asm)
-				return asm.GetAttribute<AssemblyTitleAttribute>()?.Title;
-
-			var dpAttr = provider.GetAttribute<DisplayAttribute>();
+		if (provider is Assembly asm)
+			return asm.GetAttribute<AssemblyTitleAttribute>()?.Title;
 
-			if (dpAttr?.Name is null)
-			{
-				var nameAttr = provider.GetAttribute<DisplayNameAttribute>();
-				return nameAttr is null ? defaultValue ?? provider.GetTypeName() : nameAttr.DisplayName;
-			}
+		var dpAttr = provider.GetAttribute<DisplayAttribute>();
 
-			return dpAttr.GetName();
+		if (dpAttr?.Name is null)
+		{
+			var nameAttr = provider.GetAttribute<DisplayNameAttribute>();
+			return nameAttr is null ? defaultValue ?? provider.GetTypeName() : nameAttr.DisplayName;
 		}
 
-		/// <summary>
-		/// Retrieves the display name for the specified property descriptor using DisplayAttribute or DisplayNameAttribute.
-		/// </summary>
-		/// <param name="pd">The property descriptor.</param>
-		/// <param name="defaultValue">The default value if no display name is found.</param>
-		/// <returns>The display name.</returns>
-		public static string GetDisplayName(this PropertyDescriptor pd, string defaultValue = null)
+		return dpAttr.GetName();
+	}
+
+	/// <summary>
+	/// Retrieves the display name for the specified property descriptor using DisplayAttribute or DisplayNameAttribute.
+	/// </summary>
+	/// <param name="pd">The property descriptor.</param>
+	/// <param name="defaultValue">The default value if no display name is found.</param>
+	/// <returns>The display name.</returns>
+	public static string GetDisplayName(this PropertyDescriptor pd, string defaultValue = null)
+	{
+		foreach(var a in pd.Attributes)
 		{
-			foreach(var a in pd.Attributes)
+			switch (a)
 			{
-				switch (a)
-				{
-					case DisplayAttribute da:
-						return da.GetName();
-					case DisplayNameAttribute dna:
-						return dna.DisplayName;
-				}
+				case DisplayAttribute da:
+					return da.GetName();
+				case DisplayNameAttribute dna:
+					return dna.DisplayName;
 			}
-
-			return defaultValue ?? pd.PropertyType.Name;
 		}
 
-		/// <summary>
-		/// Retrieves the description for the given attribute provider using DisplayAttribute or DescriptionAttribute.
-		/// </summary>
-		/// <param name="provider">The custom attribute provider.</param>
-		/// <param name="defaultValue">The default description if none is found.</param>
-		/// <returns>The description string.</returns>
-		public static string GetDescription(this ICustomAttributeProvider provider, string defaultValue = null)
-		{
-			if (provider is Assembly asm)
-				return asm.GetAttribute<AssemblyDescriptionAttribute>()?.Description;
+		return defaultValue ?? pd.PropertyType.Name;
+	}
 
-			var dpAttr = provider.GetAttribute<DisplayAttribute>();
+	/// <summary>
+	/// Retrieves the description for the given attribute provider using DisplayAttribute or DescriptionAttribute.
+	/// </summary>
+	/// <param name="provider">The custom attribute provider.</param>
+	/// <param name="defaultValue">The default description if none is found.</param>
+	/// <returns>The description string.</returns>
+	public static string GetDescription(this ICustomAttributeProvider provider, string defaultValue = null)
+	{
+		if (provider is Assembly asm)
+			return asm.GetAttribute<AssemblyDescriptionAttribute>()?.Description;
 
-			if (dpAttr?.Description is null)
-			{
-				var descrAttr = provider.GetAttribute<DescriptionAttribute>();
-				return descrAttr is null ? defaultValue ?? provider.GetTypeName() : descrAttr.Description;
-			}
+		var dpAttr = provider.GetAttribute<DisplayAttribute>();
 
-			return dpAttr.GetDescription();
+		if (dpAttr?.Description is null)
+		{
+			var descrAttr = provider.GetAttribute<DescriptionAttribute>();
+			return descrAttr is null ? defaultValue ?? provider.GetTypeName() : descrAttr.Description;
 		}
 
-		/// <summary>
-		/// Retrieves the category name for the given attribute provider using DisplayAttribute or CategoryAttribute.
-		/// </summary>
-		/// <param name="provider">The custom attribute provider.</param>
-		/// <param name="defaultValue">The default category if none is found.</param>
-		/// <returns>The category name.</returns>
-		public static string GetCategory(this ICustomAttributeProvider provider, string defaultValue = null)
-		{
-			var dpAttr = provider.GetAttribute<DisplayAttribute>();
+		return dpAttr.GetDescription();
+	}
 
-			if (dpAttr?.GroupName is null)
-			{
-				var categoryAttr = provider.GetAttribute<CategoryAttribute>();
-				return categoryAttr is null ? defaultValue ?? provider.GetTypeName() : categoryAttr.Category;
-			}
+	/// <summary>
+	/// Retrieves the category name for the given attribute provider using DisplayAttribute or CategoryAttribute.
+	/// </summary>
+	/// <param name="provider">The custom attribute provider.</param>
+	/// <param name="defaultValue">The default category if none is found.</param>
+	/// <returns>The category name.</returns>
+	public static string GetCategory(this ICustomAttributeProvider provider, string defaultValue = null)
+	{
+		var dpAttr = provider.GetAttribute<DisplayAttribute>();
 
-			return dpAttr.GetGroupName();
+		if (dpAttr?.GroupName is null)
+		{
+			var categoryAttr = provider.GetAttribute<CategoryAttribute>();
+			return categoryAttr is null ? defaultValue ?? provider.GetTypeName() : categoryAttr.Category;
 		}
 
-		/// <summary>
-		/// Retrieves the type name from the member information of the custom attribute provider.
-		/// </summary>
-		/// <param name="provider">The custom attribute provider.</param>
-		/// <returns>The name of the type.</returns>
-		private static string GetTypeName(this ICustomAttributeProvider provider)
+		return dpAttr.GetGroupName();
+	}
+
+	/// <summary>
+	/// Retrieves the type name from the member information of the custom attribute provider.
+	/// </summary>
+	/// <param name="provider">The custom attribute provider.</param>
+	/// <returns>The name of the type.</returns>
+	private static string GetTypeName(this ICustomAttributeProvider provider)
+	{
+		return ((MemberInfo)provider).Name;
+	}
+
+	/// <summary>
+	/// Retrieves the display name of the given object.
+	/// If the object is an Enum, its field display name is returned; otherwise, it uses custom attribute providers or type name.
+	/// </summary>
+	/// <param name="value">The object for which to get the display name.</param>
+	/// <returns>The display name.</returns>
+	public static string GetDisplayName(this object value)
+	{
+		if (value is null)
+			throw new ArgumentNullException(nameof(value));
+
+		if (value is not Enum)
 		{
-			return ((MemberInfo)provider).Name;
+			if (value is ICustomAttributeProvider provider)
+				return provider.GetDisplayName();
+
+			return value.GetType().GetDisplayName(value.ToString());
 		}
 
-		/// <summary>
-		/// Retrieves the display name of the given object.
-		/// If the object is an Enum, its field display name is returned; otherwise, it uses custom attribute providers or type name.
-		/// </summary>
-		/// <param name="value">The object for which to get the display name.</param>
-		/// <returns>The display name.</returns>
-		public static string GetDisplayName(this object value)
-		{
-			if (value is null)
-				throw new ArgumentNullException(nameof(value));
+		return value.GetFieldDisplayName();
+	}
 
-			if (value is not Enum)
-			{
-				if (value is ICustomAttributeProvider provider)
-					return provider.GetDisplayName();
+	/// <summary>
+	/// Internal helper method to get a value from an enum field using the provided functions.
+	/// </summary>
+	private static TValue Get<TValue>(object field, Func<FieldInfo, TValue> func, Func<object, TValue> getDefault, Func<TValue, TValue, TValue> aggregate, bool canSplit = true)
+	{
+		if (field is null)			throw new ArgumentNullException(nameof(field));
+		if (func is null)			throw new ArgumentNullException(nameof(func));
+		if (getDefault is null)		throw new ArgumentNullException(nameof(getDefault));
+		if (aggregate is null)		throw new ArgumentNullException(nameof(aggregate));
 
-				return value.GetType().GetDisplayName(value.ToString());
-			}
+		if (field is not Enum)
+			throw new ArgumentException($"{field}", nameof(field));
 
-			return value.GetFieldDisplayName();
-		}
+		var type = field.GetType();
 
-		/// <summary>
-		/// Internal helper method to get a value from an enum field using the provided functions.
-		/// </summary>
-		private static TValue Get<TValue>(object field, Func<FieldInfo, TValue> func, Func<object, TValue> getDefault, Func<TValue, TValue, TValue> aggregate, bool canSplit = true)
+		if (canSplit && type.IsFlags())
 		{
-			if (field is null)			throw new ArgumentNullException(nameof(field));
-			if (func is null)			throw new ArgumentNullException(nameof(func));
-			if (getDefault is null)		throw new ArgumentNullException(nameof(getDefault));
-			if (aggregate is null)		throw new ArgumentNullException(nameof(aggregate));
+			var parts = field.SplitMask2().Where(f => f.To<long>() != default).ToArray();
 
-			if (field is not Enum)
-				throw new ArgumentException($"{field}", nameof(field));
+			if (parts.Length > 1)
+				return parts.Select(p => Get(p, func, getDefault, (_, _) => throw new NotSupportedException(), false)).Aggregate(aggregate);
+		}
 
-			var type = field.GetType();
+		var fi = type.GetField(field.ToString());
 
-			if (canSplit && type.IsFlags())
-			{
-				var parts = field.SplitMask2().Where(f => f.To<long>() != default).ToArray();
+		// Bit mask value or external constant handling.
+		if (fi is null)
+			return getDefault(field);
 
-				if (parts.Length > 1)
-					return parts.Select(p => Get(p, func, getDefault, (_, _) => throw new NotSupportedException(), false)).Aggregate(aggregate);
-			}
-
-			var fi = type.GetField(field.ToString());
+		return func(fi);
+	}
 
-			// Bit mask value or external constant handling.
-			if (fi is null)
-				return getDefault(field);
+	/// <summary>
+	/// Retrieves the display name for an enum field using its custom attributes.
+	/// </summary>
+	/// <param name="field">The enum field.</param>
+	/// <returns>The display name associated with the field.</returns>
+	public static string GetFieldDisplayName(this object field)
+		=> Get(field, fi => fi.GetDisplayName(), f => f.ToString(), (s1, s2) => s1.IsEmpty() ? s2 : (s2.IsEmpty() ? s1 : $"{s1}, {s2}"));
 
-			return func(fi);
-		}
+	/// <summary>
+	/// Retrieves the description for an enum field using the DisplayAttribute or DescriptionAttribute.
+	/// </summary>
+	/// <param name="field">The enum field.</param>
+	/// <returns>The field's description or an empty string if none is provided.</returns>
+	public static string GetFieldDescription(this object field)
+		=> Get(field, fi => fi.GetAttribute<DisplayAttribute>()?.GetDescription(), f => null, (s1, s2) => s1.IsEmpty() ? s2 : (s2.IsEmpty() ? s1 : $"{s1}, {s2}")) ?? string.Empty;
 
-		/// <summary>
-		/// Retrieves the display name for an enum field using its custom attributes.
-		/// </summary>
-		/// <param name="field">The enum field.</param>
-		/// <returns>The display name associated with the field.</returns>
-		public static string GetFieldDisplayName(this object field)
-			=> Get(field, fi => fi.GetDisplayName(), f => f.ToString(), (s1, s2) => s1.IsEmpty() ? s2 : (s2.IsEmpty() ? s1 : $"{s1}, {s2}"));
-
-		/// <summary>
-		/// Retrieves the description for an enum field using the DisplayAttribute or DescriptionAttribute.
-		/// </summary>
-		/// <param name="field">The enum field.</param>
-		/// <returns>The field's description or an empty string if none is provided.</returns>
-		public static string GetFieldDescription(this object field)
-			=> Get(field, fi => fi.GetAttribute<DisplayAttribute>()?.GetDescription(), f => null, (s1, s2) => s1.IsEmpty() ? s2 : (s2.IsEmpty() ? s1 : $"{s1}, {s2}")) ?? string.Empty;
-
-		/// <summary>
-		/// Retrieves the icon URI for an enum field based on its IconAttribute.
-		/// </summary>
-		/// <param name="field">The enum field.</param>
-		/// <returns>The icon URI if available; otherwise, null.</returns>
-		public static Uri GetFieldIcon(this object field)
-			=> Get(field, fi =>
-			{
-				var attr = fi.GetAttribute<IconAttribute>();
-
-				return
-					attr is null ? null :
-					attr.IsFullPath ? new Uri(attr.Icon, UriKind.Relative) : attr.Icon.GetResourceUrl(fi.ReflectedType);
-			}, f => null, (s1, s2) => s1);
-
-		/// <summary>
-		/// Retrieves the documentation URL for a type based on its DocAttribute.
-		/// </summary>
-		/// <param name="type">The type to retrieve the doc URL for.</param>
-		/// <returns>The documentation URL if available; otherwise, null.</returns>
-		public static string GetDocUrl(this Type type)
-			=> type.GetAttribute<DocAttribute>()?.DocUrl;
-
-		/// <summary>
-		/// Retrieves the icon URL for a type based on its IconAttribute.
-		/// </summary>
-		/// <param name="type">The type to retrieve the icon URL for.</param>
-		/// <returns>The icon URI if available; otherwise, null.</returns>
-		public static Uri GetIconUrl(this Type type)
+	/// <summary>
+	/// Retrieves the icon URI for an enum field based on its IconAttribute.
+	/// </summary>
+	/// <param name="field">The enum field.</param>
+	/// <returns>The icon URI if available; otherwise, null.</returns>
+	public static Uri GetFieldIcon(this object field)
+		=> Get(field, fi =>
 		{
-			var attr = type.GetAttribute<IconAttribute>();
-			return attr is null ? null : (attr.IsFullPath ? new Uri(attr.Icon, UriKind.Relative) : attr.Icon.GetResourceUrl(type));
-		}
+			var attr = fi.GetAttribute<IconAttribute>();
 
-		/// <summary>
-		/// Retrieves the resource URL for the given resource name using the entry assembly.
-		/// </summary>
-		/// <param name="resName">The resource name.</param>
-		/// <returns>The resource URI.</returns>
-		public static Uri GetResourceUrl(this string resName)
-		{
-			return Assembly.GetEntryAssembly().GetResourceUrl(resName);
-		}
+			return
+				attr is null ? null :
+				attr.IsFullPath ? new Uri(attr.Icon, UriKind.Relative) : attr.Icon.GetResourceUrl(fi.ReflectedType);
+		}, f => null, (s1, s2) => s1);
 
-		/// <summary>
-		/// Retrieves the resource URL for the given resource name using the specified type's assembly.
-		/// </summary>
-		/// <param name="resName">The resource name.</param>
-		/// <param name="type">The type whose assembly is used to obtain the resource.</param>
-		/// <returns>The resource URI.</returns>
-		public static Uri GetResourceUrl(this string resName, Type type)
-		{
-			if (type is null)
-				throw new ArgumentNullException(nameof(type));
+	/// <summary>
+	/// Retrieves the documentation URL for a type based on its DocAttribute.
+	/// </summary>
+	/// <param name="type">The type to retrieve the doc URL for.</param>
+	/// <returns>The documentation URL if available; otherwise, null.</returns>
+	public static string GetDocUrl(this Type type)
+		=> type.GetAttribute<DocAttribute>()?.DocUrl;
 
-			return type.Assembly.GetResourceUrl(resName);
-		}
+	/// <summary>
+	/// Retrieves the icon URL for a type based on its IconAttribute.
+	/// </summary>
+	/// <param name="type">The type to retrieve the icon URL for.</param>
+	/// <returns>The icon URI if available; otherwise, null.</returns>
+	public static Uri GetIconUrl(this Type type)
+	{
+		var attr = type.GetAttribute<IconAttribute>();
+		return attr is null ? null : (attr.IsFullPath ? new Uri(attr.Icon, UriKind.Relative) : attr.Icon.GetResourceUrl(type));
+	}
 
-		/// <summary>
-		/// Internal helper to build a resource URL for a given assembly and resource name.
-		/// </summary>
-		/// <param name="assembly">The assembly containing the resource.</param>
-		/// <param name="resName">The name of the resource.</param>
-		/// <returns>The constructed resource URI.</returns>
-		private static Uri GetResourceUrl(this Assembly assembly, string resName)
-		{
-			if (assembly is null)
-				throw new ArgumentNullException(nameof(assembly));
+	/// <summary>
+	/// Retrieves the resource URL for the given resource name using the entry assembly.
+	/// </summary>
+	/// <param name="resName">The resource name.</param>
+	/// <returns>The resource URI.</returns>
+	public static Uri GetResourceUrl(this string resName)
+	{
+		return Assembly.GetEntryAssembly().GetResourceUrl(resName);
+	}
 
-			if (resName.IsEmpty())
-				throw new ArgumentNullException(nameof(resName));
+	/// <summary>
+	/// Retrieves the resource URL for the given resource name using the specified type's assembly.
+	/// </summary>
+	/// <param name="resName">The resource name.</param>
+	/// <param name="type">The type whose assembly is used to obtain the resource.</param>
+	/// <returns>The resource URI.</returns>
+	public static Uri GetResourceUrl(this string resName, Type type)
+	{
+		if (type is null)
+			throw new ArgumentNullException(nameof(type));
 
-			var name = assembly.FullName;
-			return new Uri($"/{name.Substring(0, name.IndexOf(','))};component/" + resName, UriKind.Relative);
-		}
+		return type.Assembly.GetResourceUrl(resName);
+	}
 
-		/// <summary>
-		/// Retrieves the items source items from an ItemsSourceAttribute instance.
-		/// </summary>
-		/// <param name="attr">The items source attribute.</param>
-		/// <returns>An enumerable of IItemsSourceItem.</returns>
-		public static IEnumerable<IItemsSourceItem> GetValues(this ItemsSourceAttribute attr)
-		{
-			if (attr is null)
-				throw new ArgumentNullException(nameof(attr));
+	/// <summary>
+	/// Internal helper to build a resource URL for a given assembly and resource name.
+	/// </summary>
+	/// <param name="assembly">The assembly containing the resource.</param>
+	/// <param name="resName">The name of the resource.</param>
+	/// <returns>The constructed resource URI.</returns>
+	private static Uri GetResourceUrl(this Assembly assembly, string resName)
+	{
+		if (assembly is null)
+			throw new ArgumentNullException(nameof(assembly));
 
-			return attr.Type.CreateInstance<IItemsSource>().Values;
-		}
+		if (resName.IsEmpty())
+			throw new ArgumentNullException(nameof(resName));
 
-		/// <summary>
-		/// Determines if the server credentials contain sufficient data for auto login.
-		/// </summary>
-		/// <param name="credentials">The server credentials.</param>
-		/// <returns>True if auto login is possible; otherwise, false.</returns>
-		public static bool CanAutoLogin(this ServerCredentials credentials)
-		{
-			if (credentials is null)
-				throw new ArgumentNullException(nameof(credentials));
+		var name = assembly.FullName;
+		return new Uri($"/{name.Substring(0, name.IndexOf(','))};component/" + resName, UriKind.Relative);
+	}
 
-			return !credentials.Token.IsEmpty() || (!credentials.Email.IsEmptyOrWhiteSpace() && !credentials.Password.IsEmpty());
-		}
+	/// <summary>
+	/// Retrieves the items source items from an ItemsSourceAttribute instance.
+	/// </summary>
+	/// <param name="attr">The items source attribute.</param>
+	/// <returns>An enumerable of IItemsSourceItem.</returns>
+	public static IEnumerable<IItemsSourceItem> GetValues(this ItemsSourceAttribute attr)
+	{
+		if (attr is null)
+			throw new ArgumentNullException(nameof(attr));
 
-		/// <summary>
-		/// Attempts to retrieve the GUID associated with the specified control type using its GuidAttribute.
-		/// </summary>
-		/// <param name="controlType">The control type.</param>
-		/// <returns>The GUID if available; otherwise, null.</returns>
-		public static Guid? TryGetGuid(this Type controlType)
-		{
-			var guidAttr = controlType.GetAttribute<GuidAttribute>();
-			return guidAttr is null ? null : controlType.GUID;
-		}
+		return attr.Type.CreateInstance<IItemsSource>().Values;
+	}
+
+	/// <summary>
+	/// Determines if the server credentials contain sufficient data for auto login.
+	/// </summary>
+	/// <param name="credentials">The server credentials.</param>
+	/// <returns>True if auto login is possible; otherwise, false.</returns>
+	public static bool CanAutoLogin(this ServerCredentials credentials)
+	{
+		if (credentials is null)
+			throw new ArgumentNullException(nameof(credentials));
+
+		return !credentials.Token.IsEmpty() || (!credentials.Email.IsEmptyOrWhiteSpace() && !credentials.Password.IsEmpty());
+	}
+
+	/// <summary>
+	/// Attempts to retrieve the GUID associated with the specified control type using its GuidAttribute.
+	/// </summary>
+	/// <param name="controlType">The control type.</param>
+	/// <returns>The GUID if available; otherwise, null.</returns>
+	public static Guid? TryGetGuid(this Type controlType)
+	{
+		var guidAttr = controlType.GetAttribute<GuidAttribute>();
+		return guidAttr is null ? null : controlType.GUID;
+	}
+
+	/// <summary>
+	/// Converts the Guid to its 32-digit hexadecimal ("N") format.
+	/// </summary>
+	/// <param name="id">The Guid value.</param>
+	/// <returns>The "N" formatted string.</returns>
+	public static string ToN(this Guid id)
+		=> id.ToString("N");
 
-		/// <summary>
-		/// Converts the Guid to its 32-digit hexadecimal ("N") format.
-		/// </summary>
-		/// <param name="id">The Guid value.</param>
-		/// <returns>The "N" formatted string.</returns>
-		public static string ToN(this Guid id)
-			=> id.ToString("N");
-
-		/// <summary>
-		/// Casts a PropertyDescriptorCollection to an enumerable of PropertyDescriptor.
-		/// </summary>
-		/// <param name="col">The collection of property descriptors.</param>
-		/// <returns>An enumerable of PropertyDescriptor.</returns>
-		public static IEnumerable<PropertyDescriptor> Typed(this PropertyDescriptorCollection col)
-			=> col.Cast<PropertyDescriptor>();
-
-		/// <summary>
-		/// Retrieves basic properties (marked with BasicSettingAttribute) for the given instance, optionally retrieving nested properties recursively.
-		/// </summary>
-		/// <param name="instance">The object instance.</param>
-		/// <param name="maxDepth">The maximum recursion depth.</param>
-		/// <returns>An enumerable of tuples containing the property descriptor and its path.</returns>
-		public static IEnumerable<(PropertyDescriptor prop, string path)> GetBasicProperties(this object instance, int maxDepth = 0)
+	/// <summary>
+	/// Casts a PropertyDescriptorCollection to an enumerable of PropertyDescriptor.
+	/// </summary>
+	/// <param name="col">The collection of property descriptors.</param>
+	/// <returns>An enumerable of PropertyDescriptor.</returns>
+	public static IEnumerable<PropertyDescriptor> Typed(this PropertyDescriptorCollection col)
+		=> col.Cast<PropertyDescriptor>();
+
+	/// <summary>
+	/// Retrieves basic properties (marked with BasicSettingAttribute) for the given instance, optionally retrieving nested properties recursively.
+	/// </summary>
+	/// <param name="instance">The object instance.</param>
+	/// <param name="maxDepth">The maximum recursion depth.</param>
+	/// <returns>An enumerable of tuples containing the property descriptor and its path.</returns>
+	public static IEnumerable<(PropertyDescriptor prop, string path)> GetBasicProperties(this object instance, int maxDepth = 0)
+	{
+		static IEnumerable<(PropertyDescriptor, string)> getRecursive(object instance, int maxDepth, string prefix)
 		{
-			static IEnumerable<(PropertyDescriptor, string)> getRecursive(object instance, int maxDepth, string prefix)
-			{
-				if (instance is null)
-					throw new ArgumentNullException(nameof(instance));
+			if (instance is null)
+				throw new ArgumentNullException(nameof(instance));
 
-				if (maxDepth < 0)
-					throw new ArgumentOutOfRangeException(nameof(maxDepth), maxDepth, "Invalid value.".Localize());
+			if (maxDepth < 0)
+				throw new ArgumentOutOfRangeException(nameof(maxDepth), maxDepth, "Invalid value.".Localize());
 
-				var properties = TypeDescriptor.GetProperties(instance, [new BasicSettingAttribute()]).Typed();
+			var properties = TypeDescriptor.GetProperties(instance, [new BasicSettingAttribute()]).Typed();
 
-				foreach (var property in properties)
-				{
-					var fullPath = $"{prefix}{property.Name}";
+			foreach (var property in properties)
+			{
+				var fullPath = $"{prefix}{property.Name}";
 
-					var hasNested = false;
+				var hasNested = false;
 
-					if (maxDepth > 0 &&
-						!property.PropertyType.IsSerializablePrimitive() &&
-						property.GetValue(instance) is object nestedInstance)
+				if (maxDepth > 0 &&
+					!property.PropertyType.IsSerializablePrimitive() &&
+					property.GetValue(instance) is object nestedInstance)
+				{
+					foreach (var nestedProperty in getRecursive(nestedInstance, maxDepth - 1, $"{fullPath}."))
 					{
-						foreach (var nestedProperty in getRecursive(nestedInstance, maxDepth - 1, $"{fullPath}."))
-						{
-							hasNested = true;
-							yield return nestedProperty;
-						}
+						hasNested = true;
+						yield return nestedProperty;
 					}
-
-					if (!hasNested)
-						yield return (property, fullPath);
 				}
-			}
 
-			return getRecursive(instance, maxDepth, string.Empty);
+				if (!hasNested)
+					yield return (property, fullPath);
+			}
 		}
 
-		/// <summary>
-		/// Retrieves the filtered property descriptors from a custom type descriptor based on the provided attributes.
-		/// </summary>
-		/// <param name="descriptor">The custom type descriptor.</param>
-		/// <param name="attributes">The attributes to filter properties.</param>
-		/// <returns>A filtered PropertyDescriptorCollection.</returns>
-		public static PropertyDescriptorCollection GetFilteredProperties(this ICustomTypeDescriptor descriptor, Attribute[] attributes)
-		{
-			var allProperties = descriptor.GetProperties();
+		return getRecursive(instance, maxDepth, string.Empty);
+	}
 
-			if (attributes == null || attributes.Length == 0)
-				return allProperties;
+	/// <summary>
+	/// Retrieves the filtered property descriptors from a custom type descriptor based on the provided attributes.
+	/// </summary>
+	/// <param name="descriptor">The custom type descriptor.</param>
+	/// <param name="attributes">The attributes to filter properties.</param>
+	/// <returns>A filtered PropertyDescriptorCollection.</returns>
+	public static PropertyDescriptorCollection GetFilteredProperties(this ICustomTypeDescriptor descriptor, Attribute[] attributes)
+	{
+		var allProperties = descriptor.GetProperties();
+
+		if (attributes == null || attributes.Length == 0)
+			return allProperties;
 
-			return new([.. allProperties.Typed().Where(p => attributes.All(attr =>
+		return new([.. allProperties.Typed().Where(p => attributes.All(attr =>
+		{
+			var propAttr = p.Attributes[attr.GetType()];
+
+			if (propAttr is null)
 			{
-				var propAttr = p.Attributes[attr.GetType()];
+				if (attr.GetType().GetField("Default", BindingFlags.Static | BindingFlags.Public)?.GetValue(null) is not Attribute defaultAttr)
+					return false;
 
-				if (propAttr is null)
-				{
-					if (attr.GetType().GetField("Default", BindingFlags.Static | BindingFlags.Public)?.GetValue(null) is not Attribute defaultAttr)
-						return false;
+				propAttr = defaultAttr;
+			}
 
-					propAttr = defaultAttr;
-				}
+			return attr.Match(propAttr);
+		}))]);
+	}
 
-				return attr.Match(propAttr);
-			}))]);
-		}
+	/// <summary>
+	/// Attempts to retrieve the default property descriptor from a collection based on the DefaultPropertyAttribute.
+	/// </summary>
+	/// <param name="properties">The property descriptor collection.</param>
+	/// <param name="type">The type to check for default property.</param>
+	/// <returns>The default PropertyDescriptor if found; otherwise, null.</returns>
+	public static PropertyDescriptor TryGetDefault(this PropertyDescriptorCollection properties, Type type)
+	{
+		var attr = type.GetAttribute<DefaultPropertyAttribute>();
 
-		/// <summary>
-		/// Attempts to retrieve the default property descriptor from a collection based on the DefaultPropertyAttribute.
-		/// </summary>
-		/// <param name="properties">The property descriptor collection.</param>
-		/// <param name="type">The type to check for default property.</param>
-		/// <returns>The default PropertyDescriptor if found; otherwise, null.</returns>
-		public static PropertyDescriptor TryGetDefault(this PropertyDescriptorCollection properties, Type type)
-		{
-			var attr = type.GetAttribute<DefaultPropertyAttribute>();
+		if (attr != null)
+			return properties.Find(attr.Name, ignoreCase: true);
 
-			if (attr != null)
-				return properties.Find(attr.Name, ignoreCase: true);
+		return null;
+	}
 
-			return null;
-		}
+	/// <summary>
+	/// Attempts to retrieve the default event descriptor from a collection based on the DefaultEventAttribute.
+	/// </summary>
+	/// <param name="events">The event descriptor collection.</param>
+	/// <param name="type">The type to check for default event.</param>
+	/// <returns>The default EventDescriptor if found; otherwise, null.</returns>
+	public static EventDescriptor TryGetDefault(this EventDescriptorCollection events, Type type)
+	{
+		var attr = type.GetAttribute<DefaultEventAttribute>();
 
-		/// <summary>
-		/// Attempts to retrieve the default event descriptor from a collection based on the DefaultEventAttribute.
-		/// </summary>
-		/// <param name="events">The event descriptor collection.</param>
-		/// <param name="type">The type to check for default event.</param>
-		/// <returns>The default EventDescriptor if found; otherwise, null.</returns>
-		public static EventDescriptor TryGetDefault(this EventDescriptorCollection events, Type type)
-		{
-			var attr = type.GetAttribute<DefaultEventAttribute>();
+		if (attr != null)
+			return events.Find(attr.Name, ignoreCase: true);
 
-			if (attr != null)
-				return events.Find(attr.Name, ignoreCase: true);
+		return null;
+	}
 
-			return null;
-		}
+	/// <summary>
+	/// Sets the ExpandableObjectConverter attribute for the entity.
+	/// </summary>
+	/// <typeparam name="TEntity">The type of the attribute entity.</typeparam>
+	/// <param name="entity">The attribute entity.</param>
+	/// <param name="expandable">True to set as expandable; otherwise, false.</param>
+	/// <returns>The updated attribute entity.</returns>
+	public static TEntity SetExpandable<TEntity>(this TEntity entity, bool expandable)
+		where TEntity : IAttributesEntity
+		=> SetAttribute(entity, expandable, () => new TypeConverterAttribute(typeof(ExpandableObjectConverter)));
 
-		/// <summary>
-		/// Sets the ExpandableObjectConverter attribute for the entity.
-		/// </summary>
-		/// <typeparam name="TEntity">The type of the attribute entity.</typeparam>
-		/// <param name="entity">The attribute entity.</param>
-		/// <param name="expandable">True to set as expandable; otherwise, false.</param>
-		/// <returns>The updated attribute entity.</returns>
-		public static TEntity SetExpandable<TEntity>(this TEntity entity, bool expandable)
-			where TEntity : IAttributesEntity
-			=> SetAttribute(entity, expandable, () => new TypeConverterAttribute(typeof(ExpandableObjectConverter)));
-
-		/// <summary>
-		/// Sets a custom editor attribute for the entity.
-		/// </summary>
-		/// <typeparam name="TEntity">The type of the attribute entity.</typeparam>
-		/// <param name="entity">The attribute entity.</param>
-		/// <param name="editor">The editor attribute to set.</param>
-		/// <returns>The updated attribute entity.</returns>
-		public static TEntity SetEditor<TEntity>(this TEntity entity, Attribute editor)
-			where TEntity : IAttributesEntity
-		{
-			if (editor == null)
-				throw new ArgumentNullException(nameof(editor));
+	/// <summary>
+	/// Sets a custom editor attribute for the entity.
+	/// </summary>
+	/// <typeparam name="TEntity">The type of the attribute entity.</typeparam>
+	/// <param name="entity">The attribute entity.</param>
+	/// <param name="editor">The editor attribute to set.</param>
+	/// <returns>The updated attribute entity.</returns>
+	public static TEntity SetEditor<TEntity>(this TEntity entity, Attribute editor)
+		where TEntity : IAttributesEntity
+	{
+		if (editor == null)
+			throw new ArgumentNullException(nameof(editor));
 
-			return SetAttribute(entity, true, () => editor);
-		}
+		return SetAttribute(entity, true, () => editor);
+	}
 
-		/// <summary>
-		/// Sets the DisplayAttribute for the entity with specified group, display name, description, and order.
-		/// </summary>
-		/// <typeparam name="TEntity">The type of the attribute entity.</typeparam>
-		/// <param name="entity">The attribute entity.</param>
-		/// <param name="groupName">The group/category name.</param>
-		/// <param name="displayName">The display name.</param>
-		/// <param name="description">The description text.</param>
-		/// <param name="order">The display order.</param>
-		/// <returns>The updated attribute entity.</returns>
-		public static TEntity SetDisplay<TEntity>(this TEntity entity, string groupName, string displayName, string description, int order)
-			where TEntity : IAttributesEntity
-			=> SetAttribute(entity, true, () => new DisplayAttribute
-			{
-				Name = displayName,
-				Description = description,
-				GroupName = groupName,
-				Order = order,
-			});
-
-		/// <summary>
-		/// Sets the ReadOnlyAttribute for the entity.
-		/// </summary>
-		/// <typeparam name="TEntity">The type of the attribute entity.</typeparam>
-		/// <param name="entity">The attribute entity.</param>
-		/// <param name="readOnly">True to mark as read-only; otherwise, false.</param>
-		/// <returns>The updated attribute entity.</returns>
-		public static TEntity SetReadOnly<TEntity>(this TEntity entity, bool readOnly = true)
-			where TEntity : IAttributesEntity
-			=> SetAttribute(entity, readOnly, () => new ReadOnlyAttribute(true));
-
-		/// <summary>
-		/// Sets the BasicSettingAttribute for the entity.
-		/// </summary>
-		/// <typeparam name="TEntity">The type of the attribute entity.</typeparam>
-		/// <param name="entity">The attribute entity.</param>
-		/// <param name="isBasic">True to mark as basic; otherwise, false.</param>
-		/// <returns>The updated attribute entity.</returns>
-		public static TEntity SetBasic<TEntity>(this TEntity entity, bool isBasic = true)
-			where TEntity : IAttributesEntity
-			=> SetAttribute(entity, isBasic, () => new BasicSettingAttribute());
-
-		/// <summary>
-		/// Sets the BrowsableAttribute (non-browsable) for the entity.
-		/// </summary>
-		/// <typeparam name="TEntity">The type of the attribute entity.</typeparam>
-		/// <param name="entity">The attribute entity.</param>
-		/// <param name="nonBrowsable">True to mark as non-browsable; otherwise, false.</param>
-		/// <returns>The updated attribute entity.</returns>
-		public static TEntity SetNonBrowsable<TEntity>(this TEntity entity, bool nonBrowsable = true)
-			where TEntity : IAttributesEntity
-			=> SetAttribute(entity, nonBrowsable, () => new BrowsableAttribute(false));
-
-		/// <summary>
-		/// Sets or removes an attribute of type TAttribute for the entity based on the provided value.
-		/// </summary>
-		/// <typeparam name="TEntity">The type of the attribute entity.</typeparam>
-		/// <typeparam name="TAttribute">The type of attribute to set.</typeparam>
-		/// <param name="entity">The attribute entity.</param>
-		/// <param name="value">True to add the attribute; false to remove it.</param>
-		/// <param name="create">A function to create the attribute instance.</param>
-		/// <returns>The updated attribute entity.</returns>
-		public static TEntity SetAttribute<TEntity, TAttribute>(this TEntity entity, bool value, Func<TAttribute> create)
-			where TEntity : IAttributesEntity
-			where TAttribute : Attribute
+	/// <summary>
+	/// Sets the DisplayAttribute for the entity with specified group, display name, description, and order.
+	/// </summary>
+	/// <typeparam name="TEntity">The type of the attribute entity.</typeparam>
+	/// <param name="entity">The attribute entity.</param>
+	/// <param name="groupName">The group/category name.</param>
+	/// <param name="displayName">The display name.</param>
+	/// <param name="description">The description text.</param>
+	/// <param name="order">The display order.</param>
+	/// <returns>The updated attribute entity.</returns>
+	public static TEntity SetDisplay<TEntity>(this TEntity entity, string groupName, string displayName, string description, int order)
+		where TEntity : IAttributesEntity
+		=> SetAttribute(entity, true, () => new DisplayAttribute
 		{
-			if (create is null)
-				throw new ArgumentNullException(nameof(create));
+			Name = displayName,
+			Description = description,
+			GroupName = groupName,
+			Order = order,
+		});
 
-			var attrs = entity.Attributes;
+	/// <summary>
+	/// Sets the ReadOnlyAttribute for the entity.
+	/// </summary>
+	/// <typeparam name="TEntity">The type of the attribute entity.</typeparam>
+	/// <param name="entity">The attribute entity.</param>
+	/// <param name="readOnly">True to mark as read-only; otherwise, false.</param>
+	/// <returns>The updated attribute entity.</returns>
+	public static TEntity SetReadOnly<TEntity>(this TEntity entity, bool readOnly = true)
+		where TEntity : IAttributesEntity
+		=> SetAttribute(entity, readOnly, () => new ReadOnlyAttribute(true));
 
-			if (typeof(TAttribute) == typeof(Attribute))
-			{
-				var attr = create();
-				var type = attr.GetType();
-				attrs.RemoveWhere(a => a.GetType().Is(type));
+	/// <summary>
+	/// Sets the BasicSettingAttribute for the entity.
+	/// </summary>
+	/// <typeparam name="TEntity">The type of the attribute entity.</typeparam>
+	/// <param name="entity">The attribute entity.</param>
+	/// <param name="isBasic">True to mark as basic; otherwise, false.</param>
+	/// <returns>The updated attribute entity.</returns>
+	public static TEntity SetBasic<TEntity>(this TEntity entity, bool isBasic = true)
+		where TEntity : IAttributesEntity
+		=> SetAttribute(entity, isBasic, () => new BasicSettingAttribute());
 
-				if (value)
-					attrs.Add(attr);
-			}
-			else
-			{
-				attrs.RemoveWhere(a => a is TAttribute);
+	/// <summary>
+	/// Sets the BrowsableAttribute (non-browsable) for the entity.
+	/// </summary>
+	/// <typeparam name="TEntity">The type of the attribute entity.</typeparam>
+	/// <param name="entity">The attribute entity.</param>
+	/// <param name="nonBrowsable">True to mark as non-browsable; otherwise, false.</param>
+	/// <returns>The updated attribute entity.</returns>
+	public static TEntity SetNonBrowsable<TEntity>(this TEntity entity, bool nonBrowsable = true)
+		where TEntity : IAttributesEntity
+		=> SetAttribute(entity, nonBrowsable, () => new BrowsableAttribute(false));
 
-				if (value)
-					attrs.Add(create());
-			}
+	/// <summary>
+	/// Sets or removes an attribute of type TAttribute for the entity based on the provided value.
+	/// </summary>
+	/// <typeparam name="TEntity">The type of the attribute entity.</typeparam>
+	/// <typeparam name="TAttribute">The type of attribute to set.</typeparam>
+	/// <param name="entity">The attribute entity.</param>
+	/// <param name="value">True to add the attribute; false to remove it.</param>
+	/// <param name="create">A function to create the attribute instance.</param>
+	/// <returns>The updated attribute entity.</returns>
+	public static TEntity SetAttribute<TEntity, TAttribute>(this TEntity entity, bool value, Func<TAttribute> create)
+		where TEntity : IAttributesEntity
+		where TAttribute : Attribute
+	{
+		if (create is null)
+			throw new ArgumentNullException(nameof(create));
 
-			return entity;
-		}
+		var attrs = entity.Attributes;
 
-		/// <summary>
-		/// Checks if the entity has a BasicSettingAttribute.
-		/// </summary>
-		/// <typeparam name="TEntity">The type of the attribute entity.</typeparam>
-		/// <param name="entity">The attribute entity.</param>
-		/// <returns>True if the entity is marked as basic; otherwise, false.</returns>
-		public static bool IsBasic<TEntity>(this TEntity entity)
-			where TEntity : IAttributesEntity
-			=> IsAny(entity, (BasicSettingAttribute a) => true);
-
-		/// <summary>
-		/// Checks if the entity is marked as read-only via a ReadOnlyAttribute.
-		/// </summary>
-		/// <typeparam name="TEntity">The type of the attribute entity.</typeparam>
-		/// <param name="entity">The attribute entity.</param>
-		/// <returns>True if the entity is read-only; otherwise, false.</returns>
-		public static bool IsReadOnly<TEntity>(this TEntity entity)
-			where TEntity : IAttributesEntity
-			=> IsAny(entity, (ReadOnlyAttribute a) => a.IsReadOnly);
-
-		/// <summary>
-		/// Checks if all BrowsableAttributes on the entity indicate it is browsable.
-		/// </summary>
-		/// <typeparam name="TEntity">The type of the attribute entity.</typeparam>
-		/// <param name="entity">The attribute entity.</param>
-		/// <returns>True if the entity is browsable; otherwise, false.</returns>
-		public static bool IsBrowsable<TEntity>(this TEntity entity)
-			where TEntity : IAttributesEntity
-			=> IsAll(entity, (BrowsableAttribute a) => a.Browsable);
-
-		/// <summary>
-		/// Retrieves the display name for the entity from its DisplayAttribute.
-		/// </summary>
-		/// <typeparam name="TEntity">The type of the attribute entity.</typeparam>
-		/// <param name="entity">The attribute entity.</param>
-		/// <returns>The display name if set; otherwise, null.</returns>
-		public static string GetDisplayName<TEntity>(this TEntity entity)
-			where TEntity : IAttributesEntity
-			=> entity.GetDisplay()?.Name;
-
-		/// <summary>
-		/// Retrieves the description for the entity from its DisplayAttribute.
-		/// </summary>
-		/// <typeparam name="TEntity">The type of the attribute entity.</typeparam>
-		/// <param name="entity">The attribute entity.</param>
-		/// <returns>The description if set; otherwise, null.</returns>
-		public static string GetDescription<TEntity>(this TEntity entity)
-			where TEntity : IAttributesEntity
-			=> entity.GetDisplay()?.Description;
-
-		/// <summary>
-		/// Retrieves the group name for the entity from its DisplayAttribute.
-		/// </summary>
-		/// <typeparam name="TEntity">The type of the attribute entity.</typeparam>
-		/// <param name="entity">The attribute entity.</param>
-		/// <returns>The group name if set; otherwise, null.</returns>
-		public static string GetGroupName<TEntity>(this TEntity entity)
-			where TEntity : IAttributesEntity
-			=> entity.GetDisplay()?.GroupName;
-
-		/// <summary>
-		/// Retrieves the DisplayAttribute from the entity.
-		/// </summary>
-		/// <typeparam name="TEntity">The type of the attribute entity.</typeparam>
-		/// <param name="entity">The attribute entity.</param>
-		/// <returns>The DisplayAttribute if exists; otherwise, null.</returns>
-		public static DisplayAttribute GetDisplay<TEntity>(this TEntity entity)
-			where TEntity : IAttributesEntity
-			=> entity.Attributes.OfType<DisplayAttribute>().FirstOrDefault();
-
-		/// <summary>
-		/// Helper method to determine if any attribute of type TAttribute on the entity satisfies the condition.
-		/// </summary>
-		private static bool IsAny<TEntity, TAttribute>(this TEntity entity, Func<TAttribute, bool> condition)
-			where TEntity : IAttributesEntity
-			=> Attrs<TEntity, TAttribute>(entity).Any(condition);
-
-		/// <summary>
-		/// Helper method to determine if all attributes of type TAttribute on the entity satisfy the condition.
-		/// </summary>
-		private static bool IsAll<TEntity, TAttribute>(this TEntity entity, Func<TAttribute, bool> condition)
-			where TEntity : IAttributesEntity
-			=> Attrs<TEntity, TAttribute>(entity).All(condition);
-
-		/// <summary>
-		/// Retrieves all attributes of the specified type TAttribute from the entity.
-		/// </summary>
-		private static IEnumerable<TAttribute> Attrs<TEntity, TAttribute>(this TEntity entity)
-			where TEntity : IAttributesEntity
-			=> entity.Attributes.OfType<TAttribute>();
-
-		/// <summary>
-		/// Sets a RequiredAttribute as a validator for the entity.
-		/// </summary>
-		/// <typeparam name="TEntity">The type of the attribute entity.</typeparam>
-		/// <param name="entity">The attribute entity.</param>
-		/// <returns>The updated attribute entity.</returns>
-		public static TEntity SetRequired<TEntity>(this TEntity entity)
-			where TEntity : IAttributesEntity
-			=> entity.SetValidator(new RequiredAttribute());
-
-		/// <summary>
-		/// Adds a custom validation attribute as a validator for the entity.
-		/// </summary>
-		/// <typeparam name="TEntity">The type of the attribute entity.</typeparam>
-		/// <param name="entity">The attribute entity.</param>
-		/// <param name="validator">The validation attribute to add.</param>
-		/// <returns>The updated attribute entity.</returns>
-		public static TEntity SetValidator<TEntity>(this TEntity entity, ValidationAttribute validator)
-			where TEntity : IAttributesEntity
+		if (typeof(TAttribute) == typeof(Attribute))
 		{
-			entity.Attributes.Add(validator);
-			return entity;
-		}
+			var attr = create();
+			var type = attr.GetType();
+			attrs.RemoveWhere(a => a.GetType().Is(type));
 
-		/// <summary>
-		/// Validates the given value against all ValidationAttribute validators on the entity.
-		/// </summary>
-		/// <typeparam name="TEntity">The type of the attribute entity.</typeparam>
-		/// <param name="entity">The attribute entity.</param>
-		/// <param name="value">The value to validate.</param>
-		/// <returns>True if all validators deem the value valid; otherwise, false.</returns>
-		public static bool IsValid<TEntity>(this TEntity entity, object value)
-			where TEntity : IAttributesEntity
-			=> entity.Attrs<TEntity, ValidationAttribute>().All(v => v.IsValid(value));
-
-		/// <summary>
-		/// Determines whether the debugger is currently waiting for input or output.
-		/// </summary>
-		/// <param name="debugger">The debugger instance.</param>
-		/// <returns>True if the debugger is waiting; otherwise, false.</returns>
-		public static bool IsWaiting(this IDebugger debugger)
+			if (value)
+				attrs.Add(attr);
+		}
+		else
 		{
-			if (debugger is null)
-				throw new ArgumentNullException(nameof(debugger));
+			attrs.RemoveWhere(a => a is TAttribute);
 
-			return debugger.IsWaitingOnInput || debugger.IsWaitingOnOutput;
+			if (value)
+				attrs.Add(create());
 		}
+
+		return entity;
+	}
+
+	/// <summary>
+	/// Checks if the entity has a BasicSettingAttribute.
+	/// </summary>
+	/// <typeparam name="TEntity">The type of the attribute entity.</typeparam>
+	/// <param name="entity">The attribute entity.</param>
+	/// <returns>True if the entity is marked as basic; otherwise, false.</returns>
+	public static bool IsBasic<TEntity>(this TEntity entity)
+		where TEntity : IAttributesEntity
+		=> IsAny(entity, (BasicSettingAttribute a) => true);
+
+	/// <summary>
+	/// Checks if the entity is marked as read-only via a ReadOnlyAttribute.
+	/// </summary>
+	/// <typeparam name="TEntity">The type of the attribute entity.</typeparam>
+	/// <param name="entity">The attribute entity.</param>
+	/// <returns>True if the entity is read-only; otherwise, false.</returns>
+	public static bool IsReadOnly<TEntity>(this TEntity entity)
+		where TEntity : IAttributesEntity
+		=> IsAny(entity, (ReadOnlyAttribute a) => a.IsReadOnly);
+
+	/// <summary>
+	/// Checks if all BrowsableAttributes on the entity indicate it is browsable.
+	/// </summary>
+	/// <typeparam name="TEntity">The type of the attribute entity.</typeparam>
+	/// <param name="entity">The attribute entity.</param>
+	/// <returns>True if the entity is browsable; otherwise, false.</returns>
+	public static bool IsBrowsable<TEntity>(this TEntity entity)
+		where TEntity : IAttributesEntity
+		=> IsAll(entity, (BrowsableAttribute a) => a.Browsable);
+
+	/// <summary>
+	/// Retrieves the display name for the entity from its DisplayAttribute.
+	/// </summary>
+	/// <typeparam name="TEntity">The type of the attribute entity.</typeparam>
+	/// <param name="entity">The attribute entity.</param>
+	/// <returns>The display name if set; otherwise, null.</returns>
+	public static string GetDisplayName<TEntity>(this TEntity entity)
+		where TEntity : IAttributesEntity
+		=> entity.GetDisplay()?.Name;
+
+	/// <summary>
+	/// Retrieves the description for the entity from its DisplayAttribute.
+	/// </summary>
+	/// <typeparam name="TEntity">The type of the attribute entity.</typeparam>
+	/// <param name="entity">The attribute entity.</param>
+	/// <returns>The description if set; otherwise, null.</returns>
+	public static string GetDescription<TEntity>(this TEntity entity)
+		where TEntity : IAttributesEntity
+		=> entity.GetDisplay()?.Description;
+
+	/// <summary>
+	/// Retrieves the group name for the entity from its DisplayAttribute.
+	/// </summary>
+	/// <typeparam name="TEntity">The type of the attribute entity.</typeparam>
+	/// <param name="entity">The attribute entity.</param>
+	/// <returns>The group name if set; otherwise, null.</returns>
+	public static string GetGroupName<TEntity>(this TEntity entity)
+		where TEntity : IAttributesEntity
+		=> entity.GetDisplay()?.GroupName;
+
+	/// <summary>
+	/// Retrieves the DisplayAttribute from the entity.
+	/// </summary>
+	/// <typeparam name="TEntity">The type of the attribute entity.</typeparam>
+	/// <param name="entity">The attribute entity.</param>
+	/// <returns>The DisplayAttribute if exists; otherwise, null.</returns>
+	public static DisplayAttribute GetDisplay<TEntity>(this TEntity entity)
+		where TEntity : IAttributesEntity
+		=> entity.Attributes.OfType<DisplayAttribute>().FirstOrDefault();
+
+	/// <summary>
+	/// Helper method to determine if any attribute of type TAttribute on the entity satisfies the condition.
+	/// </summary>
+	private static bool IsAny<TEntity, TAttribute>(this TEntity entity, Func<TAttribute, bool> condition)
+		where TEntity : IAttributesEntity
+		=> Attrs<TEntity, TAttribute>(entity).Any(condition);
+
+	/// <summary>
+	/// Helper method to determine if all attributes of type TAttribute on the entity satisfy the condition.
+	/// </summary>
+	private static bool IsAll<TEntity, TAttribute>(this TEntity entity, Func<TAttribute, bool> condition)
+		where TEntity : IAttributesEntity
+		=> Attrs<TEntity, TAttribute>(entity).All(condition);
+
+	/// <summary>
+	/// Retrieves all attributes of the specified type TAttribute from the entity.
+	/// </summary>
+	private static IEnumerable<TAttribute> Attrs<TEntity, TAttribute>(this TEntity entity)
+		where TEntity : IAttributesEntity
+		=> entity.Attributes.OfType<TAttribute>();
+
+	/// <summary>
+	/// Sets a RequiredAttribute as a validator for the entity.
+	/// </summary>
+	/// <typeparam name="TEntity">The type of the attribute entity.</typeparam>
+	/// <param name="entity">The attribute entity.</param>
+	/// <returns>The updated attribute entity.</returns>
+	public static TEntity SetRequired<TEntity>(this TEntity entity)
+		where TEntity : IAttributesEntity
+		=> entity.SetValidator(new RequiredAttribute());
+
+	/// <summary>
+	/// Adds a custom validation attribute as a validator for the entity.
+	/// </summary>
+	/// <typeparam name="TEntity">The type of the attribute entity.</typeparam>
+	/// <param name="entity">The attribute entity.</param>
+	/// <param name="validator">The validation attribute to add.</param>
+	/// <returns>The updated attribute entity.</returns>
+	public static TEntity SetValidator<TEntity>(this TEntity entity, ValidationAttribute validator)
+		where TEntity : IAttributesEntity
+	{
+		entity.Attributes.Add(validator);
+		return entity;
+	}
+
+	/// <summary>
+	/// Validates the given value against all ValidationAttribute validators on the entity.
+	/// </summary>
+	/// <typeparam name="TEntity">The type of the attribute entity.</typeparam>
+	/// <param name="entity">The attribute entity.</param>
+	/// <param name="value">The value to validate.</param>
+	/// <returns>True if all validators deem the value valid; otherwise, false.</returns>
+	public static bool IsValid<TEntity>(this TEntity entity, object value)
+		where TEntity : IAttributesEntity
+		=> entity.Attrs<TEntity, ValidationAttribute>().All(v => v.IsValid(value));
+
+	/// <summary>
+	/// Determines whether the debugger is currently waiting for input or output.
+	/// </summary>
+	/// <param name="debugger">The debugger instance.</param>
+	/// <returns>True if the debugger is waiting; otherwise, false.</returns>
+	public static bool IsWaiting(this IDebugger debugger)
+	{
+		if (debugger is null)
+			throw new ArgumentNullException(nameof(debugger));
+
+		return debugger.IsWaitingOnInput || debugger.IsWaitingOnOutput;
 	}
 }
\ No newline at end of file
diff --git a/ComponentModel/FileSizeFormatProvider.cs b/ComponentModel/FileSizeFormatProvider.cs
index 643e0679..a1951468 100644
--- a/ComponentModel/FileSizeFormatProvider.cs
+++ b/ComponentModel/FileSizeFormatProvider.cs
@@ -1,95 +1,94 @@
-namespace Ecng.ComponentModel
+namespace Ecng.ComponentModel;
+
+#region Using Directives
+
+using System;
+
+using Ecng.Common;
+
+#endregion
+
+/// <summary>
+/// File size format provider.
+/// </summary>
+public class FileSizeFormatProvider : IFormatProvider, ICustomFormatter
 {
-	#region Using Directives
+	#region Private Fields
 
-	using System;
+	private const string _fileSizeFormat = "fs";
 
-	using Ecng.Common;
+	private static readonly string[] _letters = ["b", "kb", "mb", "gb", "tb", "pb"];
 
 	#endregion
 
+	#region IFormatProvider Members
+
 	/// <summary>
-	/// File size format provider.
+	/// Gets an object that provides formatting services for the specified type.
 	/// </summary>
-	public class FileSizeFormatProvider : IFormatProvider, ICustomFormatter
+	/// <param name="formatType">An object that specifies the type of format object to get.</param>
+	/// <returns>
+	/// The current instance, if formatType is the same type as the current instance; otherwise, null.
+	/// </returns>
+	object IFormatProvider.GetFormat(Type formatType)
 	{
-		#region Private Fields
-
-		private const string _fileSizeFormat = "fs";
-
-		private static readonly string[] _letters = ["b", "kb", "mb", "gb", "tb", "pb"];
+		return formatType.Is<ICustomFormatter>() ? this : null;
+	}
 
-		#endregion
+	#endregion
 
-		#region IFormatProvider Members
+	#region ICustomFormatter Members
 
-		/// <summary>
-		/// Gets an object that provides formatting services for the specified type.
-		/// </summary>
-		/// <param name="formatType">An object that specifies the type of format object to get.</param>
-		/// <returns>
-		/// The current instance, if formatType is the same type as the current instance; otherwise, null.
-		/// </returns>
-		object IFormatProvider.GetFormat(Type formatType)
+	/// <summary>
+	/// Converts the value of a specified object to an equivalent string representation using specified format and culture-specific formatting information.
+	/// </summary>
+	/// <param name="format">A format string containing formatting specifications.</param>
+	/// <param name="arg">An object to format.</param>
+	/// <param name="formatProvider">An <see cref="T:System.IFormatProvider"></see> object that supplies format information about the current instance.</param>
+	/// <returns>
+	/// The string representation of the value of arg, formatted as specified by format and formatProvider.
+	/// </returns>
+	string ICustomFormatter.Format(string format, object arg, IFormatProvider formatProvider)
+	{
+		if (format is null || !format.StartsWith(_fileSizeFormat))
 		{
-			return formatType.Is<ICustomFormatter>() ? this : null;
+			return DefaultFormat(format, arg, formatProvider);
 		}
 
-		#endregion
+		decimal size;
 
-		#region ICustomFormatter Members
+		try
+		{
+			size = arg.To<decimal>();
+		}
+		catch (InvalidCastException)
+		{
+			return DefaultFormat(format, arg, formatProvider);
+		}
 
-		/// <summary>
-		/// Converts the value of a specified object to an equivalent string representation using specified format and culture-specific formatting information.
-		/// </summary>
-		/// <param name="format">A format string containing formatting specifications.</param>
-		/// <param name="arg">An object to format.</param>
-		/// <param name="formatProvider">An <see cref="T:System.IFormatProvider"></see> object that supplies format information about the current instance.</param>
-		/// <returns>
-		/// The string representation of the value of arg, formatted as specified by format and formatProvider.
-		/// </returns>
-		string ICustomFormatter.Format(string format, object arg, IFormatProvider formatProvider)
+		byte i = 0;
+		while ((size >= FileSizes.KB) && (i < _letters.Length - 1))
 		{
-			if (format is null || !format.StartsWith(_fileSizeFormat))
-			{
-				return DefaultFormat(format, arg, formatProvider);
-			}
-
-			decimal size;
-
-			try
-			{
-				size = arg.To<decimal>();
-			}
-			catch (InvalidCastException)
-			{
-				return DefaultFormat(format, arg, formatProvider);
-			}
-
-			byte i = 0;
-			while ((size >= FileSizes.KB) && (i < _letters.Length - 1))
-			{
-				i++;
-				size /= FileSizes.KB;
-			}
-
-			var precision = format.Substring(2);
-
-			if (precision.IsEmpty())
-				precision = "2";
-
-			return ("{0:N" + precision + "}{1}").Put(size, _letters[i]);
+			i++;
+			size /= FileSizes.KB;
 		}
 
-		#endregion
+		var precision = format.Substring(2);
 
-		#region DefaultFormat
+		if (precision.IsEmpty())
+			precision = "2";
 
-		private static string DefaultFormat(string format, object arg, IFormatProvider formatProvider)
-		{
-			return arg is IFormattable formattableArg ? formattableArg.ToString(format, formatProvider) : arg.ToString();
-		}
+		return ("{0:N" + precision + "}{1}").Put(size, _letters[i]);
+	}
 
-		#endregion
+	#endregion
+
+	#region DefaultFormat
+
+	private static string DefaultFormat(string format, object arg, IFormatProvider formatProvider)
+	{
+		return arg is IFormattable formattableArg ? formattableArg.ToString(format, formatProvider) : arg.ToString();
 	}
+
+	#endregion
 }
\ No newline at end of file
diff --git a/ComponentModel/IDispatcher.cs b/ComponentModel/IDispatcher.cs
index 07605908..a4504432 100644
--- a/ComponentModel/IDispatcher.cs
+++ b/ComponentModel/IDispatcher.cs
@@ -1,39 +1,38 @@
-namespace Ecng.ComponentModel
-{
-	using System;
-	using System.Threading.Tasks;
+namespace Ecng.ComponentModel;
+
+using System;
+using System.Threading.Tasks;
 
+/// <summary>
+/// Threads dispatcher.
+/// </summary>
+public interface IDispatcher
+{
 	/// <summary>
-	/// Threads dispatcher.
+	/// Call action in dispatcher thread.
 	/// </summary>
-	public interface IDispatcher
-	{
-		/// <summary>
-		/// Call action in dispatcher thread.
-		/// </summary>
-		/// <param name="action">Action.</param>
-		void Invoke(Action action);
-
-		/// <summary>
-		/// Call action in dispatcher thread.
-		/// </summary>
-		/// <param name="action">Action.</param>
-		void InvokeAsync(Action action);
+	/// <param name="action">Action.</param>
+	void Invoke(Action action);
 
-		/// <summary>
-		/// Verify that current thread is dispatcher thread.
-		/// </summary>
-		/// <returns>Operation result.</returns>
-		bool CheckAccess();
-	}
+	/// <summary>
+	/// Call action in dispatcher thread.
+	/// </summary>
+	/// <param name="action">Action.</param>
+	void InvokeAsync(Action action);
 
 	/// <summary>
-	/// Dummy dispatcher.
+	/// Verify that current thread is dispatcher thread.
 	/// </summary>
-	public class DummyDispatcher : IDispatcher
-	{
-		bool IDispatcher.CheckAccess() => true;
-		void IDispatcher.Invoke(Action action) => action();
-		void IDispatcher.InvokeAsync(Action action) => Task.Run(action);
-	}
+	/// <returns>Operation result.</returns>
+	bool CheckAccess();
+}
+
+/// <summary>
+/// Dummy dispatcher.
+/// </summary>
+public class DummyDispatcher : IDispatcher
+{
+	bool IDispatcher.CheckAccess() => true;
+	void IDispatcher.Invoke(Action action) => action();
+	void IDispatcher.InvokeAsync(Action action) => Task.Run(action);
 }
\ No newline at end of file
diff --git a/ComponentModel/IFileBrowserEditor.cs b/ComponentModel/IFileBrowserEditor.cs
index d71220d0..1c72ff0e 100644
--- a/ComponentModel/IFileBrowserEditor.cs
+++ b/ComponentModel/IFileBrowserEditor.cs
@@ -1,9 +1,8 @@
-namespace Ecng.ComponentModel
+namespace Ecng.ComponentModel;
+
+/// <summary>
+/// Defines methods for performing file browser editing operations.
+/// </summary>
+public interface IFileBrowserEditor
 {
-	/// <summary>
-	/// Defines methods for performing file browser editing operations.
-	/// </summary>
-	public interface IFileBrowserEditor
-	{
-	}
 }
\ No newline at end of file
diff --git a/ComponentModel/IFileSaveEditor.cs b/ComponentModel/IFileSaveEditor.cs
index 15a1b39e..c76655d4 100644
--- a/ComponentModel/IFileSaveEditor.cs
+++ b/ComponentModel/IFileSaveEditor.cs
@@ -1,9 +1,8 @@
-namespace Ecng.ComponentModel
+namespace Ecng.ComponentModel;
+
+/// <summary>
+/// Provides an interface for file save editor components.
+/// </summary>
+public interface IFileSaveEditor
 {
-	/// <summary>
-	/// Provides an interface for file save editor components.
-	/// </summary>
-	public interface IFileSaveEditor
-	{
-	}
 }
\ No newline at end of file
diff --git a/ComponentModel/IFolderBrowserEditor.cs b/ComponentModel/IFolderBrowserEditor.cs
index 985ccd66..07615523 100644
--- a/ComponentModel/IFolderBrowserEditor.cs
+++ b/ComponentModel/IFolderBrowserEditor.cs
@@ -1,9 +1,8 @@
-namespace Ecng.ComponentModel
+namespace Ecng.ComponentModel;
+
+/// <summary>
+/// Provides an interface for implementing folder browser editing functionality.
+/// </summary>
+public interface IFolderBrowserEditor
 {
-	/// <summary>
-	/// Provides an interface for implementing folder browser editing functionality.
-	/// </summary>
-	public interface IFolderBrowserEditor
-	{
-	}
 }
\ No newline at end of file
diff --git a/ComponentModel/IItemsSource.cs b/ComponentModel/IItemsSource.cs
index 37620f90..20e9b68d 100644
--- a/ComponentModel/IItemsSource.cs
+++ b/ComponentModel/IItemsSource.cs
@@ -1,542 +1,541 @@
-namespace Ecng.ComponentModel
+namespace Ecng.ComponentModel;
+
+using System;
+using System.Linq;
+using System.ComponentModel;
+using System.Collections.Generic;
+using System.Collections;
+using System.Reflection;
+
+using Ecng.Common;
+
+/// <summary>
+/// Represents an item used as a source for UI components, with properties for display, description, icon, and state.
+/// </summary>
+public interface IItemsSourceItem : INotifyPropertyChangedEx
 {
-	using System;
-	using System.Linq;
-	using System.ComponentModel;
-	using System.Collections.Generic;
-	using System.Collections;
-	using System.Reflection;
+	/// <summary>
+	/// Gets the display name of the item.
+	/// </summary>
+	string DisplayName { get; }
 
-	using Ecng.Common;
+	/// <summary>
+	/// Gets the description of the item.
+	/// </summary>
+	string Description { get; }
 
 	/// <summary>
-	/// Represents an item used as a source for UI components, with properties for display, description, icon, and state.
+	/// Gets the URI of the icon representing the item.
 	/// </summary>
-	public interface IItemsSourceItem : INotifyPropertyChangedEx
-	{
-		/// <summary>
-		/// Gets the display name of the item.
-		/// </summary>
-		string DisplayName { get; }
-
-		/// <summary>
-		/// Gets the description of the item.
-		/// </summary>
-		string Description { get; }
-
-		/// <summary>
-		/// Gets the URI of the icon representing the item.
-		/// </summary>
-		Uri Icon { get; }
-
-		/// <summary>
-		/// Gets a value indicating whether the item is marked as obsolete.
-		/// </summary>
-		bool IsObsolete { get; }
-
-		/// <summary>
-		/// Gets the underlying value of the item.
-		/// </summary>
-		object Value { get; }
-	}
+	Uri Icon { get; }
 
 	/// <summary>
-	/// Represents an item source item with a strongly typed value.
+	/// Gets a value indicating whether the item is marked as obsolete.
 	/// </summary>
-	/// <typeparam name="TValue">The type of the value of the item.</typeparam>
-	public interface IItemsSourceItem<out TValue> : IItemsSourceItem
-	{
-		/// <summary>
-		/// Gets the strongly typed value of the item.
-		/// </summary>
-		new TValue Value { get; }
-	}
+	bool IsObsolete { get; }
 
 	/// <summary>
-	/// Represents an item source item with a strongly typed value. Provides functionality for property change notifications.
+	/// Gets the underlying value of the item.
 	/// </summary>
-	/// <typeparam name="T">The type of the value.</typeparam>
-	/// <param name="value">The value of the item.</param>
-	/// <param name="getDisplayName">Function to get the display name of the item.</param>
-	/// <param name="getDescription">Function to get the description of the item.</param>
-	/// <param name="iconUri">The URI of the icon representing the item.</param>
-	/// <param name="isObsolete">A value indicating whether the item is obsolete.</param>
-	public class ItemsSourceItem<T>(T value, Func<string> getDisplayName, Func<string> getDescription, Uri iconUri, bool isObsolete) : NotifiableObject, IItemsSourceItem<T>
-	{
-		private readonly Func<string> _getDisplayName = getDisplayName ?? throw new ArgumentNullException(nameof(getDisplayName));
-		private readonly Func<string> _getDescription = getDescription ?? throw new ArgumentNullException(nameof(getDescription));
-
-		object IItemsSourceItem.Value => Value;
-
-		/// <summary>
-		/// Gets the strongly typed value of the item.
-		/// </summary>
-		public T Value { get; } = value;
-
-		/// <summary>
-		/// Gets the display name of the item.
-		/// </summary>
-		public string DisplayName => _getDisplayName();
-
-		/// <summary>
-		/// Gets the description of the item.
-		/// </summary>
-		public string Description => _getDescription();
-
-		/// <summary>
-		/// Gets the icon URI of the item.
-		/// </summary>
-		public Uri Icon { get; } = iconUri;
-
-		/// <summary>
-		/// Gets a value indicating whether the item is marked as obsolete.
-		/// </summary>
-		public bool IsObsolete { get; } = isObsolete;
-
-		/// <summary>
-		/// Returns the display name of the item.
-		/// </summary>
-		/// <returns>The display name.</returns>
-		public override string ToString() => DisplayName;
-	}
+	object Value { get; }
+}
+
+/// <summary>
+/// Represents an item source item with a strongly typed value.
+/// </summary>
+/// <typeparam name="TValue">The type of the value of the item.</typeparam>
+public interface IItemsSourceItem<out TValue> : IItemsSourceItem
+{
+	/// <summary>
+	/// Gets the strongly typed value of the item.
+	/// </summary>
+	new TValue Value { get; }
+}
+
+/// <summary>
+/// Represents an item source item with a strongly typed value. Provides functionality for property change notifications.
+/// </summary>
+/// <typeparam name="T">The type of the value.</typeparam>
+/// <param name="value">The value of the item.</param>
+/// <param name="getDisplayName">Function to get the display name of the item.</param>
+/// <param name="getDescription">Function to get the description of the item.</param>
+/// <param name="iconUri">The URI of the icon representing the item.</param>
+/// <param name="isObsolete">A value indicating whether the item is obsolete.</param>
+public class ItemsSourceItem<T>(T value, Func<string> getDisplayName, Func<string> getDescription, Uri iconUri, bool isObsolete) : NotifiableObject, IItemsSourceItem<T>
+{
+	private readonly Func<string> _getDisplayName = getDisplayName ?? throw new ArgumentNullException(nameof(getDisplayName));
+	private readonly Func<string> _getDescription = getDescription ?? throw new ArgumentNullException(nameof(getDescription));
+
+	object IItemsSourceItem.Value => Value;
 
 	/// <summary>
-	/// Represents a source of items.
+	/// Gets the strongly typed value of the item.
 	/// </summary>
-	public interface IItemsSource
-	{
-		/// <summary>
-		/// Gets the collection of items.
-		/// </summary>
-		IEnumerable<IItemsSourceItem> Values { get; }
-
-		/// <summary>
-		/// Gets the type of the value represented by the items.
-		/// </summary>
-		Type ValueType { get; }
-
-		/// <summary>
-		/// Gets a value indicating whether obsolete items should be excluded.
-		/// </summary>
-		bool ExcludeObsolete { get; }
-
-		/// <summary>
-		/// Gets the sort order for the items.
-		/// </summary>
-		ListSortDirection? SortOrder { get; }
-
-		/// <summary>
-		/// Creates a new item using the specified value.
-		/// </summary>
-		/// <param name="value">The value for creating the new item.</param>
-		/// <returns>The newly created item.</returns>
-		IItemsSourceItem CreateNewItem(object value);
-	}
+	public T Value { get; } = value;
 
 	/// <summary>
-	/// Represents a strongly typed source of items.
+	/// Gets the display name of the item.
 	/// </summary>
-	/// <typeparam name="TValue">The type of the value represented in the items.</typeparam>
-	public interface IItemsSource<TValue> : IItemsSource
-	{
-		/// <summary>
-		/// Gets the collection of strongly typed items.
-		/// </summary>
-		new IEnumerable<IItemsSourceItem<TValue>> Values { get; }
-
-		/// <summary>
-		/// Creates a new strongly typed item using the specified value.
-		/// </summary>
-		/// <param name="value">The value for creating the new item.</param>
-		/// <returns>The newly created strongly typed item.</returns>
-		IItemsSourceItem<TValue> CreateNewItem(TValue value);
-	}
+	public string DisplayName => _getDisplayName();
+
+	/// <summary>
+	/// Gets the description of the item.
+	/// </summary>
+	public string Description => _getDescription();
+
+	/// <summary>
+	/// Gets the icon URI of the item.
+	/// </summary>
+	public Uri Icon { get; } = iconUri;
+
+	/// <summary>
+	/// Gets a value indicating whether the item is marked as obsolete.
+	/// </summary>
+	public bool IsObsolete { get; } = isObsolete;
+
+	/// <summary>
+	/// Returns the display name of the item.
+	/// </summary>
+	/// <returns>The display name.</returns>
+	public override string ToString() => DisplayName;
+}
+
+/// <summary>
+/// Represents a source of items.
+/// </summary>
+public interface IItemsSource
+{
+	/// <summary>
+	/// Gets the collection of items.
+	/// </summary>
+	IEnumerable<IItemsSourceItem> Values { get; }
+
+	/// <summary>
+	/// Gets the type of the value represented by the items.
+	/// </summary>
+	Type ValueType { get; }
+
+	/// <summary>
+	/// Gets a value indicating whether obsolete items should be excluded.
+	/// </summary>
+	bool ExcludeObsolete { get; }
+
+	/// <summary>
+	/// Gets the sort order for the items.
+	/// </summary>
+	ListSortDirection? SortOrder { get; }
+
+	/// <summary>
+	/// Creates a new item using the specified value.
+	/// </summary>
+	/// <param name="value">The value for creating the new item.</param>
+	/// <returns>The newly created item.</returns>
+	IItemsSourceItem CreateNewItem(object value);
+}
+
+/// <summary>
+/// Represents a strongly typed source of items.
+/// </summary>
+/// <typeparam name="TValue">The type of the value represented in the items.</typeparam>
+public interface IItemsSource<TValue> : IItemsSource
+{
+	/// <summary>
+	/// Gets the collection of strongly typed items.
+	/// </summary>
+	new IEnumerable<IItemsSourceItem<TValue>> Values { get; }
+
+	/// <summary>
+	/// Creates a new strongly typed item using the specified value.
+	/// </summary>
+	/// <param name="value">The value for creating the new item.</param>
+	/// <returns>The newly created strongly typed item.</returns>
+	IItemsSourceItem<TValue> CreateNewItem(TValue value);
+}
+
+/// <summary>
+/// Represents the base implementation for an items source containing values of type <typeparamref name="T"/>.
+/// </summary>
+/// <typeparam name="T">The type of the values in the source.</typeparam>
+public class ItemsSourceBase<T> : IItemsSource<T>
+{
+	private readonly T[] _values;
+	private readonly Lazy<IEnumerable<IItemsSourceItem<T>>> _items;
+	private readonly Func<IItemsSourceItem, bool> _filter;
+
+	private readonly Func<T, string> _getName;
+	private readonly Func<T, string> _getDescription;
+
+	/// <summary>
+	/// Gets a value indicating whether obsolete items should be excluded.
+	/// </summary>
+	public bool ExcludeObsolete { get; }
+
+	/// <summary>
+	/// Gets the sort order for sorting the items.
+	/// </summary>
+	public ListSortDirection? SortOrder { get; }
 
 	/// <summary>
-	/// Represents the base implementation for an items source containing values of type <typeparamref name="T"/>.
+	/// Gets the collection of items.
 	/// </summary>
-	/// <typeparam name="T">The type of the values in the source.</typeparam>
-	public class ItemsSourceBase<T> : IItemsSource<T>
+	IEnumerable<IItemsSourceItem> IItemsSource.Values => Values;
+
+	/// <summary>
+	/// Gets the collection of strongly typed items.
+	/// </summary>
+	public IEnumerable<IItemsSourceItem<T>> Values => _items.Value;
+
+	/// <summary>
+	/// Gets the type of the value.
+	/// </summary>
+	public virtual Type ValueType => typeof(T);
+
+	/// <summary>
+	/// Initializes a new instance of the <see cref="ItemsSourceBase{T}"/> class using the specified values.
+	/// </summary>
+	/// <param name="values">The collection of values or items.</param>
+	/// <param name="excludeObsolete">A value indicating whether obsolete items should be excluded.</param>
+	/// <param name="sortOrder">The sort order for the items.</param>
+	/// <param name="filter">A filter function to apply on items.</param>
+	/// <param name="getName">A function to retrieve the display name from a value.</param>
+	/// <param name="getDescription">A function to retrieve the description from a value.</param>
+	public ItemsSourceBase(IEnumerable values, bool excludeObsolete, ListSortDirection? sortOrder, Func<IItemsSourceItem, bool> filter, Func<T, string> getName, Func<T, string> getDescription)
 	{
-		private readonly T[] _values;
-		private readonly Lazy<IEnumerable<IItemsSourceItem<T>>> _items;
-		private readonly Func<IItemsSourceItem, bool> _filter;
-
-		private readonly Func<T, string> _getName;
-		private readonly Func<T, string> _getDescription;
-
-		/// <summary>
-		/// Gets a value indicating whether obsolete items should be excluded.
-		/// </summary>
-		public bool ExcludeObsolete { get; }
-
-		/// <summary>
-		/// Gets the sort order for sorting the items.
-		/// </summary>
-		public ListSortDirection? SortOrder { get; }
-
-		/// <summary>
-		/// Gets the collection of items.
-		/// </summary>
-		IEnumerable<IItemsSourceItem> IItemsSource.Values => Values;
-
-		/// <summary>
-		/// Gets the collection of strongly typed items.
-		/// </summary>
-		public IEnumerable<IItemsSourceItem<T>> Values => _items.Value;
-
-		/// <summary>
-		/// Gets the type of the value.
-		/// </summary>
-		public virtual Type ValueType => typeof(T);
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="ItemsSourceBase{T}"/> class using the specified values.
-		/// </summary>
-		/// <param name="values">The collection of values or items.</param>
-		/// <param name="excludeObsolete">A value indicating whether obsolete items should be excluded.</param>
-		/// <param name="sortOrder">The sort order for the items.</param>
-		/// <param name="filter">A filter function to apply on items.</param>
-		/// <param name="getName">A function to retrieve the display name from a value.</param>
-		/// <param name="getDescription">A function to retrieve the description from a value.</param>
-		public ItemsSourceBase(IEnumerable values, bool excludeObsolete, ListSortDirection? sortOrder, Func<IItemsSourceItem, bool> filter, Func<T, string> getName, Func<T, string> getDescription)
+		SortOrder = sortOrder;
+		ExcludeObsolete = excludeObsolete;
+		_filter = filter;
+		_getName = getName;
+		_getDescription = getDescription;
+
+		var objects = values?.Cast<object>().ToArray();
+		if (objects != null)
 		{
-			SortOrder = sortOrder;
-			ExcludeObsolete = excludeObsolete;
-			_filter = filter;
-			_getName = getName;
-			_getDescription = getDescription;
-
-			var objects = values?.Cast<object>().ToArray();
-			if (objects != null)
+			if (objects.All(o => o is T))
 			{
-				if (objects.All(o => o is T))
-				{
-					_values = [.. objects.Cast<T>()];
-					_items = new Lazy<IEnumerable<IItemsSourceItem<T>>>(() => CreateItems(GetValues()));
-				}
-				else if (objects.All(o => o is IItemsSourceItem<T>))
-				{
-					var itemsArr = objects.Cast<IItemsSourceItem<T>>().ToArray();
-					_values = [.. itemsArr.Select(item => item.Value)];
-					_items = new Lazy<IEnumerable<IItemsSourceItem<T>>>(() => FilterItems(itemsArr));
-				}
-				else if (objects.All(o => o is IItemsSourceItem iisi && iisi.Value is T))
-				{
-					var itemsArr = objects.Cast<IItemsSourceItem>().Select(CreateNewItem).ToArray();
-					_values = [.. itemsArr.Select(item => item.Value)];
-					_items = new Lazy<IEnumerable<IItemsSourceItem<T>>>(() => FilterItems(itemsArr));
-				}
-				else
-				{
-					throw new ArgumentException($"{nameof(values)} is expected to contain either {typeof(T).Name} or {nameof(IItemsSourceItem)}<{typeof(T).Name}> items (mix not supported). actual types found: {objects.Select(o => o.GetType().Name).Distinct().Join(",")}");
-				}
+				_values = [.. objects.Cast<T>()];
+				_items = new Lazy<IEnumerable<IItemsSourceItem<T>>>(() => CreateItems(GetValues()));
+			}
+			else if (objects.All(o => o is IItemsSourceItem<T>))
+			{
+				var itemsArr = objects.Cast<IItemsSourceItem<T>>().ToArray();
+				_values = [.. itemsArr.Select(item => item.Value)];
+				_items = new Lazy<IEnumerable<IItemsSourceItem<T>>>(() => FilterItems(itemsArr));
+			}
+			else if (objects.All(o => o is IItemsSourceItem iisi && iisi.Value is T))
+			{
+				var itemsArr = objects.Cast<IItemsSourceItem>().Select(CreateNewItem).ToArray();
+				_values = [.. itemsArr.Select(item => item.Value)];
+				_items = new Lazy<IEnumerable<IItemsSourceItem<T>>>(() => FilterItems(itemsArr));
 			}
 			else
 			{
-				if (typeof(T).IsEnum)
-					_values = [.. Enumerator.GetValues<T>()];
-
-				_items = new Lazy<IEnumerable<IItemsSourceItem<T>>>(() => CreateItems(GetValues()));
+				throw new ArgumentException($"{nameof(values)} is expected to contain either {typeof(T).Name} or {nameof(IItemsSourceItem)}<{typeof(T).Name}> items (mix not supported). actual types found: {objects.Select(o => o.GetType().Name).Distinct().Join(",")}");
 			}
 		}
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="ItemsSourceBase{T}"/> class.
-		/// </summary>
-		/// <param name="excludeObsolete">A value indicating whether obsolete items should be excluded.</param>
-		/// <param name="sortOrder">The sort order for the items.</param>
-		/// <param name="filter">A filter function to apply on items.</param>
-		/// <param name="getName">A function to retrieve the display name from a value.</param>
-		/// <param name="getDescription">A function to retrieve the description from a value.</param>
-		public ItemsSourceBase(bool excludeObsolete, ListSortDirection? sortOrder = null, Func<IItemsSourceItem, bool> filter = null, Func<T, string> getName = null, Func<T, string> getDescription = null)
-			: this(null, excludeObsolete, sortOrder, filter, getName, getDescription) { }
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="ItemsSourceBase{T}"/> class using a collection of values.
-		/// </summary>
-		/// <param name="values">The collection of values or items.</param>
-		/// <param name="getName">A function to retrieve the display name from a value.</param>
-		/// <param name="getDescription">A function to retrieve the description from a value.</param>
-		public ItemsSourceBase(IEnumerable values, Func<T, string> getName = null, Func<T, string> getDescription = null)
-			: this(values, true, null, null, getName, getDescription) { }
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="ItemsSourceBase{T}"/> class.
-		/// </summary>
-		public ItemsSourceBase() : this(null) { }
-
-		/// <summary>
-		/// Gets the format string for displaying the value. Override to provide a custom format.
-		/// </summary>
-		protected virtual string Format => null;
-
-		/// <summary>
-		/// Retrieves the display name for the specified value.
-		/// </summary>
-		/// <param name="value">The value whose display name is to be retrieved.</param>
-		/// <returns>The display name.</returns>
-		protected virtual string GetName(T value)
+		else
 		{
-			if (_getName != null)
-				return _getName(value);
+			if (typeof(T).IsEnum)
+				_values = [.. Enumerator.GetValues<T>()];
 
-			var f = Format;
-			return f.IsEmptyOrWhiteSpace() ? value.GetDisplayName() : string.Format($"{{0:{f}}}", value);
+			_items = new Lazy<IEnumerable<IItemsSourceItem<T>>>(() => CreateItems(GetValues()));
 		}
+	}
 
-		/// <summary>
-		/// Retrieves the description for the specified value.
-		/// </summary>
-		/// <param name="value">The value whose description is to be retrieved.</param>
-		/// <returns>The description.</returns>
-		protected virtual string GetDescription(T value) => _getDescription is null ? (typeof(T).IsEnum ? value.GetFieldDescription() : null) : _getDescription(value);
-
-		/// <summary>
-		/// Retrieves the icon for the specified value.
-		/// </summary>
-		/// <param name="value">The value whose icon is to be retrieved.</param>
-		/// <returns>The icon URI.</returns>
-		protected virtual Uri GetIcon(T value) => typeof(T).IsEnum ? value.GetFieldIcon() : null;
-
-		/// <summary>
-		/// Determines whether the specified value is marked as obsolete.
-		/// </summary>
-		/// <param name="value">The value to check.</param>
-		/// <returns><c>true</c> if obsolete; otherwise, <c>false</c>.</returns>
-		protected virtual bool GetIsObsolete(T value) => typeof(T).IsEnum && value.GetAttributeOfType<ObsoleteAttribute>() != null;
-
-		/// <summary>
-		/// Applies filtering to the given item.
-		/// </summary>
-		/// <param name="item">The item to filter.</param>
-		/// <returns><c>true</c> if the item should be included; otherwise, <c>false</c>.</returns>
-		protected virtual bool Filter(IItemsSourceItem<T> item)
-			=> (!ExcludeObsolete || !item.IsObsolete) && _filter?.Invoke(item) != false;
-
-		IItemsSourceItem IItemsSource.CreateNewItem(object value)
-		{
-			if (value is not T typedVal)
-				throw new ArgumentException(nameof(value));
+	/// <summary>
+	/// Initializes a new instance of the <see cref="ItemsSourceBase{T}"/> class.
+	/// </summary>
+	/// <param name="excludeObsolete">A value indicating whether obsolete items should be excluded.</param>
+	/// <param name="sortOrder">The sort order for the items.</param>
+	/// <param name="filter">A filter function to apply on items.</param>
+	/// <param name="getName">A function to retrieve the display name from a value.</param>
+	/// <param name="getDescription">A function to retrieve the description from a value.</param>
+	public ItemsSourceBase(bool excludeObsolete, ListSortDirection? sortOrder = null, Func<IItemsSourceItem, bool> filter = null, Func<T, string> getName = null, Func<T, string> getDescription = null)
+		: this(null, excludeObsolete, sortOrder, filter, getName, getDescription) { }
 
-			return CreateNewItem(typedVal);
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="ItemsSourceBase{T}"/> class using a collection of values.
+	/// </summary>
+	/// <param name="values">The collection of values or items.</param>
+	/// <param name="getName">A function to retrieve the display name from a value.</param>
+	/// <param name="getDescription">A function to retrieve the description from a value.</param>
+	public ItemsSourceBase(IEnumerable values, Func<T, string> getName = null, Func<T, string> getDescription = null)
+		: this(values, true, null, null, getName, getDescription) { }
 
-		private IItemsSourceItem<T> CreateNewItem(IItemsSourceItem fromItem)
-		{
-			return new ItemsSourceItem<T>(
-				(T)fromItem.Value,
-				() => fromItem.DisplayName,
-				() => fromItem.Description,
-				fromItem.Icon,
-				fromItem.IsObsolete
-			);
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="ItemsSourceBase{T}"/> class.
+	/// </summary>
+	public ItemsSourceBase() : this(null) { }
 
-		/// <summary>
-		/// Creates a new item with the specified value.
-		/// </summary>
-		/// <param name="value">The value for the new item.</param>
-		/// <returns>The newly created item.</returns>
-		public virtual IItemsSourceItem<T> CreateNewItem(T value)
-		{
-			return new ItemsSourceItem<T>(
-				value,
-				() => GetName(value),
-				() => GetDescription(value),
-				GetIcon(value),
-				GetIsObsolete(value)
-			);
-		}
+	/// <summary>
+	/// Gets the format string for displaying the value. Override to provide a custom format.
+	/// </summary>
+	protected virtual string Format => null;
 
-		/// <summary>
-		/// Retrieves the underlying collection of values.
-		/// </summary>
-		/// <returns>The collection of values.</returns>
-		protected virtual IEnumerable<T> GetValues() => _values;
+	/// <summary>
+	/// Retrieves the display name for the specified value.
+	/// </summary>
+	/// <param name="value">The value whose display name is to be retrieved.</param>
+	/// <returns>The display name.</returns>
+	protected virtual string GetName(T value)
+	{
+		if (_getName != null)
+			return _getName(value);
 
-		private IEnumerable<IItemsSourceItem<T>> FilterItems(IEnumerable<IItemsSourceItem<T>> items)
-		{
-			items ??= [];
+		var f = Format;
+		return f.IsEmptyOrWhiteSpace() ? value.GetDisplayName() : string.Format($"{{0:{f}}}", value);
+	}
 
-			items = items.Where(Filter);
+	/// <summary>
+	/// Retrieves the description for the specified value.
+	/// </summary>
+	/// <param name="value">The value whose description is to be retrieved.</param>
+	/// <returns>The description.</returns>
+	protected virtual string GetDescription(T value) => _getDescription is null ? (typeof(T).IsEnum ? value.GetFieldDescription() : null) : _getDescription(value);
 
-			if (SortOrder != null)
-				items = SortOrder == ListSortDirection.Ascending ?
-					items.OrderBy(item => item.DisplayName, StringComparer.CurrentCultureIgnoreCase) :
-					items.OrderByDescending(item => item.DisplayName, StringComparer.CurrentCultureIgnoreCase);
+	/// <summary>
+	/// Retrieves the icon for the specified value.
+	/// </summary>
+	/// <param name="value">The value whose icon is to be retrieved.</param>
+	/// <returns>The icon URI.</returns>
+	protected virtual Uri GetIcon(T value) => typeof(T).IsEnum ? value.GetFieldIcon() : null;
 
-			return [.. items];
-		}
+	/// <summary>
+	/// Determines whether the specified value is marked as obsolete.
+	/// </summary>
+	/// <param name="value">The value to check.</param>
+	/// <returns><c>true</c> if obsolete; otherwise, <c>false</c>.</returns>
+	protected virtual bool GetIsObsolete(T value) => typeof(T).IsEnum && value.GetAttributeOfType<ObsoleteAttribute>() != null;
+
+	/// <summary>
+	/// Applies filtering to the given item.
+	/// </summary>
+	/// <param name="item">The item to filter.</param>
+	/// <returns><c>true</c> if the item should be included; otherwise, <c>false</c>.</returns>
+	protected virtual bool Filter(IItemsSourceItem<T> item)
+		=> (!ExcludeObsolete || !item.IsObsolete) && _filter?.Invoke(item) != false;
 
-		private IEnumerable<IItemsSourceItem<T>> CreateItems(IEnumerable<T> values) => FilterItems(values?.Select(CreateNewItem));
+	IItemsSourceItem IItemsSource.CreateNewItem(object value)
+	{
+		if (value is not T typedVal)
+			throw new ArgumentException(nameof(value));
+
+		return CreateNewItem(typedVal);
+	}
+
+	private IItemsSourceItem<T> CreateNewItem(IItemsSourceItem fromItem)
+	{
+		return new ItemsSourceItem<T>(
+			(T)fromItem.Value,
+			() => fromItem.DisplayName,
+			() => fromItem.Description,
+			fromItem.Icon,
+			fromItem.IsObsolete
+		);
 	}
 
 	/// <summary>
-	/// Represents a non-generic items source based on objects.
+	/// Creates a new item with the specified value.
 	/// </summary>
-	public class ItemsSourceBase : ItemsSourceBase<object>
+	/// <param name="value">The value for the new item.</param>
+	/// <returns>The newly created item.</returns>
+	public virtual IItemsSourceItem<T> CreateNewItem(T value)
 	{
-		private static IItemsSource Create(IEnumerable values, Type itemValueType, bool? excludeObsolete, ListSortDirection? sortOrder, Func<IItemsSourceItem, bool> filter, Func<object, string> getName, Func<object, string> getDescription)
-		{
-			itemValueType ??= GetSourceValueType(values);
+		return new ItemsSourceItem<T>(
+			value,
+			() => GetName(value),
+			() => GetDescription(value),
+			GetIcon(value),
+			GetIsObsolete(value)
+		);
+	}
 
-			var srcType = typeof(ItemsSourceBase<>).Make(itemValueType);
+	/// <summary>
+	/// Retrieves the underlying collection of values.
+	/// </summary>
+	/// <returns>The collection of values.</returns>
+	protected virtual IEnumerable<T> GetValues() => _values;
 
-			excludeObsolete ??= true;
+	private IEnumerable<IItemsSourceItem<T>> FilterItems(IEnumerable<IItemsSourceItem<T>> items)
+	{
+		items ??= [];
 
-			return (IItemsSource)Activator.CreateInstance(
-					srcType,
-					BindingFlags.Instance | BindingFlags.CreateInstance | BindingFlags.Public | BindingFlags.NonPublic,
-					null,
-					[values, excludeObsolete.Value, sortOrder, filter, getName, getDescription],
-					null,
-					null);
-		}
+		items = items.Where(Filter);
 
-		/// <summary>
-		/// Creates an <see cref="IItemsSource"/> from an object.
-		/// </summary>
-		/// <param name="val">The source value.</param>
-		/// <param name="itemValueType">The expected type of the items.</param>
-		/// <param name="excludeObsolete">A value indicating whether obsolete items should be excluded.</param>
-		/// <param name="sortOrder">The sort order for the items.</param>
-		/// <param name="filter">A filter function to apply on items.</param>
-		/// <param name="getName">A function to retrieve the display name from a value.</param>
-		/// <param name="getDescription">A function to retrieve the description from a value.</param>
-		/// <returns>An instance of <see cref="IItemsSource"/>.</returns>
-		public static IItemsSource Create(object val, Type itemValueType, bool? excludeObsolete = null, ListSortDirection? sortOrder = null, Func<IItemsSourceItem, bool> filter = null, Func<object, string> getName = null, Func<object, string> getDescription = null)
-		{
-			switch (val)
-			{
-				case null:
-					itemValueType ??= typeof(object);
-					return Create(itemValueType.CreateArray(0), itemValueType, excludeObsolete, sortOrder, filter, getName, getDescription);
+		if (SortOrder != null)
+			items = SortOrder == ListSortDirection.Ascending ?
+				items.OrderBy(item => item.DisplayName, StringComparer.CurrentCultureIgnoreCase) :
+				items.OrderByDescending(item => item.DisplayName, StringComparer.CurrentCultureIgnoreCase);
 
-				case IItemsSource src:
-					if ((itemValueType is null || src.ValueType == itemValueType) && (excludeObsolete is null || excludeObsolete == src.ExcludeObsolete) && (sortOrder is null || sortOrder == src.SortOrder) && filter is null)
-						return src;
+		return [.. items];
+	}
 
-					return Create(src.Values, itemValueType, excludeObsolete, sortOrder, filter, getName, getDescription);
+	private IEnumerable<IItemsSourceItem<T>> CreateItems(IEnumerable<T> values) => FilterItems(values?.Select(CreateNewItem));
+}
 
-				case IEnumerable ie:
-					return Create(ie, itemValueType, excludeObsolete, sortOrder, filter, getName, getDescription);
+/// <summary>
+/// Represents a non-generic items source based on objects.
+/// </summary>
+public class ItemsSourceBase : ItemsSourceBase<object>
+{
+	private static IItemsSource Create(IEnumerable values, Type itemValueType, bool? excludeObsolete, ListSortDirection? sortOrder, Func<IItemsSourceItem, bool> filter, Func<object, string> getName, Func<object, string> getDescription)
+	{
+		itemValueType ??= GetSourceValueType(values);
 
-				default:
-					throw new ArgumentException($"cannot create {typeof(IItemsSource).FullName} from '{val.GetType().FullName}'");
-			}
-		}
+		var srcType = typeof(ItemsSourceBase<>).Make(itemValueType);
 
-		private static Type GetSourceValueType(IEnumerable values)
-		{
-			if (values is null)
-				throw new ArgumentNullException(nameof(values));
+		excludeObsolete ??= true;
 
-			var itemType = GetParamType(values.GetType(), typeof(IEnumerable<>));
-			var innerType = GetParamType(itemType, typeof(IItemsSourceItem<>));
+		return (IItemsSource)Activator.CreateInstance(
+				srcType,
+				BindingFlags.Instance | BindingFlags.CreateInstance | BindingFlags.Public | BindingFlags.NonPublic,
+				null,
+				[values, excludeObsolete.Value, sortOrder, filter, getName, getDescription],
+				null,
+				null);
+	}
 
-			if (innerType != null && innerType != typeof(object))
-				return innerType;
+	/// <summary>
+	/// Creates an <see cref="IItemsSource"/> from an object.
+	/// </summary>
+	/// <param name="val">The source value.</param>
+	/// <param name="itemValueType">The expected type of the items.</param>
+	/// <param name="excludeObsolete">A value indicating whether obsolete items should be excluded.</param>
+	/// <param name="sortOrder">The sort order for the items.</param>
+	/// <param name="filter">A filter function to apply on items.</param>
+	/// <param name="getName">A function to retrieve the display name from a value.</param>
+	/// <param name="getDescription">A function to retrieve the description from a value.</param>
+	/// <returns>An instance of <see cref="IItemsSource"/>.</returns>
+	public static IItemsSource Create(object val, Type itemValueType, bool? excludeObsolete = null, ListSortDirection? sortOrder = null, Func<IItemsSourceItem, bool> filter = null, Func<object, string> getName = null, Func<object, string> getDescription = null)
+	{
+		switch (val)
+		{
+			case null:
+				itemValueType ??= typeof(object);
+				return Create(itemValueType.CreateArray(0), itemValueType, excludeObsolete, sortOrder, filter, getName, getDescription);
 
-			if (itemType != null && !itemType.Is<IItemsSourceItem>() && itemType != typeof(object))
-				return itemType;
+			case IItemsSource src:
+				if ((itemValueType is null || src.ValueType == itemValueType) && (excludeObsolete is null || excludeObsolete == src.ExcludeObsolete) && (sortOrder is null || sortOrder == src.SortOrder) && filter is null)
+					return src;
 
-			bool foundItems, foundValues;
-			foundItems = foundValues = false;
+				return Create(src.Values, itemValueType, excludeObsolete, sortOrder, filter, getName, getDescription);
 
-			var types = values.Cast<object>().Select(o =>
-			{
-				var t = o.GetType();
-				var innerItemType = GetParamType(t, typeof(IItemsSourceItem<>));
+			case IEnumerable ie:
+				return Create(ie, itemValueType, excludeObsolete, sortOrder, filter, getName, getDescription);
 
-				if (innerItemType != null)
-				{
-					foundItems = true;
-					return innerItemType;
-				}
+			default:
+				throw new ArgumentException($"cannot create {typeof(IItemsSource).FullName} from '{val.GetType().FullName}'");
+		}
+	}
 
-				if (o is IItemsSourceItem iisi)
-				{
-					foundItems = true;
-					return iisi.Value.GetType();
-				}
+	private static Type GetSourceValueType(IEnumerable values)
+	{
+		if (values is null)
+			throw new ArgumentNullException(nameof(values));
 
-				foundValues = true;
-				return t;
-			}).ToArray();
+		var itemType = GetParamType(values.GetType(), typeof(IEnumerable<>));
+		var innerType = GetParamType(itemType, typeof(IItemsSourceItem<>));
 
-			if (foundItems && foundValues)
-				throw new ArgumentException($"{nameof(values)} contains elements of incompatible types");
+		if (innerType != null && innerType != typeof(object))
+			return innerType;
 
-			return GetCommonType(types);
-		}
+		if (itemType != null && !itemType.Is<IItemsSourceItem>() && itemType != typeof(object))
+			return itemType;
 
-		private static Type GetParamType(Type type, Type genericInterfaceType)
-		{
-			if (type is null)
-				return null;
-
-			return new[] { type }
-				.Concat(type.GetInterfaces())
-				.Where(i => i.IsGenericType && i.GetGenericTypeDefinition() == genericInterfaceType)
-				.Select(i => i.GetGenericArguments()[0])
-			    .FirstOrDefault();
-		}
+		bool foundItems, foundValues;
+		foundItems = foundValues = false;
 
-		private static Type GetCommonType(Type[] types)
+		var types = values.Cast<object>().Select(o =>
 		{
-			if (types is null)
-				throw new ArgumentNullException(nameof(types));
-
-			if (types.Length == 0)
-				return typeof(object);
+			var t = o.GetType();
+			var innerItemType = GetParamType(t, typeof(IItemsSourceItem<>));
 
-			var type = types[0];
+			if (innerItemType != null)
+			{
+				foundItems = true;
+				return innerItemType;
+			}
 
-			for (var i = 1; i < types.Length; ++i)
+			if (o is IItemsSourceItem iisi)
 			{
-				if (type.Is(types[i]))
-					type = types[i];
-				else
-					while (!types[i].Is(type))
-						type = type.BaseType;
+				foundItems = true;
+				return iisi.Value.GetType();
 			}
 
-			return type;
+			foundValues = true;
+			return t;
+		}).ToArray();
+
+		if (foundItems && foundValues)
+			throw new ArgumentException($"{nameof(values)} contains elements of incompatible types");
+
+		return GetCommonType(types);
+	}
+
+	private static Type GetParamType(Type type, Type genericInterfaceType)
+	{
+		if (type is null)
+			return null;
+
+		return new[] { type }
+			.Concat(type.GetInterfaces())
+			.Where(i => i.IsGenericType && i.GetGenericTypeDefinition() == genericInterfaceType)
+			.Select(i => i.GetGenericArguments()[0])
+		    .FirstOrDefault();
+	}
+
+	private static Type GetCommonType(Type[] types)
+	{
+		if (types is null)
+			throw new ArgumentNullException(nameof(types));
+
+		if (types.Length == 0)
+			return typeof(object);
+
+		var type = types[0];
+
+		for (var i = 1; i < types.Length; ++i)
+		{
+			if (type.Is(types[i]))
+				type = types[i];
+			else
+				while (!types[i].Is(type))
+					type = type.BaseType;
 		}
+
+		return type;
 	}
+}
+
+/// <summary>
+/// Specifies the items source type to be used for a property.
+/// </summary>
+[AttributeUsage(AttributeTargets.Property)]
+public class ItemsSourceAttribute : Attribute
+{
+	/// <summary>
+	/// Gets the type to use for the items source.
+	/// </summary>
+	public Type Type { get; }
 
 	/// <summary>
-	/// Specifies the items source type to be used for a property.
+	/// Gets or sets a value indicating whether the user is allowed to edit the items.
 	/// </summary>
-	[AttributeUsage(AttributeTargets.Property)]
-	public class ItemsSourceAttribute : Attribute
+	public bool IsEditable { get; set; }
+
+	/// <summary>
+	/// Initializes a new instance of the <see cref="ItemsSourceAttribute"/> class with the specified source type.
+	/// </summary>
+	/// <param name="type">The type to use as the items source.</param>
+	public ItemsSourceAttribute(Type type)
 	{
-		/// <summary>
-		/// Gets the type to use for the items source.
-		/// </summary>
-		public Type Type { get; }
-
-		/// <summary>
-		/// Gets or sets a value indicating whether the user is allowed to edit the items.
-		/// </summary>
-		public bool IsEditable { get; set; }
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="ItemsSourceAttribute"/> class with the specified source type.
-		/// </summary>
-		/// <param name="type">The type to use as the items source.</param>
-		public ItemsSourceAttribute(Type type)
-		{
-			if (type is null)
-				throw new ArgumentNullException(nameof(type));
-
-			Type =
-				type.Is<IItemsSource>()
-					? type
-					: type.IsEnum
-						? typeof(ItemsSourceBase<>).Make(type)
-						: throw new ArgumentException($"Type '{type}' must implement the '{typeof(IItemsSource)}' interface or be an enum.", nameof(type));
-		}
+		if (type is null)
+			throw new ArgumentNullException(nameof(type));
+
+		Type =
+			type.Is<IItemsSource>()
+				? type
+				: type.IsEnum
+					? typeof(ItemsSourceBase<>).Make(type)
+					: throw new ArgumentException($"Type '{type}' must implement the '{typeof(IItemsSource)}' interface or be an enum.", nameof(type));
 	}
 }
\ No newline at end of file
diff --git a/ComponentModel/INotifyPropertiesChanged.cs b/ComponentModel/INotifyPropertiesChanged.cs
index 6de738b8..9030c6c9 100644
--- a/ComponentModel/INotifyPropertiesChanged.cs
+++ b/ComponentModel/INotifyPropertiesChanged.cs
@@ -1,15 +1,14 @@
-namespace Ecng.ComponentModel
-{
-	using System;
+namespace Ecng.ComponentModel;
+
+using System;
 
+/// <summary>
+/// The interface describing the type with a variable number of properties.
+/// </summary>
+public interface INotifyPropertiesChanged
+{
 	/// <summary>
-	/// The interface describing the type with a variable number of properties.
+	/// The available properties change event.
 	/// </summary>
-	public interface INotifyPropertiesChanged
-	{
-		/// <summary>
-		/// The available properties change event.
-		/// </summary>
-		event Action PropertiesChanged;
-	}
+	event Action PropertiesChanged;
 }
\ No newline at end of file
diff --git a/ComponentModel/INotifyPropertyChangedEx.cs b/ComponentModel/INotifyPropertyChangedEx.cs
index 48de71da..2b207f67 100644
--- a/ComponentModel/INotifyPropertyChangedEx.cs
+++ b/ComponentModel/INotifyPropertyChangedEx.cs
@@ -1,41 +1,40 @@
-namespace Ecng.ComponentModel
+namespace Ecng.ComponentModel;
+
+using System;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+/// <summary>
+/// Extended version <see cref="INotifyPropertyChanged"/>.
+/// </summary>
+public interface INotifyPropertyChangedEx : INotifyPropertyChanged
 {
-	using System;
-	using System.ComponentModel;
-	using System.Runtime.CompilerServices;
+	/// <summary>
+	/// Raise event <see cref="INotifyPropertyChanged.PropertyChanged"/>.
+	/// </summary>
+	/// <param name="propertyName">Property name.</param>
+	void NotifyPropertyChanged([CallerMemberName]string propertyName = null);
+}
 
+/// <summary>
+/// Extension class for <see cref="INotifyPropertyChangedEx"/>.
+/// </summary>
+public static class NotifyPropertyChangedExHelper
+{
 	/// <summary>
-	/// Extended version <see cref="INotifyPropertyChanged"/>.
+	/// Filter.
 	/// </summary>
-	public interface INotifyPropertyChangedEx : INotifyPropertyChanged
-	{
-		/// <summary>
-		/// Raise event <see cref="INotifyPropertyChanged.PropertyChanged"/>.
-		/// </summary>
-		/// <param name="propertyName">Property name.</param>
-		void NotifyPropertyChanged([CallerMemberName]string propertyName = null);
-	}
+	public static Func<object, string, bool> Filter { get; set; }
 
 	/// <summary>
-	/// Extension class for <see cref="INotifyPropertyChangedEx"/>.
+	/// Invoke <see cref="INotifyPropertyChangedEx.NotifyPropertyChanged"/>.
 	/// </summary>
-	public static class NotifyPropertyChangedExHelper
+	/// <param name="entity">Notify based object.</param>
+	/// <param name="propertyName">Property name.</param>
+	public static void Notify<T>(this T entity, [CallerMemberName]string propertyName = null)
+		where T : INotifyPropertyChangedEx
 	{
-		/// <summary>
-		/// Filter.
-		/// </summary>
-		public static Func<object, string, bool> Filter { get; set; }
-
-		/// <summary>
-		/// Invoke <see cref="INotifyPropertyChangedEx.NotifyPropertyChanged"/>.
-		/// </summary>
-		/// <param name="entity">Notify based object.</param>
-		/// <param name="propertyName">Property name.</param>
-		public static void Notify<T>(this T entity, [CallerMemberName]string propertyName = null)
-			where T : INotifyPropertyChangedEx
-		{
-			if (null == Filter || Filter(entity, propertyName))
-				entity.NotifyPropertyChanged(propertyName);
-		}
+		if (null == Filter || Filter(entity, propertyName))
+			entity.NotifyPropertyChanged(propertyName);
 	}
 }
\ No newline at end of file
diff --git a/ComponentModel/IconAttribute.cs b/ComponentModel/IconAttribute.cs
index 5f3c9b57..ee80c93a 100644
--- a/ComponentModel/IconAttribute.cs
+++ b/ComponentModel/IconAttribute.cs
@@ -1,27 +1,26 @@
-namespace Ecng.ComponentModel
-{
-	using System;
+namespace Ecng.ComponentModel;
+
+using System;
 
-	using Ecng.Common;
+using Ecng.Common;
 
+/// <summary>
+/// Icon attribute.
+/// </summary>
+/// <remarks>
+/// Create <see cref="IconAttribute"/>.
+/// </remarks>
+/// <param name="icon"><see cref="Icon"/></param>
+/// <param name="isFullPath"><see cref="IsFullPath"/></param>
+public class IconAttribute(string icon, bool isFullPath = false) : Attribute
+{
 	/// <summary>
-	/// Icon attribute.
+	/// Icon url.
 	/// </summary>
-	/// <remarks>
-	/// Create <see cref="IconAttribute"/>.
-	/// </remarks>
-	/// <param name="icon"><see cref="Icon"/></param>
-	/// <param name="isFullPath"><see cref="IsFullPath"/></param>
-	public class IconAttribute(string icon, bool isFullPath = false) : Attribute
-	{
-		/// <summary>
-		/// Icon url.
-		/// </summary>
-		public string Icon { get; } = icon.ThrowIfEmpty(nameof(icon));
+	public string Icon { get; } = icon.ThrowIfEmpty(nameof(icon));
 
-		/// <summary>
-		/// <see cref="Icon"/> is full path.
-		/// </summary>
-		public bool IsFullPath { get; } = isFullPath;
-	}
+	/// <summary>
+	/// <see cref="Icon"/> is full path.
+	/// </summary>
+	public bool IsFullPath { get; } = isFullPath;
 }
\ No newline at end of file
diff --git a/ComponentModel/NotifiableObject.cs b/ComponentModel/NotifiableObject.cs
index 7df2a489..dbca8fee 100644
--- a/ComponentModel/NotifiableObject.cs
+++ b/ComponentModel/NotifiableObject.cs
@@ -1,55 +1,54 @@
-namespace Ecng.ComponentModel
-{
-	using System;
-	using System.ComponentModel;
-	using System.Runtime.Serialization;
-	using System.Runtime.CompilerServices;
+namespace Ecng.ComponentModel;
+
+using System;
+using System.ComponentModel;
+using System.Runtime.Serialization;
+using System.Runtime.CompilerServices;
 
-	using Ecng.Common;
+using Ecng.Common;
 
+/// <summary>
+/// Provides base functionality for notifying property changes to registered observers.
+/// Implements both <see cref="INotifyPropertyChangedEx"/> and <see cref="INotifyPropertyChanging"/>.
+/// </summary>
+[Serializable]
+[DataContract]
+public abstract class NotifiableObject : INotifyPropertyChangedEx, INotifyPropertyChanging
+{
 	/// <summary>
-	/// Provides base functionality for notifying property changes to registered observers.
-	/// Implements both <see cref="INotifyPropertyChangedEx"/> and <see cref="INotifyPropertyChanging"/>.
+	/// Occurs when a property value has changed.
 	/// </summary>
-	[Serializable]
-	[DataContract]
-	public abstract class NotifiableObject : INotifyPropertyChangedEx, INotifyPropertyChanging
-	{
-		/// <summary>
-		/// Occurs when a property value has changed.
-		/// </summary>
-		public event PropertyChangedEventHandler PropertyChanged;
+	public event PropertyChangedEventHandler PropertyChanged;
 
-		/// <summary>
-		/// Occurs when a property value is changing.
-		/// </summary>
-		public event PropertyChangingEventHandler PropertyChanging;
+	/// <summary>
+	/// Occurs when a property value is changing.
+	/// </summary>
+	public event PropertyChangingEventHandler PropertyChanging;
 
-		/// <summary>
-		/// Raises the <see cref="PropertyChanged"/> event.
-		/// </summary>
-		/// <param name="propertyName">The name of the property that changed. This value is optional and can be provided automatically by the compiler.</param>
-		public void NotifyPropertyChanged([CallerMemberName]string propertyName = null)
-		{
-			PropertyChanged?.Invoke(this, propertyName);
-		}
+	/// <summary>
+	/// Raises the <see cref="PropertyChanged"/> event.
+	/// </summary>
+	/// <param name="propertyName">The name of the property that changed. This value is optional and can be provided automatically by the compiler.</param>
+	public void NotifyPropertyChanged([CallerMemberName]string propertyName = null)
+	{
+		PropertyChanged?.Invoke(this, propertyName);
+	}
 
-		/// <summary>
-		/// Invokes the property change notification.
-		/// </summary>
-		/// <param name="propertyName">The name of the property that changed. This value is optional and can be provided automatically by the compiler.</param>
-		protected void NotifyChanged([CallerMemberName]string propertyName = null)
-		{
-			this.Notify(propertyName);
-		}
+	/// <summary>
+	/// Invokes the property change notification.
+	/// </summary>
+	/// <param name="propertyName">The name of the property that changed. This value is optional and can be provided automatically by the compiler.</param>
+	protected void NotifyChanged([CallerMemberName]string propertyName = null)
+	{
+		this.Notify(propertyName);
+	}
 
-		/// <summary>
-		/// Raises the <see cref="PropertyChanging"/> event.
-		/// </summary>
-		/// <param name="propertyName">The name of the property that is changing. This value is optional and can be provided automatically by the compiler.</param>
-		protected void NotifyChanging([CallerMemberName]string propertyName = null)
-		{
-			PropertyChanging?.Invoke(this, propertyName);
-		}
+	/// <summary>
+	/// Raises the <see cref="PropertyChanging"/> event.
+	/// </summary>
+	/// <param name="propertyName">The name of the property that is changing. This value is optional and can be provided automatically by the compiler.</param>
+	protected void NotifyChanging([CallerMemberName]string propertyName = null)
+	{
+		PropertyChanging?.Invoke(this, propertyName);
 	}
 }
\ No newline at end of file
diff --git a/ComponentModel/ObservableCollectionEx.cs b/ComponentModel/ObservableCollectionEx.cs
index 9a79db59..ae7e1641 100644
--- a/ComponentModel/ObservableCollectionEx.cs
+++ b/ComponentModel/ObservableCollectionEx.cs
@@ -1,370 +1,369 @@
-namespace Ecng.ComponentModel
+namespace Ecng.ComponentModel;
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Linq;
+
+using Ecng.Collections;
+
+/// <summary>
+/// Represents an observable collection with extended methods, including range operations.
+/// </summary>
+/// <typeparam name="TItem">The type of items contained in the collection.</typeparam>
+public class ObservableCollectionEx<TItem> : IListEx<TItem>, IList, INotifyCollectionChanged, INotifyPropertyChanged
 {
-	using System;
-	using System.Collections;
-	using System.Collections.Generic;
-	using System.Collections.Specialized;
-	using System.ComponentModel;
-	using System.Linq;
-
-	using Ecng.Collections;
+	private readonly List<TItem> _items = [];
 
 	/// <summary>
-	/// Represents an observable collection with extended methods, including range operations.
+	/// Occurs when the collection changes.
 	/// </summary>
-	/// <typeparam name="TItem">The type of items contained in the collection.</typeparam>
-	public class ObservableCollectionEx<TItem> : IListEx<TItem>, IList, INotifyCollectionChanged, INotifyPropertyChanged
-	{
-		private readonly List<TItem> _items = [];
+	public event NotifyCollectionChangedEventHandler CollectionChanged;
 
-		/// <summary>
-		/// Occurs when the collection changes.
-		/// </summary>
-		public event NotifyCollectionChangedEventHandler CollectionChanged;
+	/// <summary>
+	/// Occurs when a property value changes.
+	/// </summary>
+	public event PropertyChangedEventHandler PropertyChanged;
 
-		/// <summary>
-		/// Occurs when a property value changes.
-		/// </summary>
-		public event PropertyChangedEventHandler PropertyChanged;
+	private Action<IEnumerable<TItem>> _addedRange;
 
-		private Action<IEnumerable<TItem>> _addedRange;
+	/// <summary>
+	/// Occurs after a range of items has been added to the collection.
+	/// </summary>
+	public event Action<IEnumerable<TItem>> AddedRange
+	{
+		add => _addedRange += value;
+		remove => _addedRange -= value;
+	}
 
-		/// <summary>
-		/// Occurs after a range of items has been added to the collection.
-		/// </summary>
-		public event Action<IEnumerable<TItem>> AddedRange
-		{
-			add => _addedRange += value;
-			remove => _addedRange -= value;
-		}
+	private Action<IEnumerable<TItem>> _removedRange;
 
-		private Action<IEnumerable<TItem>> _removedRange;
+	/// <summary>
+	/// Occurs after a range of items has been removed from the collection.
+	/// </summary>
+	public event Action<IEnumerable<TItem>> RemovedRange
+	{
+		add => _removedRange += value;
+		remove => _removedRange -= value;
+	}
 
-		/// <summary>
-		/// Occurs after a range of items has been removed from the collection.
-		/// </summary>
-		public event Action<IEnumerable<TItem>> RemovedRange
-		{
-			add => _removedRange += value;
-			remove => _removedRange -= value;
-		}
+	/// <summary>
+	/// Adds a range of items to the collection.
+	/// </summary>
+	/// <param name="items">The items to add.</param>
+	public virtual void AddRange(IEnumerable<TItem> items)
+	{
+		var arr = items.ToArray();
 
-		/// <summary>
-		/// Adds a range of items to the collection.
-		/// </summary>
-		/// <param name="items">The items to add.</param>
-		public virtual void AddRange(IEnumerable<TItem> items)
-		{
-			var arr = items.ToArray();
+		if (arr.Length == 0)
+			return;
 
-			if (arr.Length == 0)
-				return;
+		var index = _items.Count;
 
-			var index = _items.Count;
+		_items.AddRange(arr);
 
-			_items.AddRange(arr);
+		OnCountPropertyChanged();
+		OnIndexerPropertyChanged();
 
-			OnCountPropertyChanged();
-			OnIndexerPropertyChanged();
+		OnCollectionChanged(NotifyCollectionChangedAction.Add, arr, index);
+	}
 
-			OnCollectionChanged(NotifyCollectionChangedAction.Add, arr, index);
-		}
+	/// <summary>
+	/// Removes a range of items from the collection.
+	/// </summary>
+	/// <param name="items">The items to remove.</param>
+	public virtual void RemoveRange(IEnumerable<TItem> items)
+	{
+		var arr = items.ToArray();
 
-		/// <summary>
-		/// Removes a range of items from the collection.
-		/// </summary>
-		/// <param name="items">The items to remove.</param>
-		public virtual void RemoveRange(IEnumerable<TItem> items)
+		if (arr.Length > 10000 || arr.Length > Count * 0.1)
 		{
-			var arr = items.ToArray();
-
-			if (arr.Length > 10000 || arr.Length > Count * 0.1)
-			{
-				var temp = new HashSet<TItem>(_items);
-				temp.RemoveRange(arr);
-
-				Clear();
-				AddRange(temp);
-			}
-			else
-				arr.ForEach(i => Remove(i));
+			var temp = new HashSet<TItem>(_items);
+			temp.RemoveRange(arr);
+
+			Clear();
+			AddRange(temp);
 		}
+		else
+			arr.ForEach(i => Remove(i));
+	}
 
-		/// <summary>
-		/// Removes a specified range of items starting at a given index.
-		/// </summary>
-		/// <param name="index">The starting index.</param>
-		/// <param name="count">The number of items to remove.</param>
-		/// <returns>The number of removed items.</returns>
-		public virtual int RemoveRange(int index, int count)
-		{
-			var items = _items.GetRange(index, count).ToArray();
+	/// <summary>
+	/// Removes a specified range of items starting at a given index.
+	/// </summary>
+	/// <param name="index">The starting index.</param>
+	/// <param name="count">The number of items to remove.</param>
+	/// <returns>The number of removed items.</returns>
+	public virtual int RemoveRange(int index, int count)
+	{
+		var items = _items.GetRange(index, count).ToArray();
 
-			if (items.Length == 0)
-				return 0;
+		if (items.Length == 0)
+			return 0;
 
-			_items.RemoveRange(index, count);
+		_items.RemoveRange(index, count);
 
-			OnRemove(items, index);
+		OnRemove(items, index);
 
-			return items.Length;
-		}
+		return items.Length;
+	}
 
-		/// <summary>
-		/// Returns an enumerator that iterates through the collection.
-		/// </summary>
-		/// <returns>An enumerator for the collection.</returns>
-		public IEnumerator<TItem> GetEnumerator()
-		{
-			return _items.GetEnumerator();
-		}
+	/// <summary>
+	/// Returns an enumerator that iterates through the collection.
+	/// </summary>
+	/// <returns>An enumerator for the collection.</returns>
+	public IEnumerator<TItem> GetEnumerator()
+	{
+		return _items.GetEnumerator();
+	}
 
-		IEnumerator IEnumerable.GetEnumerator()
-		{
-			return GetEnumerator();
-		}
+	IEnumerator IEnumerable.GetEnumerator()
+	{
+		return GetEnumerator();
+	}
 
-		/// <summary>
-		/// Adds an item to the collection.
-		/// </summary>
-		/// <param name="item">The item to add.</param>
-		public virtual void Add(TItem item)
-		{
-			AddRange([item]);
-		}
+	/// <summary>
+	/// Adds an item to the collection.
+	/// </summary>
+	/// <param name="item">The item to add.</param>
+	public virtual void Add(TItem item)
+	{
+		AddRange([item]);
+	}
 
-		/// <summary>
-		/// Removes the first occurrence of a specific item from the collection.
-		/// </summary>
-		/// <param name="item">The item to remove.</param>
-		/// <returns>true if the item was successfully removed; otherwise, false.</returns>
-		public virtual bool Remove(TItem item)
-		{
-			var index = _items.IndexOf(item);
+	/// <summary>
+	/// Removes the first occurrence of a specific item from the collection.
+	/// </summary>
+	/// <param name="item">The item to remove.</param>
+	/// <returns>true if the item was successfully removed; otherwise, false.</returns>
+	public virtual bool Remove(TItem item)
+	{
+		var index = _items.IndexOf(item);
 
-			if (index == -1)
-				return false;
+		if (index == -1)
+			return false;
 
-			_items.RemoveAt(index);
+		_items.RemoveAt(index);
 
-			OnRemove([item], index);
-			return true;
-		}
+		OnRemove([item], index);
+		return true;
+	}
 
-		int IList.Add(object value)
-		{
-			Add((TItem)value);
-			return Count - 1;
-		}
+	int IList.Add(object value)
+	{
+		Add((TItem)value);
+		return Count - 1;
+	}
 
-		bool IList.Contains(object value)
-		{
-			return Contains((TItem)value);
-		}
+	bool IList.Contains(object value)
+	{
+		return Contains((TItem)value);
+	}
 
-		/// <summary>
-		/// Removes all items from the collection.
-		/// </summary>
-		public virtual void Clear()
-		{
-			_items.Clear();
+	/// <summary>
+	/// Removes all items from the collection.
+	/// </summary>
+	public virtual void Clear()
+	{
+		_items.Clear();
 
-			OnCountPropertyChanged();
-			OnIndexerPropertyChanged();
-			OnCollectionReset();
-		}
+		OnCountPropertyChanged();
+		OnIndexerPropertyChanged();
+		OnCollectionReset();
+	}
 
-		int IList.IndexOf(object value)
-		{
-			return IndexOf((TItem)value);
-		}
+	int IList.IndexOf(object value)
+	{
+		return IndexOf((TItem)value);
+	}
 
-		void IList.Insert(int index, object value)
-		{
-			Insert(index, (TItem)value);
-		}
+	void IList.Insert(int index, object value)
+	{
+		Insert(index, (TItem)value);
+	}
 
-		void IList.Remove(object value)
-		{
-			Remove((TItem)value);
-		}
+	void IList.Remove(object value)
+	{
+		Remove((TItem)value);
+	}
 
-		/// <summary>
-		/// Determines whether the collection contains a specific value.
-		/// </summary>
-		/// <param name="item">The item to locate.</param>
-		/// <returns>true if the item is found; otherwise, false.</returns>
-		public bool Contains(TItem item)
-		{
-			return _items.Contains(item);
-		}
+	/// <summary>
+	/// Determines whether the collection contains a specific value.
+	/// </summary>
+	/// <param name="item">The item to locate.</param>
+	/// <returns>true if the item is found; otherwise, false.</returns>
+	public bool Contains(TItem item)
+	{
+		return _items.Contains(item);
+	}
 
-		/// <summary>
-		/// Copies the elements of the collection to an array, starting at a particular index.
-		/// </summary>
-		/// <param name="array">The destination array.</param>
-		/// <param name="arrayIndex">The zero-based index at which copying begins.</param>
-		public void CopyTo(TItem[] array, int arrayIndex)
-		{
-			_items.CopyTo(array, arrayIndex);
-		}
+	/// <summary>
+	/// Copies the elements of the collection to an array, starting at a particular index.
+	/// </summary>
+	/// <param name="array">The destination array.</param>
+	/// <param name="arrayIndex">The zero-based index at which copying begins.</param>
+	public void CopyTo(TItem[] array, int arrayIndex)
+	{
+		_items.CopyTo(array, arrayIndex);
+	}
 
-		void ICollection.CopyTo(Array array, int index)
-		{
-			if (array is not TItem[] items)
-				items = [.. array.Cast<TItem>()];
+	void ICollection.CopyTo(Array array, int index)
+	{
+		if (array is not TItem[] items)
+			items = [.. array.Cast<TItem>()];
 
-			CopyTo(items, index);
-		}
+		CopyTo(items, index);
+	}
 
-		/// <summary>
-		/// Gets the number of elements contained in the collection.
-		/// </summary>
-		public int Count => _items.Count;
+	/// <summary>
+	/// Gets the number of elements contained in the collection.
+	/// </summary>
+	public int Count => _items.Count;
 
-		object ICollection.SyncRoot => this;
+	object ICollection.SyncRoot => this;
 
-		bool ICollection.IsSynchronized => true;
+	bool ICollection.IsSynchronized => true;
 
-		/// <summary>
-		/// Gets a value indicating whether the collection is read-only.
-		/// </summary>
-		public bool IsReadOnly => false;
+	/// <summary>
+	/// Gets a value indicating whether the collection is read-only.
+	/// </summary>
+	public bool IsReadOnly => false;
 
-		bool IList.IsFixedSize => false;
+	bool IList.IsFixedSize => false;
 
-		/// <summary>
-		/// Determines the index of a specific item in the collection.
-		/// </summary>
-		/// <param name="item">The item to locate.</param>
-		/// <returns>The index of the item if found; otherwise, -1.</returns>
-		public int IndexOf(TItem item)
-		{
-			return _items.IndexOf(item);
-		}
+	/// <summary>
+	/// Determines the index of a specific item in the collection.
+	/// </summary>
+	/// <param name="item">The item to locate.</param>
+	/// <returns>The index of the item if found; otherwise, -1.</returns>
+	public int IndexOf(TItem item)
+	{
+		return _items.IndexOf(item);
+	}
 
-		/// <summary>
-		/// Inserts an item into the collection at the specified index.
-		/// </summary>
-		/// <param name="index">The index at which the item should be inserted.</param>
-		/// <param name="item">The item to insert.</param>
-		public void Insert(int index, TItem item)
-		{
-			_items.Insert(index, item);
+	/// <summary>
+	/// Inserts an item into the collection at the specified index.
+	/// </summary>
+	/// <param name="index">The index at which the item should be inserted.</param>
+	/// <param name="item">The item to insert.</param>
+	public void Insert(int index, TItem item)
+	{
+		_items.Insert(index, item);
 
-			OnCountPropertyChanged();
-			OnIndexerPropertyChanged();
+		OnCountPropertyChanged();
+		OnIndexerPropertyChanged();
 
-			OnCollectionChanged(NotifyCollectionChangedAction.Add, [item], index);
-		}
+		OnCollectionChanged(NotifyCollectionChangedAction.Add, [item], index);
+	}
 
-		/// <summary>
-		/// Removes the item at the specified index of the collection.
-		/// </summary>
-		/// <param name="index">The zero-based index of the item to remove.</param>
-		public void RemoveAt(int index)
-		{
-			var item = _items[index];
-			_items.RemoveAt(index);
+	/// <summary>
+	/// Removes the item at the specified index of the collection.
+	/// </summary>
+	/// <param name="index">The zero-based index of the item to remove.</param>
+	public void RemoveAt(int index)
+	{
+		var item = _items[index];
+		_items.RemoveAt(index);
 
-			OnRemove([item], index);
-		}
+		OnRemove([item], index);
+	}
 
-		object IList.this[int index]
-		{
-			get => this[index];
-			set => this[index] = (TItem)value;
-		}
+	object IList.this[int index]
+	{
+		get => this[index];
+		set => this[index] = (TItem)value;
+	}
 
-		/// <summary>
-		/// Gets or sets the element at the specified index.
-		/// </summary>
-		/// <param name="index">The zero-based index of the element to get or set.</param>
-		/// <returns>The element at the specified index.</returns>
-		public TItem this[int index]
+	/// <summary>
+	/// Gets or sets the element at the specified index.
+	/// </summary>
+	/// <param name="index">The zero-based index of the element to get or set.</param>
+	/// <returns>The element at the specified index.</returns>
+	public TItem this[int index]
+	{
+		get => _items[index];
+		set
 		{
-			get => _items[index];
-			set
-			{
-				var originalItem = _items[index];
-				_items[index] = value;
-
-				OnIndexerPropertyChanged();
-				OnCollectionChanged(NotifyCollectionChangedAction.Replace, originalItem, value, index);
-			}
-		}
+			var originalItem = _items[index];
+			_items[index] = value;
 
-		/// <summary>
-		/// Raises the collection changed event for a removal.
-		/// </summary>
-		/// <param name="items">The items removed.</param>
-		/// <param name="index">The index from which the items were removed.</param>
-		private void OnRemove(IList<TItem> items, int index)
-		{
-			OnCountPropertyChanged();
 			OnIndexerPropertyChanged();
-
-			OnCollectionChanged(NotifyCollectionChangedAction.Remove, items, index);
+			OnCollectionChanged(NotifyCollectionChangedAction.Replace, originalItem, value, index);
 		}
+	}
 
-		/// <summary>
-		/// Raises the PropertyChanged event.
-		/// </summary>
-		/// <param name="propertyName">The name of the property that changed.</param>
-		protected void OnPropertyChanged(string propertyName)
-		{
-			var evt = PropertyChanged;
-			evt?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-		}
+	/// <summary>
+	/// Raises the collection changed event for a removal.
+	/// </summary>
+	/// <param name="items">The items removed.</param>
+	/// <param name="index">The index from which the items were removed.</param>
+	private void OnRemove(IList<TItem> items, int index)
+	{
+		OnCountPropertyChanged();
+		OnIndexerPropertyChanged();
+
+		OnCollectionChanged(NotifyCollectionChangedAction.Remove, items, index);
+	}
+
+	/// <summary>
+	/// Raises the PropertyChanged event.
+	/// </summary>
+	/// <param name="propertyName">The name of the property that changed.</param>
+	protected void OnPropertyChanged(string propertyName)
+	{
+		var evt = PropertyChanged;
+		evt?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+	}
 
-		private void OnCountPropertyChanged() => OnPropertyChanged("Count");
+	private void OnCountPropertyChanged() => OnPropertyChanged("Count");
 
-		// This must agree with Binding.IndexerName.  It is declared separately
-		// here so as to avoid a dependency on PresentationFramework.dll.
-		private void OnIndexerPropertyChanged() => OnPropertyChanged("Item[]");
+	// This must agree with Binding.IndexerName.  It is declared separately
+	// here so as to avoid a dependency on PresentationFramework.dll.
+	private void OnIndexerPropertyChanged() => OnPropertyChanged("Item[]");
 
-		private void OnCollectionChanged(NotifyCollectionChangedAction action, IList<TItem> items, int index)              => OnCollectionChanged(new NotifyCollectionChangedEventArgs(action, (IList)items, index));
-		private void OnCollectionChanged(NotifyCollectionChangedAction action, object item, int index)                     => OnCollectionChanged(new NotifyCollectionChangedEventArgs(action, item, index));
-		private void OnCollectionChanged(NotifyCollectionChangedAction action, object item, int index, int oldIndex)       => OnCollectionChanged(new NotifyCollectionChangedEventArgs(action, item, index, oldIndex));
-		private void OnCollectionChanged(NotifyCollectionChangedAction action, object oldItem, object newItem, int index)  => OnCollectionChanged(new NotifyCollectionChangedEventArgs(action, newItem, oldItem, index));
+	private void OnCollectionChanged(NotifyCollectionChangedAction action, IList<TItem> items, int index)              => OnCollectionChanged(new NotifyCollectionChangedEventArgs(action, (IList)items, index));
+	private void OnCollectionChanged(NotifyCollectionChangedAction action, object item, int index)                     => OnCollectionChanged(new NotifyCollectionChangedEventArgs(action, item, index));
+	private void OnCollectionChanged(NotifyCollectionChangedAction action, object item, int index, int oldIndex)       => OnCollectionChanged(new NotifyCollectionChangedEventArgs(action, item, index, oldIndex));
+	private void OnCollectionChanged(NotifyCollectionChangedAction action, object oldItem, object newItem, int index)  => OnCollectionChanged(new NotifyCollectionChangedEventArgs(action, newItem, oldItem, index));
 
-		/// <summary>
-		/// Raises the CollectionChanged event.
-		/// </summary>
-		/// <param name="args">Details about the change.</param>
-		private void OnCollectionChanged(NotifyCollectionChangedEventArgs args)
-		{
-			if (args.OldItems?.Count > 0)
-				_removedRange?.Invoke(args.OldItems.Cast<TItem>());
+	/// <summary>
+	/// Raises the CollectionChanged event.
+	/// </summary>
+	/// <param name="args">Details about the change.</param>
+	private void OnCollectionChanged(NotifyCollectionChangedEventArgs args)
+	{
+		if (args.OldItems?.Count > 0)
+			_removedRange?.Invoke(args.OldItems.Cast<TItem>());
 
-			if (args.NewItems?.Count > 0)
-				_addedRange?.Invoke(args.NewItems.Cast<TItem>());
+		if (args.NewItems?.Count > 0)
+			_addedRange?.Invoke(args.NewItems.Cast<TItem>());
 
-			var evt = CollectionChanged;
-			if (evt == null)
-				return;
+		var evt = CollectionChanged;
+		if (evt == null)
+			return;
 
-			ProcessCollectionChanged(evt.GetInvocationList().Cast<NotifyCollectionChangedEventHandler>(), args);
-		}
+		ProcessCollectionChanged(evt.GetInvocationList().Cast<NotifyCollectionChangedEventHandler>(), args);
+	}
 
-		/// <summary>
-		/// Processes the NotifyCollectionChangedEventHandler subscribers.
-		/// </summary>
-		/// <param name="subscribers">The collection of subscribers.</param>
-		/// <param name="args">Details about the change.</param>
-		protected virtual void ProcessCollectionChanged(IEnumerable<NotifyCollectionChangedEventHandler> subscribers, NotifyCollectionChangedEventArgs args)
-		{
-			foreach (var subscriber in subscribers)
-				subscriber(this, args);
-		}
+	/// <summary>
+	/// Processes the NotifyCollectionChangedEventHandler subscribers.
+	/// </summary>
+	/// <param name="subscribers">The collection of subscribers.</param>
+	/// <param name="args">Details about the change.</param>
+	protected virtual void ProcessCollectionChanged(IEnumerable<NotifyCollectionChangedEventHandler> subscribers, NotifyCollectionChangedEventArgs args)
+	{
+		foreach (var subscriber in subscribers)
+			subscriber(this, args);
+	}
 
-		/// <summary>
-		/// Raises the CollectionChanged event with a reset action.
-		/// </summary>
-		private void OnCollectionReset()
-		{
-			var evt = CollectionChanged;
-			evt?.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
-		}
+	/// <summary>
+	/// Raises the CollectionChanged event with a reset action.
+	/// </summary>
+	private void OnCollectionReset()
+	{
+		var evt = CollectionChanged;
+		evt?.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
 	}
 }
diff --git a/ComponentModel/ObservableDictionary.cs b/ComponentModel/ObservableDictionary.cs
index 50842d65..014c847e 100644
--- a/ComponentModel/ObservableDictionary.cs
+++ b/ComponentModel/ObservableDictionary.cs
@@ -1,939 +1,938 @@
-namespace Ecng.ComponentModel
+namespace Ecng.ComponentModel;
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+using System.Runtime.Serialization;
+
+// http://drwpf.com/blog/2007/09/16/can-i-bind-my-itemscontrol-to-a-dictionary/
+
+/// <summary>
+/// Represents an observable dictionary that raises notifications when items are added, removed, or refreshed.
+/// </summary>
+/// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
+/// <typeparam name="TValue">The type of values in the dictionary.</typeparam>
+[Serializable]
+public class ObservableDictionary<TKey, TValue> :
+	IDictionary<TKey, TValue>,
+	IDictionary,
+	ISerializable,
+	IDeserializationCallback,
+	INotifyCollectionChanged,
+	INotifyPropertyChanged
 {
-	using System;
-	using System.Collections;
-	using System.Collections.Generic;
-	using System.Collections.ObjectModel;
-	using System.Collections.Specialized;
-	using System.ComponentModel;
-	using System.Runtime.InteropServices;
-	using System.Runtime.Serialization;
-
-	// http://drwpf.com/blog/2007/09/16/can-i-bind-my-itemscontrol-to-a-dictionary/
-
-	/// <summary>
-	/// Represents an observable dictionary that raises notifications when items are added, removed, or refreshed.
-	/// </summary>
-	/// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
-	/// <typeparam name="TValue">The type of values in the dictionary.</typeparam>
-	[Serializable]
-	public class ObservableDictionary<TKey, TValue> :
-		IDictionary<TKey, TValue>,
-		IDictionary,
-		ISerializable,
-		IDeserializationCallback,
-		INotifyCollectionChanged,
-		INotifyPropertyChanged
-	{
-		#region constructors
+	#region constructors
 
-		#region public
+	#region public
 
-		/// <summary>
-		/// Initializes a new instance of the ObservableDictionary class.
-		/// </summary>
-		public ObservableDictionary()
-		{
-			_keyedEntryCollection = new KeyedDictionaryEntryCollection();
-		}
+	/// <summary>
+	/// Initializes a new instance of the ObservableDictionary class.
+	/// </summary>
+	public ObservableDictionary()
+	{
+		_keyedEntryCollection = new KeyedDictionaryEntryCollection();
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the ObservableDictionary class with the specified dictionary.
-		/// </summary>
-		/// <param name="dictionary">The dictionary whose elements are copied to the new ObservableDictionary.</param>
-		public ObservableDictionary(IDictionary<TKey, TValue> dictionary)
-		{
-			_keyedEntryCollection = new KeyedDictionaryEntryCollection();
+	/// <summary>
+	/// Initializes a new instance of the ObservableDictionary class with the specified dictionary.
+	/// </summary>
+	/// <param name="dictionary">The dictionary whose elements are copied to the new ObservableDictionary.</param>
+	public ObservableDictionary(IDictionary<TKey, TValue> dictionary)
+	{
+		_keyedEntryCollection = new KeyedDictionaryEntryCollection();
 
-			foreach (var entry in dictionary)
-				DoAddEntry(entry.Key, entry.Value);
-		}
+		foreach (var entry in dictionary)
+			DoAddEntry(entry.Key, entry.Value);
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the ObservableDictionary class that uses the specified key comparer.
-		/// </summary>
-		/// <param name="comparer">The comparer to use when comparing keys.</param>
-		public ObservableDictionary(IEqualityComparer<TKey> comparer)
-		{
-			_keyedEntryCollection = new KeyedDictionaryEntryCollection(comparer);
-		}
+	/// <summary>
+	/// Initializes a new instance of the ObservableDictionary class that uses the specified key comparer.
+	/// </summary>
+	/// <param name="comparer">The comparer to use when comparing keys.</param>
+	public ObservableDictionary(IEqualityComparer<TKey> comparer)
+	{
+		_keyedEntryCollection = new KeyedDictionaryEntryCollection(comparer);
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the ObservableDictionary class with the specified dictionary and key comparer.
-		/// </summary>
-		/// <param name="dictionary">The dictionary whose elements are copied to the new ObservableDictionary.</param>
-		/// <param name="comparer">The comparer to use when comparing keys.</param>
-		public ObservableDictionary(IDictionary<TKey, TValue> dictionary, IEqualityComparer<TKey> comparer)
-		{
-			_keyedEntryCollection = new KeyedDictionaryEntryCollection(comparer);
+	/// <summary>
+	/// Initializes a new instance of the ObservableDictionary class with the specified dictionary and key comparer.
+	/// </summary>
+	/// <param name="dictionary">The dictionary whose elements are copied to the new ObservableDictionary.</param>
+	/// <param name="comparer">The comparer to use when comparing keys.</param>
+	public ObservableDictionary(IDictionary<TKey, TValue> dictionary, IEqualityComparer<TKey> comparer)
+	{
+		_keyedEntryCollection = new KeyedDictionaryEntryCollection(comparer);
 
-			foreach (var entry in dictionary)
-				DoAddEntry(entry.Key, entry.Value);
-		}
+		foreach (var entry in dictionary)
+			DoAddEntry(entry.Key, entry.Value);
+	}
 
-		#endregion public
+	#endregion public
 
-		#region protected
+	#region protected
 
-		/// <summary>
-		/// Initializes a new instance of the ObservableDictionary class from serialization data.
-		/// </summary>
-		/// <param name="info">The SerializationInfo to populate with data.</param>
-		/// <param name="context">The destination for this serialization.</param>
-		protected ObservableDictionary(SerializationInfo info, StreamingContext context)
-		{
-			_siInfo = info;
-		}
+	/// <summary>
+	/// Initializes a new instance of the ObservableDictionary class from serialization data.
+	/// </summary>
+	/// <param name="info">The SerializationInfo to populate with data.</param>
+	/// <param name="context">The destination for this serialization.</param>
+	protected ObservableDictionary(SerializationInfo info, StreamingContext context)
+	{
+		_siInfo = info;
+	}
 
-		#endregion protected
+	#endregion protected
 
-		#endregion constructors
+	#endregion constructors
 
-		#region properties
+	#region properties
 
-		#region public
+	#region public
 
-		/// <summary>
-		/// Gets the comparer used to compare keys in the dictionary.
-		/// </summary>
-		public IEqualityComparer<TKey> Comparer => _keyedEntryCollection.Comparer;
+	/// <summary>
+	/// Gets the comparer used to compare keys in the dictionary.
+	/// </summary>
+	public IEqualityComparer<TKey> Comparer => _keyedEntryCollection.Comparer;
 
-		/// <summary>
-		/// Gets the number of key-value pairs contained in the dictionary.
-		/// </summary>
-		public int Count => _keyedEntryCollection.Count;
+	/// <summary>
+	/// Gets the number of key-value pairs contained in the dictionary.
+	/// </summary>
+	public int Count => _keyedEntryCollection.Count;
 
-		/// <summary>
-		/// Gets the collection of keys in the dictionary.
-		/// </summary>
-		public Dictionary<TKey, TValue>.KeyCollection Keys => TrueDictionary.Keys;
+	/// <summary>
+	/// Gets the collection of keys in the dictionary.
+	/// </summary>
+	public Dictionary<TKey, TValue>.KeyCollection Keys => TrueDictionary.Keys;
 
-		/// <summary>
-		/// Gets or sets the value associated with the specified key.
-		/// </summary>
-		/// <param name="key">The key of the value to get or set.</param>
-		public TValue this[TKey key]
-		{
-			get => (TValue)_keyedEntryCollection[key].Value;
-			set => DoSetEntry(key, value);
-		}
+	/// <summary>
+	/// Gets or sets the value associated with the specified key.
+	/// </summary>
+	/// <param name="key">The key of the value to get or set.</param>
+	public TValue this[TKey key]
+	{
+		get => (TValue)_keyedEntryCollection[key].Value;
+		set => DoSetEntry(key, value);
+	}
 
-		/// <summary>
-		/// Gets the collection of values in the dictionary.
-		/// </summary>
-		public Dictionary<TKey, TValue>.ValueCollection Values => TrueDictionary.Values;
+	/// <summary>
+	/// Gets the collection of values in the dictionary.
+	/// </summary>
+	public Dictionary<TKey, TValue>.ValueCollection Values => TrueDictionary.Values;
 
-		#endregion public
+	#endregion public
 
-		#region private
+	#region private
 
-		private Dictionary<TKey, TValue> TrueDictionary
+	private Dictionary<TKey, TValue> TrueDictionary
+	{
+		get
 		{
-			get
+			if (_dictionaryCacheVersion != _version)
 			{
-				if (_dictionaryCacheVersion != _version)
-				{
-					_dictionaryCache.Clear();
-					foreach (DictionaryEntry entry in _keyedEntryCollection)
-						_dictionaryCache.Add((TKey)entry.Key, (TValue)entry.Value);
-					_dictionaryCacheVersion = _version;
-				}
-				return _dictionaryCache;
+				_dictionaryCache.Clear();
+				foreach (DictionaryEntry entry in _keyedEntryCollection)
+					_dictionaryCache.Add((TKey)entry.Key, (TValue)entry.Value);
+				_dictionaryCacheVersion = _version;
 			}
+			return _dictionaryCache;
 		}
+	}
 
-		#endregion private
+	#endregion private
 
-		#endregion properties
+	#endregion properties
 
-		#region methods
+	#region methods
 
-		#region public
+	#region public
 
-		/// <summary>
-		/// Adds the specified key and value to the dictionary.
-		/// </summary>
-		/// <param name="key">The key of the element to add.</param>
-		/// <param name="value">The value of the element to add.</param>
-		public void Add(TKey key, TValue value)
-		{
-			DoAddEntry(key, value);
-		}
+	/// <summary>
+	/// Adds the specified key and value to the dictionary.
+	/// </summary>
+	/// <param name="key">The key of the element to add.</param>
+	/// <param name="value">The value of the element to add.</param>
+	public void Add(TKey key, TValue value)
+	{
+		DoAddEntry(key, value);
+	}
 
-		/// <summary>
-		/// Removes all keys and values from the dictionary.
-		/// </summary>
-		public void Clear()
-		{
-			DoClearEntries();
-		}
+	/// <summary>
+	/// Removes all keys and values from the dictionary.
+	/// </summary>
+	public void Clear()
+	{
+		DoClearEntries();
+	}
 
-		/// <summary>
-		/// Determines whether the dictionary contains the specified key.
-		/// </summary>
-		/// <param name="key">The key to locate in the dictionary.</param>
-		public bool ContainsKey(TKey key)
-		{
-			return _keyedEntryCollection.Contains(key);
-		}
+	/// <summary>
+	/// Determines whether the dictionary contains the specified key.
+	/// </summary>
+	/// <param name="key">The key to locate in the dictionary.</param>
+	public bool ContainsKey(TKey key)
+	{
+		return _keyedEntryCollection.Contains(key);
+	}
 
-		/// <summary>
-		/// Determines whether the dictionary contains a specific value.
-		/// </summary>
-		/// <param name="value">The value to locate in the dictionary.</param>
-		public bool ContainsValue(TValue value)
-		{
-			return TrueDictionary.ContainsValue(value);
-		}
+	/// <summary>
+	/// Determines whether the dictionary contains a specific value.
+	/// </summary>
+	/// <param name="value">The value to locate in the dictionary.</param>
+	public bool ContainsValue(TValue value)
+	{
+		return TrueDictionary.ContainsValue(value);
+	}
 
-		/// <summary>
-		/// Returns an enumerator that iterates through the dictionary.
-		/// </summary>
-		public IEnumerator GetEnumerator()
-		{
-			return new Enumerator(this, false);
-		}
+	/// <summary>
+	/// Returns an enumerator that iterates through the dictionary.
+	/// </summary>
+	public IEnumerator GetEnumerator()
+	{
+		return new Enumerator(this, false);
+	}
 
-		/// <summary>
-		/// Removes the value with the specified key from the dictionary.
-		/// </summary>
-		/// <param name="key">The key of the element to remove.</param>
-		public bool Remove(TKey key)
-		{
-			return DoRemoveEntry(key);
-		}
+	/// <summary>
+	/// Removes the value with the specified key from the dictionary.
+	/// </summary>
+	/// <param name="key">The key of the element to remove.</param>
+	public bool Remove(TKey key)
+	{
+		return DoRemoveEntry(key);
+	}
 
-		/// <summary>
-		/// Gets the value associated with the specified key.
-		/// </summary>
-		/// <param name="key">The key of the element to locate.</param>
-		/// <param name="value">When this method returns, the value associated with the specified key, if found; otherwise, the default value for the type.</param>
-		public bool TryGetValue(TKey key, out TValue value)
-		{
-			var result = _keyedEntryCollection.Contains(key);
-			value = result ? (TValue)_keyedEntryCollection[key].Value : default;
-			return result;
-		}
+	/// <summary>
+	/// Gets the value associated with the specified key.
+	/// </summary>
+	/// <param name="key">The key of the element to locate.</param>
+	/// <param name="value">When this method returns, the value associated with the specified key, if found; otherwise, the default value for the type.</param>
+	public bool TryGetValue(TKey key, out TValue value)
+	{
+		var result = _keyedEntryCollection.Contains(key);
+		value = result ? (TValue)_keyedEntryCollection[key].Value : default;
+		return result;
+	}
 
-		#endregion public
+	#endregion public
 
-		#region protected
+	#region protected
 
-		/// <summary>
-		/// Called before adding an entry to the dictionary.
-		/// </summary>
-		/// <param name="key">The key for the entry to add.</param>
-		/// <param name="value">The value for the entry to add.</param>
-		/// <returns>True if the entry is added; otherwise, false.</returns>
-		protected virtual bool AddEntry(TKey key, TValue value)
-		{
-			_keyedEntryCollection.Add(new DictionaryEntry(key, value));
-			return true;
-		}
+	/// <summary>
+	/// Called before adding an entry to the dictionary.
+	/// </summary>
+	/// <param name="key">The key for the entry to add.</param>
+	/// <param name="value">The value for the entry to add.</param>
+	/// <returns>True if the entry is added; otherwise, false.</returns>
+	protected virtual bool AddEntry(TKey key, TValue value)
+	{
+		_keyedEntryCollection.Add(new DictionaryEntry(key, value));
+		return true;
+	}
 
-		/// <summary>
-		/// Called to clear all entries from the dictionary.
-		/// </summary>
-		/// <returns>True if there were entries to clear; otherwise, false.</returns>
-		protected virtual bool ClearEntries()
+	/// <summary>
+	/// Called to clear all entries from the dictionary.
+	/// </summary>
+	/// <returns>True if there were entries to clear; otherwise, false.</returns>
+	protected virtual bool ClearEntries()
+	{
+		bool result = (Count > 0);
+		if (result)
 		{
-			bool result = (Count > 0);
-			if (result)
-			{
-				_keyedEntryCollection.Clear();
-			}
-			return result;
+			_keyedEntryCollection.Clear();
 		}
+		return result;
+	}
 
-		/// <summary>
-		/// Retrieves the index and entry associated with the specified key.
-		/// </summary>
-		/// <param name="key">The key to locate in the dictionary.</param>
-		/// <param name="entry">When this method returns, contains the DictionaryEntry for the specified key, if found.</param>
-		/// <returns>The index of the entry if found; otherwise, -1.</returns>
-		protected int GetIndexAndEntryForKey(TKey key, out DictionaryEntry entry)
+	/// <summary>
+	/// Retrieves the index and entry associated with the specified key.
+	/// </summary>
+	/// <param name="key">The key to locate in the dictionary.</param>
+	/// <param name="entry">When this method returns, contains the DictionaryEntry for the specified key, if found.</param>
+	/// <returns>The index of the entry if found; otherwise, -1.</returns>
+	protected int GetIndexAndEntryForKey(TKey key, out DictionaryEntry entry)
+	{
+		entry = new DictionaryEntry();
+		int index = -1;
+		if (_keyedEntryCollection.Contains(key))
 		{
-			entry = new DictionaryEntry();
-			int index = -1;
-			if (_keyedEntryCollection.Contains(key))
-			{
-				entry = _keyedEntryCollection[key];
-				index = _keyedEntryCollection.IndexOf(entry);
-			}
-			return index;
+			entry = _keyedEntryCollection[key];
+			index = _keyedEntryCollection.IndexOf(entry);
 		}
+		return index;
+	}
 
-		/// <summary>
-		/// Raises the CollectionChanged event with the provided arguments.
-		/// </summary>
-		/// <param name="args">Details of the change.</param>
-		protected virtual void OnCollectionChanged(NotifyCollectionChangedEventArgs args)
-		{
-			_collectionChanged?.Invoke(this, args);
-		}
+	/// <summary>
+	/// Raises the CollectionChanged event with the provided arguments.
+	/// </summary>
+	/// <param name="args">Details of the change.</param>
+	protected virtual void OnCollectionChanged(NotifyCollectionChangedEventArgs args)
+	{
+		_collectionChanged?.Invoke(this, args);
+	}
 
-		/// <summary>
-		/// Raises the PropertyChanged event for the specified property name.
-		/// </summary>
-		/// <param name="name">The name of the property that changed.</param>
-		protected virtual void OnPropertyChanged(string name)
-		{
-			_propertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
-		}
+	/// <summary>
+	/// Raises the PropertyChanged event for the specified property name.
+	/// </summary>
+	/// <param name="name">The name of the property that changed.</param>
+	protected virtual void OnPropertyChanged(string name)
+	{
+		_propertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
+	}
 
-		/// <summary>
-		/// Called to remove an entry with the specified key from the dictionary.
-		/// </summary>
-		/// <param name="key">The key of the entry to remove.</param>
-		/// <returns>True if the entry was removed; otherwise, false.</returns>
-		protected virtual bool RemoveEntry(TKey key)
-		{
-			return _keyedEntryCollection.Remove(key);
-		}
+	/// <summary>
+	/// Called to remove an entry with the specified key from the dictionary.
+	/// </summary>
+	/// <param name="key">The key of the entry to remove.</param>
+	/// <returns>True if the entry was removed; otherwise, false.</returns>
+	protected virtual bool RemoveEntry(TKey key)
+	{
+		return _keyedEntryCollection.Remove(key);
+	}
 
-		/// <summary>
-		/// Called to set the value for an entry with the specified key in the dictionary.
-		/// </summary>
-		/// <param name="key">The key of the entry to update.</param>
-		/// <param name="value">The new value to set.</param>
-		/// <returns>True if the value was changed; otherwise, false.</returns>
-		protected virtual bool SetEntry(TKey key, TValue value)
-		{
-			var keyExists = _keyedEntryCollection.Contains(key);
+	/// <summary>
+	/// Called to set the value for an entry with the specified key in the dictionary.
+	/// </summary>
+	/// <param name="key">The key of the entry to update.</param>
+	/// <param name="value">The new value to set.</param>
+	/// <returns>True if the value was changed; otherwise, false.</returns>
+	protected virtual bool SetEntry(TKey key, TValue value)
+	{
+		var keyExists = _keyedEntryCollection.Contains(key);
 
-			// if identical key/value pair already exists, nothing to do
-			if (keyExists && value.Equals((TValue)_keyedEntryCollection[key].Value))
-				return false;
+		// if identical key/value pair already exists, nothing to do
+		if (keyExists && value.Equals((TValue)_keyedEntryCollection[key].Value))
+			return false;
 
-			// otherwise, remove the existing entry
-			if (keyExists)
-				_keyedEntryCollection.Remove(key);
+		// otherwise, remove the existing entry
+		if (keyExists)
+			_keyedEntryCollection.Remove(key);
 
-			// add the new entry
-			_keyedEntryCollection.Add(new DictionaryEntry(key, value));
+		// add the new entry
+		_keyedEntryCollection.Add(new DictionaryEntry(key, value));
 
-			return true;
-		}
+		return true;
+	}
 
-		#endregion protected
+	#endregion protected
 
-		#region private
+	#region private
 
-		private void DoAddEntry(TKey key, TValue value)
+	private void DoAddEntry(TKey key, TValue value)
+	{
+		if (AddEntry(key, value))
 		{
-			if (AddEntry(key, value))
-			{
-				_version++;
+			_version++;
 
-				var index = GetIndexAndEntryForKey(key, out var entry);
-				FireEntryAddedNotifications(entry, index);
-			}
+			var index = GetIndexAndEntryForKey(key, out var entry);
+			FireEntryAddedNotifications(entry, index);
 		}
+	}
 
-		private void DoClearEntries()
+	private void DoClearEntries()
+	{
+		if (ClearEntries())
 		{
-			if (ClearEntries())
-			{
-				_version++;
-				FireResetNotifications();
-			}
+			_version++;
+			FireResetNotifications();
 		}
+	}
 
-		private bool DoRemoveEntry(TKey key)
+	private bool DoRemoveEntry(TKey key)
+	{
+		var index = GetIndexAndEntryForKey(key, out var entry);
+
+		var result = RemoveEntry(key);
+		if (result)
 		{
-			var index = GetIndexAndEntryForKey(key, out var entry);
+			_version++;
+			if (index > -1)
+				FireEntryRemovedNotifications(entry, index);
+		}
 
-			var result = RemoveEntry(key);
-			if (result)
-			{
-				_version++;
-				if (index > -1)
-					FireEntryRemovedNotifications(entry, index);
-			}
+		return result;
+	}
 
-			return result;
-		}
+	private void DoSetEntry(TKey key, TValue value)
+	{
+		var index = GetIndexAndEntryForKey(key, out var entry);
 
-		private void DoSetEntry(TKey key, TValue value)
+		if (SetEntry(key, value))
 		{
-			var index = GetIndexAndEntryForKey(key, out var entry);
+			_version++;
 
-			if (SetEntry(key, value))
+			// if prior entry existed for this key, fire the removed notifications
+			if (index > -1)
 			{
-				_version++;
-
-				// if prior entry existed for this key, fire the removed notifications
-				if (index > -1)
-				{
-					FireEntryRemovedNotifications(entry, index);
+				FireEntryRemovedNotifications(entry, index);
 
-					// force the property change notifications to fire for the modified entry
-					_countCache--;
-				}
-
-				// then fire the added notifications
-				index = GetIndexAndEntryForKey(key, out entry);
-				FireEntryAddedNotifications(entry, index);
+				// force the property change notifications to fire for the modified entry
+				_countCache--;
 			}
+
+			// then fire the added notifications
+			index = GetIndexAndEntryForKey(key, out entry);
+			FireEntryAddedNotifications(entry, index);
 		}
+	}
 
-		private void FireEntryAddedNotifications(DictionaryEntry entry, int index)
-		{
-			// fire the relevant PropertyChanged notifications
-			FirePropertyChangedNotifications();
+	private void FireEntryAddedNotifications(DictionaryEntry entry, int index)
+	{
+		// fire the relevant PropertyChanged notifications
+		FirePropertyChangedNotifications();
 
-			// fire CollectionChanged notification
-			OnCollectionChanged(index > -1
-				? new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, new KeyValuePair<TKey, TValue>((TKey)entry.Key, (TValue)entry.Value), index)
-				: new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
-		}
+		// fire CollectionChanged notification
+		OnCollectionChanged(index > -1
+			? new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, new KeyValuePair<TKey, TValue>((TKey)entry.Key, (TValue)entry.Value), index)
+			: new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
+	}
 
-		private void FireEntryRemovedNotifications(DictionaryEntry entry, int index)
-		{
-			// fire the relevant PropertyChanged notifications
-			FirePropertyChangedNotifications();
+	private void FireEntryRemovedNotifications(DictionaryEntry entry, int index)
+	{
+		// fire the relevant PropertyChanged notifications
+		FirePropertyChangedNotifications();
 
-			// fire CollectionChanged notification
-			OnCollectionChanged(index > -1
-				? new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, new KeyValuePair<TKey, TValue>((TKey)entry.Key, (TValue)entry.Value), index)
-				: new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
-		}
+		// fire CollectionChanged notification
+		OnCollectionChanged(index > -1
+			? new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, new KeyValuePair<TKey, TValue>((TKey)entry.Key, (TValue)entry.Value), index)
+			: new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
+	}
 
-		private void FirePropertyChangedNotifications()
+	private void FirePropertyChangedNotifications()
+	{
+		if (Count != _countCache)
 		{
-			if (Count != _countCache)
-			{
-				_countCache = Count;
-				OnPropertyChanged("Count");
-				OnPropertyChanged("Item[]");
-				OnPropertyChanged("Keys");
-				OnPropertyChanged("Values");
-			}
+			_countCache = Count;
+			OnPropertyChanged("Count");
+			OnPropertyChanged("Item[]");
+			OnPropertyChanged("Keys");
+			OnPropertyChanged("Values");
 		}
+	}
 
-		private void FireResetNotifications()
-		{
-			// fire the relevant PropertyChanged notifications
-			FirePropertyChangedNotifications();
+	private void FireResetNotifications()
+	{
+		// fire the relevant PropertyChanged notifications
+		FirePropertyChangedNotifications();
 
-			// fire CollectionChanged notification
-			OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
-		}
+		// fire CollectionChanged notification
+		OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
+	}
 
-		#endregion private
+	#endregion private
 
-		#endregion methods
+	#endregion methods
 
-		#region interfaces
+	#region interfaces
 
-		#region IDictionary<TKey, TValue>
+	#region IDictionary<TKey, TValue>
 
-		/// <summary>
-		/// Adds an element with the provided key and value to the dictionary.
-		/// </summary>
-		void IDictionary<TKey, TValue>.Add(TKey key, TValue value)
-		{
-			DoAddEntry(key, value);
-		}
+	/// <summary>
+	/// Adds an element with the provided key and value to the dictionary.
+	/// </summary>
+	void IDictionary<TKey, TValue>.Add(TKey key, TValue value)
+	{
+		DoAddEntry(key, value);
+	}
 
-		/// <summary>
-		/// Removes the element with the specified key from the dictionary.
-		/// </summary>
-		bool IDictionary<TKey, TValue>.Remove(TKey key)
-		{
-			return DoRemoveEntry(key);
-		}
+	/// <summary>
+	/// Removes the element with the specified key from the dictionary.
+	/// </summary>
+	bool IDictionary<TKey, TValue>.Remove(TKey key)
+	{
+		return DoRemoveEntry(key);
+	}
+
+	/// <summary>
+	/// Determines whether the dictionary contains the specified key.
+	/// </summary>
+	bool IDictionary<TKey, TValue>.ContainsKey(TKey key)
+	{
+		return _keyedEntryCollection.Contains(key);
+	}
+
+	/// <summary>
+	/// Gets the value associated with the specified key.
+	/// </summary>
+	bool IDictionary<TKey, TValue>.TryGetValue(TKey key, out TValue value)
+	{
+		return TryGetValue(key, out value);
+	}
+
+	/// <summary>
+	/// Gets a collection containing the keys in the dictionary.
+	/// </summary>
+	ICollection<TKey> IDictionary<TKey, TValue>.Keys => Keys;
+
+	/// <summary>
+	/// Gets a collection containing the values in the dictionary.
+	/// </summary>
+	ICollection<TValue> IDictionary<TKey, TValue>.Values => Values;
+
+	/// <summary>
+	/// Gets or sets the element with the specified key.
+	/// </summary>
+	TValue IDictionary<TKey, TValue>.this[TKey key]
+	{
+		get => (TValue)_keyedEntryCollection[key].Value;
+		set => DoSetEntry(key, value);
+	}
+
+	#endregion IDictionary<TKey, TValue>
+
+	#region IDictionary
+
+	/// <summary>
+	/// Adds an element with the provided key and value to the dictionary.
+	/// </summary>
+	void IDictionary.Add(object key, object value)
+	{
+		DoAddEntry((TKey)key, (TValue)value);
+	}
+
+	/// <summary>
+	/// Removes all elements from the dictionary.
+	/// </summary>
+	void IDictionary.Clear()
+	{
+		DoClearEntries();
+	}
+
+	/// <summary>
+	/// Determines whether the dictionary contains an element with the specified key.
+	/// </summary>
+	bool IDictionary.Contains(object key)
+	{
+		return _keyedEntryCollection.Contains((TKey)key);
+	}
+
+	/// <summary>
+	/// Returns an IDictionaryEnumerator for the dictionary.
+	/// </summary>
+	IDictionaryEnumerator IDictionary.GetEnumerator()
+	{
+		return new Enumerator(this, true);
+	}
+
+	/// <summary>
+	/// Gets a value indicating whether the dictionary has a fixed size.
+	/// </summary>
+	bool IDictionary.IsFixedSize => false;
+
+	/// <summary>
+	/// Gets a value indicating whether the dictionary is read-only.
+	/// </summary>
+	bool IDictionary.IsReadOnly => false;
+
+	/// <summary>
+	/// Gets or sets the element with the specified key.
+	/// </summary>
+	object IDictionary.this[object key]
+	{
+		get => _keyedEntryCollection[(TKey)key].Value;
+		set => DoSetEntry((TKey)key, (TValue)value);
+	}
 
-		/// <summary>
-		/// Determines whether the dictionary contains the specified key.
-		/// </summary>
-		bool IDictionary<TKey, TValue>.ContainsKey(TKey key)
-		{
-			return _keyedEntryCollection.Contains(key);
-		}
+	/// <summary>
+	/// Gets a collection containing the keys in the dictionary.
+	/// </summary>
+	ICollection IDictionary.Keys => Keys;
 
-		/// <summary>
-		/// Gets the value associated with the specified key.
-		/// </summary>
-		bool IDictionary<TKey, TValue>.TryGetValue(TKey key, out TValue value)
-		{
-			return TryGetValue(key, out value);
-		}
+	/// <summary>
+	/// Removes the element with the specified key from the dictionary.
+	/// </summary>
+	void IDictionary.Remove(object key)
+	{
+		DoRemoveEntry((TKey)key);
+	}
 
-		/// <summary>
-		/// Gets a collection containing the keys in the dictionary.
-		/// </summary>
-		ICollection<TKey> IDictionary<TKey, TValue>.Keys => Keys;
+	/// <summary>
+	/// Gets a collection containing the values in the dictionary.
+	/// </summary>
+	ICollection IDictionary.Values => Values;
 
-		/// <summary>
-		/// Gets a collection containing the values in the dictionary.
-		/// </summary>
-		ICollection<TValue> IDictionary<TKey, TValue>.Values => Values;
+	#endregion IDictionary
 
-		/// <summary>
-		/// Gets or sets the element with the specified key.
-		/// </summary>
-		TValue IDictionary<TKey, TValue>.this[TKey key]
-		{
-			get => (TValue)_keyedEntryCollection[key].Value;
-			set => DoSetEntry(key, value);
-		}
+	#region ICollection<KeyValuePair<TKey, TValue>>
 
-		#endregion IDictionary<TKey, TValue>
+	/// <summary>
+	/// Adds the specified key-value pair to the dictionary.
+	/// </summary>
+	void ICollection<KeyValuePair<TKey, TValue>>.Add(KeyValuePair<TKey, TValue> kvp)
+	{
+		DoAddEntry(kvp.Key, kvp.Value);
+	}
 
-		#region IDictionary
+	/// <summary>
+	/// Removes all key-value pairs from the dictionary.
+	/// </summary>
+	void ICollection<KeyValuePair<TKey, TValue>>.Clear()
+	{
+		DoClearEntries();
+	}
 
-		/// <summary>
-		/// Adds an element with the provided key and value to the dictionary.
-		/// </summary>
-		void IDictionary.Add(object key, object value)
-		{
-			DoAddEntry((TKey)key, (TValue)value);
-		}
+	/// <summary>
+	/// Determines whether the dictionary contains the specified key-value pair.
+	/// </summary>
+	bool ICollection<KeyValuePair<TKey, TValue>>.Contains(KeyValuePair<TKey, TValue> kvp)
+	{
+		return _keyedEntryCollection.Contains(kvp.Key);
+	}
 
-		/// <summary>
-		/// Removes all elements from the dictionary.
-		/// </summary>
-		void IDictionary.Clear()
+	/// <summary>
+	/// Copies the key-value pairs of the dictionary to the specified array starting at the given index.
+	/// </summary>
+	void ICollection<KeyValuePair<TKey, TValue>>.CopyTo(KeyValuePair<TKey, TValue>[] array, int index)
+	{
+		if (array == null)
 		{
-			DoClearEntries();
+			throw new ArgumentNullException(nameof(index), "CopyTo() failed:  array parameter was null");
 		}
-
-		/// <summary>
-		/// Determines whether the dictionary contains an element with the specified key.
-		/// </summary>
-		bool IDictionary.Contains(object key)
+		if ((index < 0) || (index > array.Length))
 		{
-			return _keyedEntryCollection.Contains((TKey)key);
+			throw new ArgumentOutOfRangeException(nameof(index), "CopyTo() failed:  index parameter was outside the bounds of the supplied array");
 		}
-
-		/// <summary>
-		/// Returns an IDictionaryEnumerator for the dictionary.
-		/// </summary>
-		IDictionaryEnumerator IDictionary.GetEnumerator()
+		if ((array.Length - index) < _keyedEntryCollection.Count)
 		{
-			return new Enumerator(this, true);
+			throw new ArgumentException("CopyTo() failed:  supplied array was too small", nameof(index));
 		}
 
-		/// <summary>
-		/// Gets a value indicating whether the dictionary has a fixed size.
-		/// </summary>
-		bool IDictionary.IsFixedSize => false;
+		foreach (DictionaryEntry entry in _keyedEntryCollection)
+			array[index++] = new KeyValuePair<TKey, TValue>((TKey)entry.Key, (TValue)entry.Value);
+	}
 
-		/// <summary>
-		/// Gets a value indicating whether the dictionary is read-only.
-		/// </summary>
-		bool IDictionary.IsReadOnly => false;
+	/// <summary>
+	/// Gets the number of key-value pairs contained in the dictionary.
+	/// </summary>
+	int ICollection<KeyValuePair<TKey, TValue>>.Count => _keyedEntryCollection.Count;
 
-		/// <summary>
-		/// Gets or sets the element with the specified key.
-		/// </summary>
-		object IDictionary.this[object key]
-		{
-			get => _keyedEntryCollection[(TKey)key].Value;
-			set => DoSetEntry((TKey)key, (TValue)value);
-		}
+	/// <summary>
+	/// Gets a value indicating whether the dictionary is read-only.
+	/// </summary>
+	bool ICollection<KeyValuePair<TKey, TValue>>.IsReadOnly => false;
 
-		/// <summary>
-		/// Gets a collection containing the keys in the dictionary.
-		/// </summary>
-		ICollection IDictionary.Keys => Keys;
+	/// <summary>
+	/// Removes the specified key-value pair from the dictionary.
+	/// </summary>
+	bool ICollection<KeyValuePair<TKey, TValue>>.Remove(KeyValuePair<TKey, TValue> kvp)
+	{
+		return DoRemoveEntry(kvp.Key);
+	}
 
-		/// <summary>
-		/// Removes the element with the specified key from the dictionary.
-		/// </summary>
-		void IDictionary.Remove(object key)
-		{
-			DoRemoveEntry((TKey)key);
-		}
+	#endregion ICollection<KeyValuePair<TKey, TValue>>
 
-		/// <summary>
-		/// Gets a collection containing the values in the dictionary.
-		/// </summary>
-		ICollection IDictionary.Values => Values;
+	#region ICollection
 
-		#endregion IDictionary
+	/// <summary>
+	/// Copies the elements of the dictionary to an Array, starting at a particular Array index.
+	/// </summary>
+	void ICollection.CopyTo(Array array, int index)
+	{
+		((ICollection)_keyedEntryCollection).CopyTo(array, index);
+	}
 
-		#region ICollection<KeyValuePair<TKey, TValue>>
+	/// <summary>
+	/// Gets the number of key-value pairs in the dictionary.
+	/// </summary>
+	int ICollection.Count => _keyedEntryCollection.Count;
 
-		/// <summary>
-		/// Adds the specified key-value pair to the dictionary.
-		/// </summary>
-		void ICollection<KeyValuePair<TKey, TValue>>.Add(KeyValuePair<TKey, TValue> kvp)
-		{
-			DoAddEntry(kvp.Key, kvp.Value);
-		}
+	/// <summary>
+	/// Gets a value indicating whether access to the dictionary is synchronized (thread safe).
+	/// </summary>
+	bool ICollection.IsSynchronized => ((ICollection)_keyedEntryCollection).IsSynchronized;
 
-		/// <summary>
-		/// Removes all key-value pairs from the dictionary.
-		/// </summary>
-		void ICollection<KeyValuePair<TKey, TValue>>.Clear()
-		{
-			DoClearEntries();
-		}
+	/// <summary>
+	/// Gets an object that can be used to synchronize access to the dictionary.
+	/// </summary>
+	object ICollection.SyncRoot => ((ICollection)_keyedEntryCollection).SyncRoot;
 
-		/// <summary>
-		/// Determines whether the dictionary contains the specified key-value pair.
-		/// </summary>
-		bool ICollection<KeyValuePair<TKey, TValue>>.Contains(KeyValuePair<TKey, TValue> kvp)
-		{
-			return _keyedEntryCollection.Contains(kvp.Key);
-		}
+	#endregion ICollection
 
-		/// <summary>
-		/// Copies the key-value pairs of the dictionary to the specified array starting at the given index.
-		/// </summary>
-		void ICollection<KeyValuePair<TKey, TValue>>.CopyTo(KeyValuePair<TKey, TValue>[] array, int index)
-		{
-			if (array == null)
-			{
-				throw new ArgumentNullException(nameof(index), "CopyTo() failed:  array parameter was null");
-			}
-			if ((index < 0) || (index > array.Length))
-			{
-				throw new ArgumentOutOfRangeException(nameof(index), "CopyTo() failed:  index parameter was outside the bounds of the supplied array");
-			}
-			if ((array.Length - index) < _keyedEntryCollection.Count)
-			{
-				throw new ArgumentException("CopyTo() failed:  supplied array was too small", nameof(index));
-			}
+	#region IEnumerable<KeyValuePair<TKey, TValue>>
 
-			foreach (DictionaryEntry entry in _keyedEntryCollection)
-				array[index++] = new KeyValuePair<TKey, TValue>((TKey)entry.Key, (TValue)entry.Value);
-		}
+	/// <summary>
+	/// Returns an enumerator that iterates through the dictionary.
+	/// </summary>
+	IEnumerator<KeyValuePair<TKey, TValue>> IEnumerable<KeyValuePair<TKey, TValue>>.GetEnumerator()
+	{
+		return new Enumerator(this, false);
+	}
 
-		/// <summary>
-		/// Gets the number of key-value pairs contained in the dictionary.
-		/// </summary>
-		int ICollection<KeyValuePair<TKey, TValue>>.Count => _keyedEntryCollection.Count;
+	#endregion IEnumerable<KeyValuePair<TKey, TValue>>
 
-		/// <summary>
-		/// Gets a value indicating whether the dictionary is read-only.
-		/// </summary>
-		bool ICollection<KeyValuePair<TKey, TValue>>.IsReadOnly => false;
+	#region IEnumerable
 
-		/// <summary>
-		/// Removes the specified key-value pair from the dictionary.
-		/// </summary>
-		bool ICollection<KeyValuePair<TKey, TValue>>.Remove(KeyValuePair<TKey, TValue> kvp)
-		{
-			return DoRemoveEntry(kvp.Key);
-		}
+	/// <summary>
+	/// Returns an enumerator that iterates through the dictionary.
+	/// </summary>
+	IEnumerator IEnumerable.GetEnumerator()
+	{
+		return GetEnumerator();
+	}
 
-		#endregion ICollection<KeyValuePair<TKey, TValue>>
+	#endregion IEnumerable
 
-		#region ICollection
+	#region ISerializable
 
-		/// <summary>
-		/// Copies the elements of the dictionary to an Array, starting at a particular Array index.
-		/// </summary>
-		void ICollection.CopyTo(Array array, int index)
+	/// <summary>
+	/// Populates a SerializationInfo with the data needed to serialize the dictionary.
+	/// </summary>
+	public virtual void GetObjectData(SerializationInfo info, StreamingContext context)
+	{
+		if (info == null)
 		{
-			((ICollection)_keyedEntryCollection).CopyTo(array, index);
+			throw new ArgumentNullException(nameof(info));
 		}
 
-		/// <summary>
-		/// Gets the number of key-value pairs in the dictionary.
-		/// </summary>
-		int ICollection.Count => _keyedEntryCollection.Count;
-
-		/// <summary>
-		/// Gets a value indicating whether access to the dictionary is synchronized (thread safe).
-		/// </summary>
-		bool ICollection.IsSynchronized => ((ICollection)_keyedEntryCollection).IsSynchronized;
-
-		/// <summary>
-		/// Gets an object that can be used to synchronize access to the dictionary.
-		/// </summary>
-		object ICollection.SyncRoot => ((ICollection)_keyedEntryCollection).SyncRoot;
+		var entries = new Collection<DictionaryEntry>();
+		foreach (var entry in _keyedEntryCollection)
+			entries.Add(entry);
+		info.AddValue("entries", entries);
+	}
 
-		#endregion ICollection
+	#endregion ISerializable
 
-		#region IEnumerable<KeyValuePair<TKey, TValue>>
+	#region IDeserializationCallback
 
-		/// <summary>
-		/// Returns an enumerator that iterates through the dictionary.
-		/// </summary>
-		IEnumerator<KeyValuePair<TKey, TValue>> IEnumerable<KeyValuePair<TKey, TValue>>.GetEnumerator()
+	/// <summary>
+	/// Runs when the entire object graph has been deserialized.
+	/// </summary>
+	public virtual void OnDeserialization(object sender)
+	{
+		if (_siInfo != null)
 		{
-			return new Enumerator(this, false);
+			var entries = (Collection<DictionaryEntry>)
+				_siInfo.GetValue("entries", typeof(Collection<DictionaryEntry>));
+			foreach (var entry in entries)
+				AddEntry((TKey)entry.Key, (TValue)entry.Value);
 		}
+	}
 
-		#endregion IEnumerable<KeyValuePair<TKey, TValue>>
-
-		#region IEnumerable
-
-		/// <summary>
-		/// Returns an enumerator that iterates through the dictionary.
-		/// </summary>
-		IEnumerator IEnumerable.GetEnumerator()
-		{
-			return GetEnumerator();
-		}
+	#endregion IDeserializationCallback
 
-		#endregion IEnumerable
+	#region INotifyCollectionChanged
 
-		#region ISerializable
+	/// <summary>
+	/// Occurs when the collection changes.
+	/// </summary>
+	event NotifyCollectionChangedEventHandler INotifyCollectionChanged.CollectionChanged
+	{
+		add => _collectionChanged += value;
+		remove => _collectionChanged -= value;
+	}
 
-		/// <summary>
-		/// Populates a SerializationInfo with the data needed to serialize the dictionary.
-		/// </summary>
-		public virtual void GetObjectData(SerializationInfo info, StreamingContext context)
-		{
-			if (info == null)
-			{
-				throw new ArgumentNullException(nameof(info));
-			}
+	private NotifyCollectionChangedEventHandler _collectionChanged;
 
-			var entries = new Collection<DictionaryEntry>();
-			foreach (var entry in _keyedEntryCollection)
-				entries.Add(entry);
-			info.AddValue("entries", entries);
-		}
+	#endregion INotifyCollectionChanged
 
-		#endregion ISerializable
+	#region INotifyPropertyChanged
 
-		#region IDeserializationCallback
+	/// <summary>
+	/// Occurs when a property value changes.
+	/// </summary>
+	event PropertyChangedEventHandler INotifyPropertyChanged.PropertyChanged
+	{
+		add => _propertyChanged += value;
+		remove => _propertyChanged -= value;
+	}
 
-		/// <summary>
-		/// Runs when the entire object graph has been deserialized.
-		/// </summary>
-		public virtual void OnDeserialization(object sender)
-		{
-			if (_siInfo != null)
-			{
-				var entries = (Collection<DictionaryEntry>)
-					_siInfo.GetValue("entries", typeof(Collection<DictionaryEntry>));
-				foreach (var entry in entries)
-					AddEntry((TKey)entry.Key, (TValue)entry.Value);
-			}
-		}
+	private PropertyChangedEventHandler _propertyChanged;
 
-		#endregion IDeserializationCallback
+	#endregion INotifyPropertyChanged
 
-		#region INotifyCollectionChanged
+	#endregion interfaces
 
-		/// <summary>
-		/// Occurs when the collection changes.
-		/// </summary>
-		event NotifyCollectionChangedEventHandler INotifyCollectionChanged.CollectionChanged
-		{
-			add => _collectionChanged += value;
-			remove => _collectionChanged -= value;
-		}
+	#region protected classes
 
-		private NotifyCollectionChangedEventHandler _collectionChanged;
+	#region KeyedDictionaryEntryCollection<TKey>
 
-		#endregion INotifyCollectionChanged
+	/// <summary>
+	/// Represents a keyed collection of DictionaryEntry items using TKey as the key.
+	/// </summary>
+	protected class KeyedDictionaryEntryCollection : KeyedCollection<TKey, DictionaryEntry>
+	{
+		#region constructors
 
-		#region INotifyPropertyChanged
+		#region public
 
 		/// <summary>
-		/// Occurs when a property value changes.
+		/// Initializes a new instance of the KeyedDictionaryEntryCollection class.
 		/// </summary>
-		event PropertyChangedEventHandler INotifyPropertyChanged.PropertyChanged
-		{
-			add => _propertyChanged += value;
-			remove => _propertyChanged -= value;
-		}
+		public KeyedDictionaryEntryCollection() { }
 
-		private PropertyChangedEventHandler _propertyChanged;
+		/// <summary>
+		/// Initializes a new instance of the KeyedDictionaryEntryCollection class with the specified comparer.
+		/// </summary>
+		/// <param name="comparer">The comparer to use for key comparisons.</param>
+		public KeyedDictionaryEntryCollection(IEqualityComparer<TKey> comparer) : base(comparer) { }
 
-		#endregion INotifyPropertyChanged
+		#endregion public
 
-		#endregion interfaces
+		#endregion constructors
 
-		#region protected classes
+		#region methods
 
-		#region KeyedDictionaryEntryCollection<TKey>
+		#region protected
 
 		/// <summary>
-		/// Represents a keyed collection of DictionaryEntry items using TKey as the key.
+		/// Extracts the key from the DictionaryEntry.
 		/// </summary>
-		protected class KeyedDictionaryEntryCollection : KeyedCollection<TKey, DictionaryEntry>
+		/// <param name="entry">The DictionaryEntry for which to get the key.</param>
+		/// <returns>The key associated with the entry.</returns>
+		protected override TKey GetKeyForItem(DictionaryEntry entry)
 		{
-			#region constructors
+			return (TKey)entry.Key;
+		}
 
-			#region public
+		#endregion protected
 
-			/// <summary>
-			/// Initializes a new instance of the KeyedDictionaryEntryCollection class.
-			/// </summary>
-			public KeyedDictionaryEntryCollection() { }
+		#endregion methods
+	}
 
-			/// <summary>
-			/// Initializes a new instance of the KeyedDictionaryEntryCollection class with the specified comparer.
-			/// </summary>
-			/// <param name="comparer">The comparer to use for key comparisons.</param>
-			public KeyedDictionaryEntryCollection(IEqualityComparer<TKey> comparer) : base(comparer) { }
+	#endregion KeyedDictionaryEntryCollection<TKey>
 
-			#endregion public
+	#endregion protected classes
 
-			#endregion constructors
+	#region public structures
 
-			#region methods
+	#region Enumerator
 
-			#region protected
+	[Serializable, StructLayout(LayoutKind.Sequential)]
+	private struct Enumerator(ObservableDictionary<TKey, TValue> dictionary, bool isDictionaryEntryEnumerator) : IEnumerator<KeyValuePair<TKey, TValue>>, IDictionaryEnumerator
+	{
+		#region properties
 
-			/// <summary>
-			/// Extracts the key from the DictionaryEntry.
-			/// </summary>
-			/// <param name="entry">The DictionaryEntry for which to get the key.</param>
-			/// <returns>The key associated with the entry.</returns>
-			protected override TKey GetKeyForItem(DictionaryEntry entry)
+		public readonly KeyValuePair<TKey, TValue> Current
+		{
+			get
 			{
-				return (TKey)entry.Key;
+				ValidateCurrent();
+				return _current;
 			}
-
-			#endregion protected
-
-			#endregion methods
 		}
 
-		#endregion KeyedDictionaryEntryCollection<TKey>
-
-		#endregion protected classes
-
-		#region public structures
+		#endregion properties
 
-		#region Enumerator
+		#region methods
 
-		[Serializable, StructLayout(LayoutKind.Sequential)]
-		private struct Enumerator(ObservableDictionary<TKey, TValue> dictionary, bool isDictionaryEntryEnumerator) : IEnumerator<KeyValuePair<TKey, TValue>>, IDictionaryEnumerator
+		public readonly void Dispose()
 		{
-			#region properties
-
-			public readonly KeyValuePair<TKey, TValue> Current
-			{
-				get
-				{
-					ValidateCurrent();
-					return _current;
-				}
-			}
-
-			#endregion properties
-
-			#region methods
+			GC.SuppressFinalize(this);
+		}
 
-			public readonly void Dispose()
+		public bool MoveNext()
+		{
+			ValidateVersion();
+			_index++;
+			if (_index < dictionary._keyedEntryCollection.Count)
 			{
-				GC.SuppressFinalize(this);
+				_current = new KeyValuePair<TKey, TValue>((TKey)dictionary._keyedEntryCollection[_index].Key, (TValue)dictionary._keyedEntryCollection[_index].Value);
+				return true;
 			}
+			_index = -2;
+			_current = new KeyValuePair<TKey, TValue>();
+			return false;
+		}
 
-			public bool MoveNext()
+		private readonly void ValidateCurrent()
+		{
+			if (_index == -1)
 			{
-				ValidateVersion();
-				_index++;
-				if (_index < dictionary._keyedEntryCollection.Count)
-				{
-					_current = new KeyValuePair<TKey, TValue>((TKey)dictionary._keyedEntryCollection[_index].Key, (TValue)dictionary._keyedEntryCollection[_index].Value);
-					return true;
-				}
-				_index = -2;
-				_current = new KeyValuePair<TKey, TValue>();
-				return false;
+				throw new InvalidOperationException("The enumerator has not been started.");
 			}
-
-			private readonly void ValidateCurrent()
+			else if (_index == -2)
 			{
-				if (_index == -1)
-				{
-					throw new InvalidOperationException("The enumerator has not been started.");
-				}
-				else if (_index == -2)
-				{
-					throw new InvalidOperationException("The enumerator has reached the end of the collection.");
-				}
+				throw new InvalidOperationException("The enumerator has reached the end of the collection.");
 			}
+		}
 
-			private readonly void ValidateVersion()
+		private readonly void ValidateVersion()
+		{
+			if (_version != dictionary._version)
 			{
-				if (_version != dictionary._version)
-				{
-					throw new InvalidOperationException("The enumerator is not valid because the dictionary changed.");
-				}
+				throw new InvalidOperationException("The enumerator is not valid because the dictionary changed.");
 			}
+		}
 
-			#endregion methods
+		#endregion methods
 
-			#region IEnumerator implementation
+		#region IEnumerator implementation
 
-			readonly object IEnumerator.Current
+		readonly object IEnumerator.Current
+		{
+			get
 			{
-				get
+				ValidateCurrent();
+				if (isDictionaryEntryEnumerator)
 				{
-					ValidateCurrent();
-					if (isDictionaryEntryEnumerator)
-					{
-						return new DictionaryEntry(_current.Key, _current.Value);
-					}
-					return new KeyValuePair<TKey, TValue>(_current.Key, _current.Value);
+					return new DictionaryEntry(_current.Key, _current.Value);
 				}
+				return new KeyValuePair<TKey, TValue>(_current.Key, _current.Value);
 			}
+		}
 
-			void IEnumerator.Reset()
-			{
-				ValidateVersion();
-				_index = -1;
-				_current = new KeyValuePair<TKey, TValue>();
-			}
+		void IEnumerator.Reset()
+		{
+			ValidateVersion();
+			_index = -1;
+			_current = new KeyValuePair<TKey, TValue>();
+		}
 
-			#endregion IEnumerator implementation
+		#endregion IEnumerator implementation
 
-			#region IDictionaryEnumerator implementation
+		#region IDictionaryEnumerator implementation
 
-			readonly DictionaryEntry IDictionaryEnumerator.Entry
+		readonly DictionaryEntry IDictionaryEnumerator.Entry
+		{
+			get
 			{
-				get
-				{
-					ValidateCurrent();
-					return new DictionaryEntry(_current.Key, _current.Value);
-				}
+				ValidateCurrent();
+				return new DictionaryEntry(_current.Key, _current.Value);
 			}
-			readonly object IDictionaryEnumerator.Key
+		}
+		readonly object IDictionaryEnumerator.Key
+		{
+			get
 			{
-				get
-				{
-					ValidateCurrent();
-					return _current.Key;
-				}
+				ValidateCurrent();
+				return _current.Key;
 			}
-			readonly object IDictionaryEnumerator.Value
+		}
+		readonly object IDictionaryEnumerator.Value
+		{
+			get
 			{
-				get
-				{
-					ValidateCurrent();
-					return _current.Value;
-				}
+				ValidateCurrent();
+				return _current.Value;
 			}
+		}
 
-			#endregion
-			#region fields
+		#endregion
+		#region fields
 
-			private readonly int _version = dictionary._version;
-			private int _index = -1;
-			private KeyValuePair<TKey, TValue> _current = new();
+		private readonly int _version = dictionary._version;
+		private int _index = -1;
+		private KeyValuePair<TKey, TValue> _current = new();
 
-			#endregion fields
-		}
+		#endregion fields
+	}
 
-		#endregion Enumerator
+	#endregion Enumerator
 
-		#endregion public structures
+	#endregion public structures
 
-		#region fields
+	#region fields
 
-		private readonly KeyedDictionaryEntryCollection _keyedEntryCollection;
+	private readonly KeyedDictionaryEntryCollection _keyedEntryCollection;
 
-		private int _countCache;
-		private readonly Dictionary<TKey, TValue> _dictionaryCache = [];
-		private int _dictionaryCacheVersion;
-		private int _version;
+	private int _countCache;
+	private readonly Dictionary<TKey, TValue> _dictionaryCache = [];
+	private int _dictionaryCacheVersion;
+	private int _version;
 
-		[NonSerialized]
-		private readonly SerializationInfo _siInfo;
+	[NonSerialized]
+	private readonly SerializationInfo _siInfo;
 
-		#endregion fields
-	}
+	#endregion fields
 }
\ No newline at end of file
diff --git a/ComponentModel/OperatorRegistry.cs b/ComponentModel/OperatorRegistry.cs
index c24b8f04..71139944 100644
--- a/ComponentModel/OperatorRegistry.cs
+++ b/ComponentModel/OperatorRegistry.cs
@@ -1,185 +1,184 @@
-namespace Ecng.ComponentModel
-{
-	using System;
+namespace Ecng.ComponentModel;
+
+using System;
 
-	using Ecng.Collections;
-	using Ecng.Common;
-	using Ecng.Localization;
+using Ecng.Collections;
+using Ecng.Common;
+using Ecng.Localization;
 
+/// <summary>
+/// Provides a registry for operators to perform mathematical and comparison operations.
+/// </summary>
+public static class OperatorRegistry
+{
 	/// <summary>
-	/// Provides a registry for operators to perform mathematical and comparison operations.
+	/// Represents an operator implementation for types implementing <see cref="IOperable{T}"/>.
 	/// </summary>
-	public static class OperatorRegistry
+	/// <typeparam name="T">The type that implements <see cref="IOperable{T}"/>.</typeparam>
+	private sealed class OperableOperator<T> : BaseOperator<T>
+		where T : IOperable<T>
 	{
-		/// <summary>
-		/// Represents an operator implementation for types implementing <see cref="IOperable{T}"/>.
-		/// </summary>
-		/// <typeparam name="T">The type that implements <see cref="IOperable{T}"/>.</typeparam>
-		private sealed class OperableOperator<T> : BaseOperator<T>
-			where T : IOperable<T>
+		/// <inheritdoc />
+		public override int Compare(T x, T y)
 		{
-			/// <inheritdoc />
-			public override int Compare(T x, T y)
-			{
-				return x.CompareTo(y);
-			}
-
-			/// <inheritdoc />
-			public override T Add(T first, T second)
-			{
-				return first.Add(second);
-			}
-
-			/// <inheritdoc />
-			public override T Subtract(T first, T second)
-			{
-				return first.Subtract(second);
-			}
-
-			/// <inheritdoc />
-			public override T Multiply(T first, T second)
-			{
-				return first.Multiply(second);
-			}
-
-			/// <inheritdoc />
-			public override T Divide(T first, T second)
-			{
-				return first.Divide(second);
-			}
+			return x.CompareTo(y);
 		}
 
-		private static readonly SynchronizedDictionary<Type, IOperator> _operators = [];
-
-		/// <summary>
-		/// Initializes static members of the <see cref="OperatorRegistry"/> class.
-		/// Registers the default set of operators.
-		/// </summary>
-		static OperatorRegistry()
+		/// <inheritdoc />
+		public override T Add(T first, T second)
 		{
-			AddOperator(new ByteOperator());
-			AddOperator(new ShortOperator());
-			AddOperator(new IntOperator());
-			AddOperator(new LongOperator());
-			AddOperator(new FloatOperator());
-			AddOperator(new DoubleOperator());
-			AddOperator(new DecimalOperator());
-			AddOperator(new TimeSpanOperator());
-			AddOperator(new DateTimeOperator());
-			AddOperator(new DateTimeOffsetOperator());
-			AddOperator(new SByteOperator());
-			AddOperator(new UShortOperator());
-			AddOperator(new UIntOperator());
-			AddOperator(new ULongOperator());
+			return first.Add(second);
 		}
 
-		/// <summary>
-		/// Adds an operator for the specified type.
-		/// </summary>
-		/// <typeparam name="T">The type that the operator will handle.</typeparam>
-		/// <param name="operator">The operator to add.</param>
-		/// <exception cref="ArgumentNullException">Thrown when the <paramref name="operator"/> is null.</exception>
-		public static void AddOperator<T>(IOperator<T> @operator)
+		/// <inheritdoc />
+		public override T Subtract(T first, T second)
 		{
-			if (@operator is null)
-				throw new ArgumentNullException(nameof(@operator));
-
-			_operators.Add(typeof(T), @operator);
+			return first.Subtract(second);
 		}
 
-		/// <summary>
-		/// Retrieves the operator associated with the specified type.
-		/// </summary>
-		/// <param name="type">The type for which to retrieve the operator.</param>
-		/// <returns>The operator associated with the given type.</returns>
-		/// <exception cref="InvalidOperationException">Thrown when no operator exists for the given type.</exception>
-		public static IOperator GetOperator(this Type type)
+		/// <inheritdoc />
+		public override T Multiply(T first, T second)
 		{
-			if (!_operators.TryGetValue(type, out var @operator))
-			{
-				if (type.Is(typeof(IOperable<>).Make(type)))
-				{
-					@operator = typeof(OperableOperator<>).Make(type).CreateInstance<IOperator>();
-					_operators.Add(type, @operator);
-				}
-				else
-					throw new InvalidOperationException($"Operator for type {type} doesn't exist.");
-			}
-
-			return @operator;
+			return first.Multiply(second);
 		}
 
-		/// <summary>
-		/// Retrieves the operator associated with the specified type parameter.
-		/// </summary>
-		/// <typeparam name="T">The type for which to retrieve the operator.</typeparam>
-		/// <returns>The operator associated with the given type.</returns>
-		public static IOperator<T> GetOperator<T>()
+		/// <inheritdoc />
+		public override T Divide(T first, T second)
 		{
-			return (IOperator<T>)GetOperator(typeof(T));
+			return first.Divide(second);
 		}
+	}
 
-		/// <summary>
-		/// Checks if an operator is registered for the specified type parameter.
-		/// </summary>
-		/// <typeparam name="T">The type to check for operator registration.</typeparam>
-		/// <returns><c>true</c> if an operator is registered; otherwise, <c>false</c>.</returns>
-		public static bool IsRegistered<T>()
-		{
-			return IsRegistered(typeof(T));
-		}
+	private static readonly SynchronizedDictionary<Type, IOperator> _operators = [];
 
-		/// <summary>
-		/// Checks if an operator is registered for the specified type.
-		/// </summary>
-		/// <param name="type">The type to check for operator registration.</param>
-		/// <returns><c>true</c> if an operator is registered; otherwise, <c>false</c>.</returns>
-		public static bool IsRegistered(Type type)
+	/// <summary>
+	/// Initializes static members of the <see cref="OperatorRegistry"/> class.
+	/// Registers the default set of operators.
+	/// </summary>
+	static OperatorRegistry()
+	{
+		AddOperator(new ByteOperator());
+		AddOperator(new ShortOperator());
+		AddOperator(new IntOperator());
+		AddOperator(new LongOperator());
+		AddOperator(new FloatOperator());
+		AddOperator(new DoubleOperator());
+		AddOperator(new DecimalOperator());
+		AddOperator(new TimeSpanOperator());
+		AddOperator(new DateTimeOperator());
+		AddOperator(new DateTimeOffsetOperator());
+		AddOperator(new SByteOperator());
+		AddOperator(new UShortOperator());
+		AddOperator(new UIntOperator());
+		AddOperator(new ULongOperator());
+	}
+
+	/// <summary>
+	/// Adds an operator for the specified type.
+	/// </summary>
+	/// <typeparam name="T">The type that the operator will handle.</typeparam>
+	/// <param name="operator">The operator to add.</param>
+	/// <exception cref="ArgumentNullException">Thrown when the <paramref name="operator"/> is null.</exception>
+	public static void AddOperator<T>(IOperator<T> @operator)
+	{
+		if (@operator is null)
+			throw new ArgumentNullException(nameof(@operator));
+
+		_operators.Add(typeof(T), @operator);
+	}
+
+	/// <summary>
+	/// Retrieves the operator associated with the specified type.
+	/// </summary>
+	/// <param name="type">The type for which to retrieve the operator.</param>
+	/// <returns>The operator associated with the given type.</returns>
+	/// <exception cref="InvalidOperationException">Thrown when no operator exists for the given type.</exception>
+	public static IOperator GetOperator(this Type type)
+	{
+		if (!_operators.TryGetValue(type, out var @operator))
 		{
-			return _operators.ContainsKey(type);
+			if (type.Is(typeof(IOperable<>).Make(type)))
+			{
+				@operator = typeof(OperableOperator<>).Make(type).CreateInstance<IOperator>();
+				_operators.Add(type, @operator);
+			}
+			else
+				throw new InvalidOperationException($"Operator for type {type} doesn't exist.");
 		}
 
-		/// <summary>
-		/// Removes the operator for the specified type.
-		/// </summary>
-		/// <typeparam name="T">The type whose operator is to be removed.</typeparam>
-		/// <param name="operator">The operator instance to remove.</param>
-		/// <exception cref="ArgumentNullException">Thrown when the <paramref name="operator"/> is null.</exception>
-		public static void RemoveOperator<T>(IOperator<T> @operator)
-		{
-			if (@operator is null)
-				throw new ArgumentNullException(nameof(@operator));
+		return @operator;
+	}
 
-			_operators.Remove(typeof(T));
-		}
+	/// <summary>
+	/// Retrieves the operator associated with the specified type parameter.
+	/// </summary>
+	/// <typeparam name="T">The type for which to retrieve the operator.</typeparam>
+	/// <returns>The operator associated with the given type.</returns>
+	public static IOperator<T> GetOperator<T>()
+	{
+		return (IOperator<T>)GetOperator(typeof(T));
+	}
 
-		/// <summary>
-		/// Throws an exception if the specified nullable long value is negative.
-		/// </summary>
-		/// <param name="value">The nullable long value to check.</param>
-		/// <param name="name">The name of the variable to include in the exception.</param>
-		/// <returns>The original value if it is not negative; otherwise, null.</returns>
-		public static long? ThrowIfNegative(this long? value, string name)
-		{
-			if (value is null)
-				return null;
+	/// <summary>
+	/// Checks if an operator is registered for the specified type parameter.
+	/// </summary>
+	/// <typeparam name="T">The type to check for operator registration.</typeparam>
+	/// <returns><c>true</c> if an operator is registered; otherwise, <c>false</c>.</returns>
+	public static bool IsRegistered<T>()
+	{
+		return IsRegistered(typeof(T));
+	}
 
-			return value.Value.ThrowIfNegative(name);
-		}
+	/// <summary>
+	/// Checks if an operator is registered for the specified type.
+	/// </summary>
+	/// <param name="type">The type to check for operator registration.</param>
+	/// <returns><c>true</c> if an operator is registered; otherwise, <c>false</c>.</returns>
+	public static bool IsRegistered(Type type)
+	{
+		return _operators.ContainsKey(type);
+	}
 
-		/// <summary>
-		/// Throws an exception if the specified long value is negative.
-		/// </summary>
-		/// <param name="value">The long value to check.</param>
-		/// <param name="name">The name of the variable to include in the exception.</param>
-		/// <returns>The original value if it is not negative.</returns>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown when the value is negative.</exception>
-		public static long ThrowIfNegative(this long value, string name)
-		{
-			if (value < 0)
-				throw new ArgumentOutOfRangeException(name, value, "Invalid value.".Localize());
+	/// <summary>
+	/// Removes the operator for the specified type.
+	/// </summary>
+	/// <typeparam name="T">The type whose operator is to be removed.</typeparam>
+	/// <param name="operator">The operator instance to remove.</param>
+	/// <exception cref="ArgumentNullException">Thrown when the <paramref name="operator"/> is null.</exception>
+	public static void RemoveOperator<T>(IOperator<T> @operator)
+	{
+		if (@operator is null)
+			throw new ArgumentNullException(nameof(@operator));
 
-			return value;
-		}
+		_operators.Remove(typeof(T));
+	}
+
+	/// <summary>
+	/// Throws an exception if the specified nullable long value is negative.
+	/// </summary>
+	/// <param name="value">The nullable long value to check.</param>
+	/// <param name="name">The name of the variable to include in the exception.</param>
+	/// <returns>The original value if it is not negative; otherwise, null.</returns>
+	public static long? ThrowIfNegative(this long? value, string name)
+	{
+		if (value is null)
+			return null;
+
+		return value.Value.ThrowIfNegative(name);
+	}
+
+	/// <summary>
+	/// Throws an exception if the specified long value is negative.
+	/// </summary>
+	/// <param name="value">The long value to check.</param>
+	/// <param name="name">The name of the variable to include in the exception.</param>
+	/// <returns>The original value if it is not negative.</returns>
+	/// <exception cref="ArgumentOutOfRangeException">Thrown when the value is negative.</exception>
+	public static long ThrowIfNegative(this long value, string name)
+	{
+		if (value < 0)
+			throw new ArgumentOutOfRangeException(name, value, "Invalid value.".Localize());
+
+		return value;
 	}
 }
\ No newline at end of file
diff --git a/ComponentModel/PriceExtensions.cs b/ComponentModel/PriceExtensions.cs
index f62f53cd..ef95c3fc 100644
--- a/ComponentModel/PriceExtensions.cs
+++ b/ComponentModel/PriceExtensions.cs
@@ -1,71 +1,70 @@
-namespace Ecng.ComponentModel
-{
-	using System;
+namespace Ecng.ComponentModel;
+
+using System;
 
-	using Ecng.Common;
+using Ecng.Common;
 
+/// <summary>
+/// <see cref="Price"/> extension methods.
+/// </summary>
+public static class PriceExtensions
+{
 	/// <summary>
-	/// <see cref="Price"/> extension methods.
+	/// Convert string to <see cref="Price"/>.
 	/// </summary>
-	public static class PriceExtensions
+	/// <param name="str">String value of <see cref="Price"/>.</param>
+	/// <param name="throwIfNull">Throw <see cref="ArgumentNullException"/> if the specified string is empty.</param>
+	/// <returns>Object <see cref="Price"/>.</returns>
+	public static Price ToPriceType(this string str, bool throwIfNull = default)
 	{
-		/// <summary>
-		/// Convert string to <see cref="Price"/>.
-		/// </summary>
-		/// <param name="str">String value of <see cref="Price"/>.</param>
-		/// <param name="throwIfNull">Throw <see cref="ArgumentNullException"/> if the specified string is empty.</param>
-		/// <returns>Object <see cref="Price"/>.</returns>
-		public static Price ToPriceType(this string str, bool throwIfNull = default)
+		if (str.IsEmpty())
 		{
-			if (str.IsEmpty())
-			{
-				if (throwIfNull)
-					throw new ArgumentNullException(nameof(str));
+			if (throwIfNull)
+				throw new ArgumentNullException(nameof(str));
 
-				return null;
-			}
+			return null;
+		}
 
-			Price price = new();
+		Price price = new();
 
-			var last = str[str.Length - 1];
-			
-			if (!last.IsDigit())
-			{
-				last = last.ToLower();
-				str = str.Substring(0, str.Length - 1);
+		var last = str[str.Length - 1];
+		
+		if (!last.IsDigit())
+		{
+			last = last.ToLower();
+			str = str.Substring(0, str.Length - 1);
 
-				price.Type = last switch
-				{
-					Price.PercentChar => PriceTypes.Percent,
-					Price.LimitChar => PriceTypes.Limit,
-					_ => throw new ArgumentOutOfRangeException(nameof(str), $"Unknown unit of measurement '{last}'."),
-				};
-			}
+			price.Type = last switch
+			{
+				Price.PercentChar => PriceTypes.Percent,
+				Price.LimitChar => PriceTypes.Limit,
+				_ => throw new ArgumentOutOfRangeException(nameof(str), $"Unknown unit of measurement '{last}'."),
+			};
+		}
 
-			price.Value = str.To<decimal>();
+		price.Value = str.To<decimal>();
 
-			return price;
-		}
+		return price;
+	}
 
-		/// <summary>
-		/// Convert the <see cref="int"/> to percents.
-		/// </summary>
-		/// <param name="value"><see cref="int"/> value.</param>
-		/// <returns>Percents.</returns>
-		public static Price Percents(this int value) => Percents((decimal)value);
+	/// <summary>
+	/// Convert the <see cref="int"/> to percents.
+	/// </summary>
+	/// <param name="value"><see cref="int"/> value.</param>
+	/// <returns>Percents.</returns>
+	public static Price Percents(this int value) => Percents((decimal)value);
 
-		/// <summary>
-		/// Convert the <see cref="double"/> to percents.
-		/// </summary>
-		/// <param name="value"><see cref="double"/> value.</param>
-		/// <returns>Percents.</returns>
-		public static Price Percents(this double value) => Percents((decimal)value);
+	/// <summary>
+	/// Convert the <see cref="double"/> to percents.
+	/// </summary>
+	/// <param name="value"><see cref="double"/> value.</param>
+	/// <returns>Percents.</returns>
+	public static Price Percents(this double value) => Percents((decimal)value);
 
-		/// <summary>
-		/// Convert the <see cref="decimal"/> to percents.
-		/// </summary>
-		/// <param name="value"><see cref="decimal"/> value.</param>
-		/// <returns>Percents.</returns>
-		public static Price Percents(this decimal value) => new(value, PriceTypes.Percent);
-	}
+	/// <summary>
+	/// Convert the <see cref="decimal"/> to percents.
+	/// </summary>
+	/// <param name="value"><see cref="decimal"/> value.</param>
+	/// <returns>Percents.</returns>
+	public static Price Percents(this decimal value) => new(value, PriceTypes.Percent);
 }
\ No newline at end of file
diff --git a/ComponentModel/Range.cs b/ComponentModel/Range.cs
index c53722e9..ab50e262 100644
--- a/ComponentModel/Range.cs
+++ b/ComponentModel/Range.cs
@@ -1,453 +1,452 @@
-namespace Ecng.ComponentModel
-{
-	using System;
-	using System.ComponentModel;
+namespace Ecng.ComponentModel;
+
+using System;
+using System.ComponentModel;
 
-	using Ecng.Common;
+using Ecng.Common;
 
+/// <summary>
+/// Represents a range with a minimum and maximum value.
+/// </summary>
+public interface IRange
+{
 	/// <summary>
-	/// Represents a range with a minimum and maximum value.
+	/// Gets a value indicating whether this instance has a minimum value.
 	/// </summary>
-	public interface IRange
-	{
-		/// <summary>
-		/// Gets a value indicating whether this instance has a minimum value.
-		/// </summary>
-		bool HasMinValue { get; }
+	bool HasMinValue { get; }
 
-		/// <summary>
-		/// Gets a value indicating whether this instance has a maximum value.
-		/// </summary>
-		bool HasMaxValue { get; }
+	/// <summary>
+	/// Gets a value indicating whether this instance has a maximum value.
+	/// </summary>
+	bool HasMaxValue { get; }
 
-		/// <summary>
-		/// Gets or sets the minimum value of the range.
-		/// </summary>
-		object Min { get; set; }
+	/// <summary>
+	/// Gets or sets the minimum value of the range.
+	/// </summary>
+	object Min { get; set; }
 
-		/// <summary>
-		/// Gets or sets the maximum value of the range.
-		/// </summary>
-		object Max { get; set; }
+	/// <summary>
+	/// Gets or sets the maximum value of the range.
+	/// </summary>
+	object Max { get; set; }
+}
+
+/// <summary>
+/// Represents a generic range defined by a minimum and maximum value.
+/// </summary>
+/// <typeparam name="T">The type of the range values. Must implement IComparable&lt;T&gt;.</typeparam>
+[Serializable]
+public class Range<T> : Equatable<Range<T>>, IConvertible, IRange
+	where T : IComparable<T>
+{
+	/// <summary>
+	/// Initializes static members of the <see cref="Range{T}"/> class.
+	/// </summary>
+	static Range()
+	{
+		MinValue = default;
+		MaxValue = default;
 	}
 
 	/// <summary>
-	/// Represents a generic range defined by a minimum and maximum value.
+	/// Initializes a new instance of the <see cref="Range{T}"/> class.
 	/// </summary>
-	/// <typeparam name="T">The type of the range values. Must implement IComparable&lt;T&gt;.</typeparam>
-	[Serializable]
-	public class Range<T> : Equatable<Range<T>>, IConvertible, IRange
-		where T : IComparable<T>
-	{
-		/// <summary>
-		/// Initializes static members of the <see cref="Range{T}"/> class.
-		/// </summary>
-		static Range()
-		{
-			MinValue = default;
-			MaxValue = default;
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="Range{T}"/> class.
-		/// </summary>
-		public Range()
-		{
-		}
+	public Range()
+	{
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="Range{T}"/> class with specified minimum and maximum values.
-		/// </summary>
-		/// <param name="min">The minimum value of the range.</param>
-		/// <param name="max">The maximum value of the range.</param>
-		public Range(T min, T max)
-		{
-			Init(min, max);
-		}
+	/// <summary>
+	/// Initializes a new instance of the <see cref="Range{T}"/> class with specified minimum and maximum values.
+	/// </summary>
+	/// <param name="min">The minimum value of the range.</param>
+	/// <param name="max">The maximum value of the range.</param>
+	public Range(T min, T max)
+	{
+		Init(min, max);
+	}
 
-		/// <summary>
-		/// Represents the smallest possible value of type <typeparamref name="T"/>.
-		/// </summary>
-		public static readonly T MinValue;
+	/// <summary>
+	/// Represents the smallest possible value of type <typeparamref name="T"/>.
+	/// </summary>
+	public static readonly T MinValue;
 
-		/// <summary>
-		/// Represents the largest possible value of type <typeparamref name="T"/>.
-		/// </summary>
-		public static readonly T MaxValue;
+	/// <summary>
+	/// Represents the largest possible value of type <typeparamref name="T"/>.
+	/// </summary>
+	public static readonly T MaxValue;
 
-		#region HasMinValue
+	#region HasMinValue
 
-		/// <summary>
-		/// Gets a value indicating whether the range has a specified minimum value.
-		/// </summary>
-		[Browsable(false)]
-		public bool HasMinValue => _min.HasValue;
+	/// <summary>
+	/// Gets a value indicating whether the range has a specified minimum value.
+	/// </summary>
+	[Browsable(false)]
+	public bool HasMinValue => _min.HasValue;
 
-		#endregion
+	#endregion
 
-		#region HasMaxValue
+	#region HasMaxValue
 
-		/// <summary>
-		/// Gets a value indicating whether the range has a specified maximum value.
-		/// </summary>
-		[Browsable(false)]
-		public bool HasMaxValue => _max.HasValue;
+	/// <summary>
+	/// Gets a value indicating whether the range has a specified maximum value.
+	/// </summary>
+	[Browsable(false)]
+	public bool HasMaxValue => _max.HasValue;
 
-		#endregion
+	#endregion
 
-		#region Length
+	#region Length
 
-		private static IOperator<T> _operator;
+	private static IOperator<T> _operator;
 
-		/// <summary>
-		/// Gets the difference between the maximum and minimum values of the range.
-		/// Returns <see cref="MaxValue"/> if either bound is not defined.
-		/// </summary>
-		[Browsable(false)]
-		public T Length
+	/// <summary>
+	/// Gets the difference between the maximum and minimum values of the range.
+	/// Returns <see cref="MaxValue"/> if either bound is not defined.
+	/// </summary>
+	[Browsable(false)]
+	public T Length
+	{
+		get
 		{
-			get
+			if (!HasMinValue || !HasMaxValue)
+				return MaxValue;
+			else
 			{
-				if (!HasMinValue || !HasMaxValue)
-					return MaxValue;
-				else
-				{
-					if (_operator is null)
-						_operator = OperatorRegistry.GetOperator<T>();
-
-					return _operator.Subtract(Max, Min);
-				}
+				if (_operator is null)
+					_operator = OperatorRegistry.GetOperator<T>();
+
+				return _operator.Subtract(Max, Min);
 			}
 		}
+	}
 
-		#endregion
+	#endregion
 
-		#region Min
+	#region Min
 
-		//private bool _isMinInit;
-		private readonly NullableEx<T> _min = new();
+	//private bool _isMinInit;
+	private readonly NullableEx<T> _min = new();
 
-		/// <summary>
-		/// Gets or sets the minimum value of the range.
-		/// </summary>
-		/// <exception cref="ArgumentOutOfRangeException">
-		/// Thrown when the new minimum value is greater than the current maximum value.
-		/// </exception>
-		public T Min
+	/// <summary>
+	/// Gets or sets the minimum value of the range.
+	/// </summary>
+	/// <exception cref="ArgumentOutOfRangeException">
+	/// Thrown when the new minimum value is greater than the current maximum value.
+	/// </exception>
+	public T Min
+	{
+		get => _min.Value;
+		set
 		{
-			get => _min.Value;
-			set
-			{
-				if (_max.HasValue)
-					ValidateBounds(value, Max);
+			if (_max.HasValue)
+				ValidateBounds(value, Max);
 
-				_min.Value = value;
-				//_isMinInit = true;
-			}
+			_min.Value = value;
+			//_isMinInit = true;
 		}
+	}
 
-		#endregion
+	#endregion
 
-		#region Max
+	#region Max
 
-		//private bool _isMaxInit;
-		private readonly NullableEx<T> _max = new();
+	//private bool _isMaxInit;
+	private readonly NullableEx<T> _max = new();
 
-		/// <summary>
-		/// Gets or sets the maximum value of the range.
-		/// </summary>
-		/// <exception cref="ArgumentOutOfRangeException">
-		/// Thrown when the new maximum value is less than the current minimum value.
-		/// </exception>
-		public T Max
+	/// <summary>
+	/// Gets or sets the maximum value of the range.
+	/// </summary>
+	/// <exception cref="ArgumentOutOfRangeException">
+	/// Thrown when the new maximum value is less than the current minimum value.
+	/// </exception>
+	public T Max
+	{
+		get => _max.Value;
+		set
 		{
-			get => _max.Value;
-			set
-			{
-				if (_min.HasValue)
-					ValidateBounds(Min, value);
+			if (_min.HasValue)
+				ValidateBounds(Min, value);
 
-				_max.Value = value;
-				//_isMaxInit = true;
-			}
+			_max.Value = value;
+			//_isMaxInit = true;
 		}
+	}
 
-		#endregion
+	#endregion
 
-		#region Parse
+	#region Parse
 
-		/// <summary>
-		/// Defines an explicit conversion of a string representation to a <see cref="Range{T}"/>.
-		/// </summary>
-		/// <param name="str">The string representation of the range.</param>
-		public static explicit operator Range<T>(string str)
-		{
-			return Parse(str);
-		}
+	/// <summary>
+	/// Defines an explicit conversion of a string representation to a <see cref="Range{T}"/>.
+	/// </summary>
+	/// <param name="str">The string representation of the range.</param>
+	public static explicit operator Range<T>(string str)
+	{
+		return Parse(str);
+	}
 
-		/// <summary>
-		/// Parses the specified string representation and returns a new <see cref="Range{T}"/> instance.
-		/// </summary>
-		/// <param name="value">The string representation of the range.</param>
-		/// <returns>A new instance of <see cref="Range{T}"/> representing the parsed range.</returns>
-		/// <exception cref="ArgumentNullException">Thrown if the input string is empty.</exception>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown if the string length is less than 3.</exception>
-		public static Range<T> Parse(string value)
-		{
-			if (value.IsEmpty())
-				throw new ArgumentNullException(nameof(value));
+	/// <summary>
+	/// Parses the specified string representation and returns a new <see cref="Range{T}"/> instance.
+	/// </summary>
+	/// <param name="value">The string representation of the range.</param>
+	/// <returns>A new instance of <see cref="Range{T}"/> representing the parsed range.</returns>
+	/// <exception cref="ArgumentNullException">Thrown if the input string is empty.</exception>
+	/// <exception cref="ArgumentOutOfRangeException">Thrown if the string length is less than 3.</exception>
+	public static Range<T> Parse(string value)
+	{
+		if (value.IsEmpty())
+			throw new ArgumentNullException(nameof(value));
 
-			if (value.Length < 3)
-				throw new ArgumentOutOfRangeException(nameof(value));
+		if (value.Length < 3)
+			throw new ArgumentOutOfRangeException(nameof(value));
 
-			value = value.Substring(1, value.Length - 2);
+		value = value.Substring(1, value.Length - 2);
 
-			value = value.Remove("Min:");
+		value = value.Remove("Min:");
 
-			var part1 = value.Substring(0, value.IndexOf("Max:") - 1);
-			var part2 = value.Substring(value.IndexOf("Max:") + 4);
+		var part1 = value.Substring(0, value.IndexOf("Max:") - 1);
+		var part2 = value.Substring(value.IndexOf("Max:") + 4);
 
-			var range = new Range<T>();
+		var range = new Range<T>();
 
-			if (!part1.IsEmpty() && part1 != "null")
-				range.Min = part1.To<T>();
-			
-			if (!part2.IsEmpty() && part2 != "null")
-				range.Max = part2.To<T>();
-			
-			return range;
-		}
+		if (!part1.IsEmpty() && part1 != "null")
+			range.Min = part1.To<T>();
+		
+		if (!part2.IsEmpty() && part2 != "null")
+			range.Max = part2.To<T>();
+		
+		return range;
+	}
 
-		#endregion
+	#endregion
 
-		#region Object Members
+	#region Object Members
 
-		/// <inheritdoc/>
-		public override int GetHashCode()
-		{
-			return (HasMinValue ? Min.GetHashCode() : 0) ^ (HasMaxValue ? Max.GetHashCode() : 0);
-		}
+	/// <inheritdoc/>
+	public override int GetHashCode()
+	{
+		return (HasMinValue ? Min.GetHashCode() : 0) ^ (HasMaxValue ? Max.GetHashCode() : 0);
+	}
 
-		/// <inheritdoc/>
-		public override string ToString()
-		{
-			return "{{Min:{0} Max:{1}}}".Put(HasMinValue ? Min.ToString() : "null", HasMaxValue ? Max.ToString() : "null");
-		}
+	/// <inheritdoc/>
+	public override string ToString()
+	{
+		return "{{Min:{0} Max:{1}}}".Put(HasMinValue ? Min.ToString() : "null", HasMaxValue ? Max.ToString() : "null");
+	}
 
-		#endregion
+	#endregion
 
-		#region Equatable<Range<T>> Members
+	#region Equatable<Range<T>> Members
 
-		/// <inheritdoc/>
-		protected override bool OnEquals(Range<T> other)
-		{
-			return _min == other._min && _max == other._max;
-		}
-
-		#endregion
+	/// <inheritdoc/>
+	protected override bool OnEquals(Range<T> other)
+	{
+		return _min == other._min && _max == other._max;
+	}
 
-		object IRange.Min
-		{
-			get => HasMinValue ? Min : null;
-			set => Min = (T)value;
-		}
+	#endregion
 
-		object IRange.Max
-		{
-			get => HasMaxValue ? Max : null;
-			set => Max = (T)value;
-		}
+	object IRange.Min
+	{
+		get => HasMinValue ? Min : null;
+		set => Min = (T)value;
+	}
 
-		/// <inheritdoc/>
-		public override Range<T> Clone()
-		{
-			return new Range<T>(Min, Max);
-		}
+	object IRange.Max
+	{
+		get => HasMaxValue ? Max : null;
+		set => Max = (T)value;
+	}
 
-		/// <summary>
-		/// Determines whether the current range completely contains another range.
-		/// </summary>
-		/// <param name="range">The range to check against.</param>
-		/// <returns>true if the range is contained; otherwise, false.</returns>
-		/// <exception cref="ArgumentNullException">Thrown if the provided range is null.</exception>
-		public bool Contains(Range<T> range)
-		{
-			if (range is null)
-				throw new ArgumentNullException(nameof(range));
+	/// <inheritdoc/>
+	public override Range<T> Clone()
+	{
+		return new Range<T>(Min, Max);
+	}
 
-			return Contains(range.Min) && Contains(range.Max);
-		}
+	/// <summary>
+	/// Determines whether the current range completely contains another range.
+	/// </summary>
+	/// <param name="range">The range to check against.</param>
+	/// <returns>true if the range is contained; otherwise, false.</returns>
+	/// <exception cref="ArgumentNullException">Thrown if the provided range is null.</exception>
+	public bool Contains(Range<T> range)
+	{
+		if (range is null)
+			throw new ArgumentNullException(nameof(range));
 
-		/// <summary>
-		/// Returns the intersection of the current range with another range.
-		/// </summary>
-		/// <param name="range">The range with which to intersect.</param>
-		/// <returns>
-		/// A new <see cref="Range{T}"/> representing the overlap between the two ranges, or null if there is no intersection.
-		/// </returns>
-		/// <exception cref="ArgumentNullException">Thrown if the provided range is null.</exception>
-		public Range<T> Intersect(Range<T> range)
-		{
-			if (range is null)
-				throw new ArgumentNullException(nameof(range));
+		return Contains(range.Min) && Contains(range.Max);
+	}
 
-			if (Contains(range))
-				return range.Clone();
-			else if (range.Contains(this))
-				return Clone();
+	/// <summary>
+	/// Returns the intersection of the current range with another range.
+	/// </summary>
+	/// <param name="range">The range with which to intersect.</param>
+	/// <returns>
+	/// A new <see cref="Range{T}"/> representing the overlap between the two ranges, or null if there is no intersection.
+	/// </returns>
+	/// <exception cref="ArgumentNullException">Thrown if the provided range is null.</exception>
+	public Range<T> Intersect(Range<T> range)
+	{
+		if (range is null)
+			throw new ArgumentNullException(nameof(range));
+
+		if (Contains(range))
+			return range.Clone();
+		else if (range.Contains(this))
+			return Clone();
+		else
+		{
+			var containsMin = Contains(range.Min);
+			var containsMax = Contains(range.Max);
+
+			if (containsMin)
+				return new Range<T>(range.Min, Max);
+			else if (containsMax)
+				return new Range<T>(Min, range.Max);
 			else
-			{
-				var containsMin = Contains(range.Min);
-				var containsMax = Contains(range.Max);
-
-				if (containsMin)
-					return new Range<T>(range.Min, Max);
-				else if (containsMax)
-					return new Range<T>(Min, range.Max);
-				else
-					return null;
-			}
+				return null;
 		}
+	}
 
-		/// <summary>
-		/// Creates a sub-range from the current range given the specified minimum and maximum values.
-		/// </summary>
-		/// <param name="min">The minimum value of the sub-range.</param>
-		/// <param name="max">The maximum value of the sub-range.</param>
-		/// <returns>A new <see cref="Range{T}"/> representing the sub-range.</returns>
-		/// <exception cref="ArgumentException">Thrown if either min or max is not contained within the current range.</exception>
-		public Range<T> SubRange(T min, T max)
-		{
-			if (!Contains(min))
-				throw new ArgumentException("Not in range.", nameof(min));
+	/// <summary>
+	/// Creates a sub-range from the current range given the specified minimum and maximum values.
+	/// </summary>
+	/// <param name="min">The minimum value of the sub-range.</param>
+	/// <param name="max">The maximum value of the sub-range.</param>
+	/// <returns>A new <see cref="Range{T}"/> representing the sub-range.</returns>
+	/// <exception cref="ArgumentException">Thrown if either min or max is not contained within the current range.</exception>
+	public Range<T> SubRange(T min, T max)
+	{
+		if (!Contains(min))
+			throw new ArgumentException("Not in range.", nameof(min));
 
-			if (!Contains(max))
-				throw new ArgumentException("Not in range.", nameof(max));
+		if (!Contains(max))
+			throw new ArgumentException("Not in range.", nameof(max));
 
-			return new(min, max);
-		}
+		return new(min, max);
+	}
 
-		/// <summary>
-		/// Determines whether the specified value is within the current range.
-		/// </summary>
-		/// <param name="value">The value to test.</param>
-		/// <returns>true if the value is within the range; otherwise, false.</returns>
-		public bool Contains(T value)
-		{
-			if (_min.HasValue && Min.CompareTo(value) > 0)
-				return false;
-			else if (_max.HasValue && Max.CompareTo(value) < 0)
-				return false;
-			else
-				return true;
-		}
+	/// <summary>
+	/// Determines whether the specified value is within the current range.
+	/// </summary>
+	/// <param name="value">The value to test.</param>
+	/// <returns>true if the value is within the range; otherwise, false.</returns>
+	public bool Contains(T value)
+	{
+		if (_min.HasValue && Min.CompareTo(value) > 0)
+			return false;
+		else if (_max.HasValue && Max.CompareTo(value) < 0)
+			return false;
+		else
+			return true;
+	}
 
-		/// <summary>
-		/// Initializes the range with the specified minimum and maximum values.
-		/// </summary>
-		/// <param name="min">The minimum value.</param>
-		/// <param name="max">The maximum value.</param>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown if the minimum value is greater than the maximum value.</exception>
-		private void Init(T min, T max)
-		{
-			ValidateBounds(min, max);
+	/// <summary>
+	/// Initializes the range with the specified minimum and maximum values.
+	/// </summary>
+	/// <param name="min">The minimum value.</param>
+	/// <param name="max">The maximum value.</param>
+	/// <exception cref="ArgumentOutOfRangeException">Thrown if the minimum value is greater than the maximum value.</exception>
+	private void Init(T min, T max)
+	{
+		ValidateBounds(min, max);
 
-			_min.Value = min;
-			_max.Value = max;
-		}
+		_min.Value = min;
+		_max.Value = max;
+	}
 
-		private static void ValidateBounds(T min, T max)
-		{
-			if (min.CompareTo(max) > 0)
-				throw new ArgumentOutOfRangeException(nameof(min), $"Min value {min} is more than max value {max}.");
-		}
+	private static void ValidateBounds(T min, T max)
+	{
+		if (min.CompareTo(max) > 0)
+			throw new ArgumentOutOfRangeException(nameof(min), $"Min value {min} is more than max value {max}.");
+	}
 
-		TypeCode IConvertible.GetTypeCode()
-		{
-			return TypeCode.Object;
-		}
+	TypeCode IConvertible.GetTypeCode()
+	{
+		return TypeCode.Object;
+	}
 
-		bool IConvertible.ToBoolean(IFormatProvider provider)
-		{
-			throw new InvalidCastException();
-		}
+	bool IConvertible.ToBoolean(IFormatProvider provider)
+	{
+		throw new InvalidCastException();
+	}
 
-		char IConvertible.ToChar(IFormatProvider provider)
-		{
-			throw new InvalidCastException();
-		}
+	char IConvertible.ToChar(IFormatProvider provider)
+	{
+		throw new InvalidCastException();
+	}
 
-		sbyte IConvertible.ToSByte(IFormatProvider provider)
-		{
-			throw new InvalidCastException();
-		}
+	sbyte IConvertible.ToSByte(IFormatProvider provider)
+	{
+		throw new InvalidCastException();
+	}
 
-		byte IConvertible.ToByte(IFormatProvider provider)
-		{
-			throw new InvalidCastException();
-		}
+	byte IConvertible.ToByte(IFormatProvider provider)
+	{
+		throw new InvalidCastException();
+	}
 
-		short IConvertible.ToInt16(IFormatProvider provider)
-		{
-			throw new InvalidCastException();
-		}
+	short IConvertible.ToInt16(IFormatProvider provider)
+	{
+		throw new InvalidCastException();
+	}
 
-		ushort IConvertible.ToUInt16(IFormatProvider provider)
-		{
-			throw new InvalidCastException();
-		}
+	ushort IConvertible.ToUInt16(IFormatProvider provider)
+	{
+		throw new InvalidCastException();
+	}
 
-		int IConvertible.ToInt32(IFormatProvider provider)
-		{
-			throw new InvalidCastException();
-		}
+	int IConvertible.ToInt32(IFormatProvider provider)
+	{
+		throw new InvalidCastException();
+	}
 
-		uint IConvertible.ToUInt32(IFormatProvider provider)
-		{
-			throw new InvalidCastException();
-		}
+	uint IConvertible.ToUInt32(IFormatProvider provider)
+	{
+		throw new InvalidCastException();
+	}
 
-		long IConvertible.ToInt64(IFormatProvider provider)
-		{
-			throw new InvalidCastException();
-		}
+	long IConvertible.ToInt64(IFormatProvider provider)
+	{
+		throw new InvalidCastException();
+	}
 
-		ulong IConvertible.ToUInt64(IFormatProvider provider)
-		{
-			throw new InvalidCastException();
-		}
+	ulong IConvertible.ToUInt64(IFormatProvider provider)
+	{
+		throw new InvalidCastException();
+	}
 
-		float IConvertible.ToSingle(IFormatProvider provider)
-		{
-			throw new InvalidCastException();
-		}
+	float IConvertible.ToSingle(IFormatProvider provider)
+	{
+		throw new InvalidCastException();
+	}
 
-		double IConvertible.ToDouble(IFormatProvider provider)
-		{
-			throw new InvalidCastException();
-		}
+	double IConvertible.ToDouble(IFormatProvider provider)
+	{
+		throw new InvalidCastException();
+	}
 
-		decimal IConvertible.ToDecimal(IFormatProvider provider)
-		{
-			throw new InvalidCastException();
-		}
+	decimal IConvertible.ToDecimal(IFormatProvider provider)
+	{
+		throw new InvalidCastException();
+	}
 
-		DateTime IConvertible.ToDateTime(IFormatProvider provider)
-		{
-			throw new InvalidCastException();
-		}
+	DateTime IConvertible.ToDateTime(IFormatProvider provider)
+	{
+		throw new InvalidCastException();
+	}
 
-		string IConvertible.ToString(IFormatProvider provider)
-		{
-			return ToString();
-		}
+	string IConvertible.ToString(IFormatProvider provider)
+	{
+		return ToString();
+	}
 
-		object IConvertible.ToType(Type conversionType, IFormatProvider provider)
-		{
-			if (conversionType == typeof(string))
-				return ToString();
+	object IConvertible.ToType(Type conversionType, IFormatProvider provider)
+	{
+		if (conversionType == typeof(string))
+			return ToString();
 
-			throw new InvalidCastException();
-		}
+		throw new InvalidCastException();
 	}
 }
\ No newline at end of file
diff --git a/ComponentModel/RangeHelper.cs b/ComponentModel/RangeHelper.cs
index 700b0d8d..d6f3d15c 100644
--- a/ComponentModel/RangeHelper.cs
+++ b/ComponentModel/RangeHelper.cs
@@ -1,230 +1,229 @@
-namespace Ecng.ComponentModel
-{
-	using System;
-	using System.Collections.Generic;
-	using System.Linq;
+namespace Ecng.ComponentModel;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
-	using Ecng.Collections;
-	using Ecng.Common;
-	using Ecng.Serialization;
+using Ecng.Collections;
+using Ecng.Common;
+using Ecng.Serialization;
 
+/// <summary>
+/// Provides helper methods for manipulating Range objects.
+/// </summary>
+public static class RangeHelper
+{
 	/// <summary>
-	/// Provides helper methods for manipulating Range objects.
+	/// Determines whether the specified range is empty, meaning it has no defined minimum or maximum value.
 	/// </summary>
-	public static class RangeHelper
+	/// <typeparam name="T">The type of the range values. Must implement IComparable&lt;T&gt;.</typeparam>
+	/// <param name="range">The range to check.</param>
+	/// <returns>true if the range has no minimum and maximum value; otherwise, false.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when the range is null.</exception>
+	public static bool IsEmpty<T>(this Range<T> range)
+		where T : IComparable<T>
 	{
-		/// <summary>
-		/// Determines whether the specified range is empty, meaning it has no defined minimum or maximum value.
-		/// </summary>
-		/// <typeparam name="T">The type of the range values. Must implement IComparable&lt;T&gt;.</typeparam>
-		/// <param name="range">The range to check.</param>
-		/// <returns>true if the range has no minimum and maximum value; otherwise, false.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when the range is null.</exception>
-		public static bool IsEmpty<T>(this Range<T> range)
-			where T : IComparable<T>
-		{
-			if (range is null)
-				throw new ArgumentNullException(nameof(range));
+		if (range is null)
+			throw new ArgumentNullException(nameof(range));
 
-			return !range.HasMaxValue && !range.HasMinValue;
-		}
+		return !range.HasMaxValue && !range.HasMinValue;
+	}
 
-		/// <summary>
-		/// Joins overlapping or contiguous ranges in the collection.
-		/// </summary>
-		/// <typeparam name="T">The type of the range values. Must implement IComparable&lt;T&gt;.</typeparam>
-		/// <param name="ranges">The collection of ranges to join.</param>
-		/// <returns>A collection of combined ranges.</returns>
-		public static IEnumerable<Range<T>> JoinRanges<T>(this IEnumerable<Range<T>> ranges)
-			where T : IComparable<T>
-		{
-			var orderedRanges = ranges.OrderBy(r => r.Min).ToList();
+	/// <summary>
+	/// Joins overlapping or contiguous ranges in the collection.
+	/// </summary>
+	/// <typeparam name="T">The type of the range values. Must implement IComparable&lt;T&gt;.</typeparam>
+	/// <param name="ranges">The collection of ranges to join.</param>
+	/// <returns>A collection of combined ranges.</returns>
+	public static IEnumerable<Range<T>> JoinRanges<T>(this IEnumerable<Range<T>> ranges)
+		where T : IComparable<T>
+	{
+		var orderedRanges = ranges.OrderBy(r => r.Min).ToList();
 
-			for (var i = 0; i < orderedRanges.Count - 1; )
+		for (var i = 0; i < orderedRanges.Count - 1; )
+		{
+			if (orderedRanges[i].Contains(orderedRanges[i + 1]))
 			{
-				if (orderedRanges[i].Contains(orderedRanges[i + 1]))
-				{
-					orderedRanges.RemoveAt(i + 1);
-				}
-				else if (orderedRanges[i + 1].Contains(orderedRanges[i]))
-				{
-					orderedRanges.RemoveAt(i);
-				}
-				else if (orderedRanges[i].Intersect(orderedRanges[i + 1]) != null)
-				{
-					orderedRanges[i] = new Range<T>(orderedRanges[i].Min, orderedRanges[i + 1].Max);
-					orderedRanges.RemoveAt(i + 1);
-				}
-				else
-					i++;
+				orderedRanges.RemoveAt(i + 1);
 			}
-
-			return orderedRanges;
+			else if (orderedRanges[i + 1].Contains(orderedRanges[i]))
+			{
+				orderedRanges.RemoveAt(i);
+			}
+			else if (orderedRanges[i].Intersect(orderedRanges[i + 1]) != null)
+			{
+				orderedRanges[i] = new Range<T>(orderedRanges[i].Min, orderedRanges[i + 1].Max);
+				orderedRanges.RemoveAt(i + 1);
+			}
+			else
+				i++;
 		}
 
-		/// <summary>
-		/// Excludes the specified DateTimeOffset range from the current range.
-		/// </summary>
-		/// <param name="from">The original DateTimeOffset range.</param>
-		/// <param name="excludingRange">The DateTimeOffset range to exclude.</param>
-		/// <returns>A collection of remaining DateTimeOffset ranges after exclusion.</returns>
-		public static IEnumerable<Range<DateTimeOffset>> Exclude(this Range<DateTimeOffset> from, Range<DateTimeOffset> excludingRange)
-		{
-			return new Range<long>(from.Min.UtcTicks, from.Max.UtcTicks)
-				.Exclude(new Range<long>(excludingRange.Min.UtcTicks, excludingRange.Max.UtcTicks))
-				.Select(r => new Range<DateTimeOffset>(r.Min.To<DateTimeOffset>(), r.Max.To<DateTimeOffset>()));
-		}
+		return orderedRanges;
+	}
 
-		/// <summary>
-		/// Excludes the specified DateTime range from the current range.
-		/// </summary>
-		/// <param name="from">The original DateTime range.</param>
-		/// <param name="excludingRange">The DateTime range to exclude.</param>
-		/// <returns>A collection of remaining DateTime ranges after exclusion.</returns>
-		public static IEnumerable<Range<DateTime>> Exclude(this Range<DateTime> from, Range<DateTime> excludingRange)
-		{
-			return new Range<long>(from.Min.Ticks, from.Max.Ticks)
-				.Exclude(new Range<long>(excludingRange.Min.Ticks, excludingRange.Max.Ticks))
-				.Select(r => new Range<DateTime>(r.Min.To<DateTime>(), r.Max.To<DateTime>()));
-		}
+	/// <summary>
+	/// Excludes the specified DateTimeOffset range from the current range.
+	/// </summary>
+	/// <param name="from">The original DateTimeOffset range.</param>
+	/// <param name="excludingRange">The DateTimeOffset range to exclude.</param>
+	/// <returns>A collection of remaining DateTimeOffset ranges after exclusion.</returns>
+	public static IEnumerable<Range<DateTimeOffset>> Exclude(this Range<DateTimeOffset> from, Range<DateTimeOffset> excludingRange)
+	{
+		return new Range<long>(from.Min.UtcTicks, from.Max.UtcTicks)
+			.Exclude(new Range<long>(excludingRange.Min.UtcTicks, excludingRange.Max.UtcTicks))
+			.Select(r => new Range<DateTimeOffset>(r.Min.To<DateTimeOffset>(), r.Max.To<DateTimeOffset>()));
+	}
 
-		/// <summary>
-		/// Excludes the specified long range from the current long range.
-		/// </summary>
-		/// <param name="from">The original long range.</param>
-		/// <param name="excludingRange">The long range to exclude.</param>
-		/// <returns>A collection of remaining long ranges after exclusion.</returns>
-		public static IEnumerable<Range<long>> Exclude(this Range<long> from, Range<long> excludingRange)
+	/// <summary>
+	/// Excludes the specified DateTime range from the current range.
+	/// </summary>
+	/// <param name="from">The original DateTime range.</param>
+	/// <param name="excludingRange">The DateTime range to exclude.</param>
+	/// <returns>A collection of remaining DateTime ranges after exclusion.</returns>
+	public static IEnumerable<Range<DateTime>> Exclude(this Range<DateTime> from, Range<DateTime> excludingRange)
+	{
+		return new Range<long>(from.Min.Ticks, from.Max.Ticks)
+			.Exclude(new Range<long>(excludingRange.Min.Ticks, excludingRange.Max.Ticks))
+			.Select(r => new Range<DateTime>(r.Min.To<DateTime>(), r.Max.To<DateTime>()));
+	}
+
+	/// <summary>
+	/// Excludes the specified long range from the current long range.
+	/// </summary>
+	/// <param name="from">The original long range.</param>
+	/// <param name="excludingRange">The long range to exclude.</param>
+	/// <returns>A collection of remaining long ranges after exclusion.</returns>
+	public static IEnumerable<Range<long>> Exclude(this Range<long> from, Range<long> excludingRange)
+	{
+		var intersectedRange = from.Intersect(excludingRange);
+
+		if (intersectedRange is null)
+			yield return from;
+		else
 		{
-			var intersectedRange = from.Intersect(excludingRange);
+			if (from == intersectedRange)
+				yield break;
 
-			if (intersectedRange is null)
-				yield return from;
-			else
+			if (from.Contains(intersectedRange))
 			{
-				if (from == intersectedRange)
-					yield break;
+				if (from.Min != intersectedRange.Min)
+					yield return new Range<long>(from.Min, intersectedRange.Min - 1);
 
-				if (from.Contains(intersectedRange))
-				{
-					if (from.Min != intersectedRange.Min)
-						yield return new Range<long>(from.Min, intersectedRange.Min - 1);
-
-					if (from.Max != intersectedRange.Max)
-						yield return new Range<long>(intersectedRange.Max + 1, from.Max);
-				}
+				if (from.Max != intersectedRange.Max)
+					yield return new Range<long>(intersectedRange.Max + 1, from.Max);
+			}
+			else
+			{
+				if (from.Min < intersectedRange.Min)
+					yield return new Range<long>(from.Min, intersectedRange.Min);
 				else
-				{
-					if (from.Min < intersectedRange.Min)
-						yield return new Range<long>(from.Min, intersectedRange.Min);
-					else
-						yield return new Range<long>(intersectedRange.Max, from.Max);
-				}
+					yield return new Range<long>(intersectedRange.Max, from.Max);
 			}
 		}
+	}
 
-		/// <summary>
-		/// Generates ranges from a sequence of DateTimeOffset values within the specified boundaries.
-		/// </summary>
-		/// <param name="dates">The sequence of DateTimeOffset values.</param>
-		/// <param name="from">The start boundary.</param>
-		/// <param name="to">The end boundary.</param>
-		/// <returns>A collection of DateTimeOffset ranges.</returns>
-		public static IEnumerable<Range<DateTimeOffset>> GetRanges(this IEnumerable<DateTimeOffset> dates, DateTimeOffset from, DateTimeOffset to)
-		{
-			return dates.Select(d => d.To<long>())
-				.GetRanges(from.UtcTicks, to.UtcTicks)
-				.Select(r => new Range<DateTimeOffset>(r.Min.To<DateTimeOffset>(), r.Max.To<DateTimeOffset>()));
-		}
+	/// <summary>
+	/// Generates ranges from a sequence of DateTimeOffset values within the specified boundaries.
+	/// </summary>
+	/// <param name="dates">The sequence of DateTimeOffset values.</param>
+	/// <param name="from">The start boundary.</param>
+	/// <param name="to">The end boundary.</param>
+	/// <returns>A collection of DateTimeOffset ranges.</returns>
+	public static IEnumerable<Range<DateTimeOffset>> GetRanges(this IEnumerable<DateTimeOffset> dates, DateTimeOffset from, DateTimeOffset to)
+	{
+		return dates.Select(d => d.To<long>())
+			.GetRanges(from.UtcTicks, to.UtcTicks)
+			.Select(r => new Range<DateTimeOffset>(r.Min.To<DateTimeOffset>(), r.Max.To<DateTimeOffset>()));
+	}
 
-		/// <summary>
-		/// Generates ranges from a sequence of DateTime values within the specified boundaries.
-		/// </summary>
-		/// <param name="dates">The sequence of DateTime values.</param>
-		/// <param name="from">The start boundary.</param>
-		/// <param name="to">The end boundary.</param>
-		/// <returns>A collection of DateTime ranges.</returns>
-		public static IEnumerable<Range<DateTime>> GetRanges(this IEnumerable<DateTime> dates, DateTime from, DateTime to)
-		{
-			return dates.Select(d => d.To<long>())
-				.GetRanges(from.Ticks, to.Ticks)
-				.Select(r => new Range<DateTime>(r.Min.To<DateTime>(), r.Max.To<DateTime>()));
-		}
+	/// <summary>
+	/// Generates ranges from a sequence of DateTime values within the specified boundaries.
+	/// </summary>
+	/// <param name="dates">The sequence of DateTime values.</param>
+	/// <param name="from">The start boundary.</param>
+	/// <param name="to">The end boundary.</param>
+	/// <returns>A collection of DateTime ranges.</returns>
+	public static IEnumerable<Range<DateTime>> GetRanges(this IEnumerable<DateTime> dates, DateTime from, DateTime to)
+	{
+		return dates.Select(d => d.To<long>())
+			.GetRanges(from.Ticks, to.Ticks)
+			.Select(r => new Range<DateTime>(r.Min.To<DateTime>(), r.Max.To<DateTime>()));
+	}
 
-		/// <summary>
-		/// Generates ranges based on a sequence of long values (ticks) given the specified start and end boundaries.
-		/// </summary>
-		/// <param name="dates">The sequence of long values representing tick counts.</param>
-		/// <param name="from">The starting tick value.</param>
-		/// <param name="to">The ending tick value.</param>
-		/// <returns>A collection of ranges represented by long values.</returns>
-		public static IEnumerable<Range<long>> GetRanges(this IEnumerable<long> dates, long from, long to)
-		{
-			if (dates.IsEmpty())
-				yield break;
+	/// <summary>
+	/// Generates ranges based on a sequence of long values (ticks) given the specified start and end boundaries.
+	/// </summary>
+	/// <param name="dates">The sequence of long values representing tick counts.</param>
+	/// <param name="from">The starting tick value.</param>
+	/// <param name="to">The ending tick value.</param>
+	/// <returns>A collection of ranges represented by long values.</returns>
+	public static IEnumerable<Range<long>> GetRanges(this IEnumerable<long> dates, long from, long to)
+	{
+		if (dates.IsEmpty())
+			yield break;
 
-			const long step = TimeSpan.TicksPerDay;
+		const long step = TimeSpan.TicksPerDay;
 
-			var beginDate = from;
-			var nextDate = beginDate + step;
+		var beginDate = from;
+		var nextDate = beginDate + step;
 
-			foreach (var date in dates.Skip(1))
+		foreach (var date in dates.Skip(1))
+		{
+			if (date != nextDate)
 			{
-				if (date != nextDate)
-				{
-					yield return new Range<long>(beginDate, nextDate - 1);
-					beginDate = date;
-				}
-
-				nextDate = date + step;
+				yield return new Range<long>(beginDate, nextDate - 1);
+				beginDate = date;
 			}
 
-			yield return new Range<long>(beginDate, nextDate - 1);
+			nextDate = date + step;
 		}
 
-		/// <summary>
-		/// Converts the range to a SettingsStorage object for serialization.
-		/// </summary>
-		/// <typeparam name="T">The type of the range values. Must implement IComparable&lt;T&gt;.</typeparam>
-		/// <param name="range">The range to convert.</param>
-		/// <returns>A SettingsStorage object containing the range data.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when the range is null.</exception>
-		public static SettingsStorage ToStorage<T>(this Range<T> range)
-			where T : IComparable<T>
-		{
-			if (range is null)
-				throw new ArgumentNullException(nameof(range));
+		yield return new Range<long>(beginDate, nextDate - 1);
+	}
 
-			return new SettingsStorage()
-				.Set(nameof(range.Min), range.HasMinValue ? (object)range.Min : null)
-				.Set(nameof(range.Max), range.HasMaxValue ? (object)range.Max : null);
-		}
+	/// <summary>
+	/// Converts the range to a SettingsStorage object for serialization.
+	/// </summary>
+	/// <typeparam name="T">The type of the range values. Must implement IComparable&lt;T&gt;.</typeparam>
+	/// <param name="range">The range to convert.</param>
+	/// <returns>A SettingsStorage object containing the range data.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when the range is null.</exception>
+	public static SettingsStorage ToStorage<T>(this Range<T> range)
+		where T : IComparable<T>
+	{
+		if (range is null)
+			throw new ArgumentNullException(nameof(range));
 
-		/// <summary>
-		/// Constructs a Range&lt;T&gt; object from the provided SettingsStorage.
-		/// </summary>
-		/// <typeparam name="T">The type of the range values. Must implement IComparable&lt;T&gt;.</typeparam>
-		/// <param name="storage">The SettingsStorage containing the range data.</param>
-		/// <returns>A new Range&lt;T&gt; initialized with the storage values.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when the storage is null.</exception>
-		public static Range<T> ToRange<T>(this SettingsStorage storage)
-			where T : IComparable<T>
-		{
-			if (storage is null)
-				throw new ArgumentNullException(nameof(storage));
+		return new SettingsStorage()
+			.Set(nameof(range.Min), range.HasMinValue ? (object)range.Min : null)
+			.Set(nameof(range.Max), range.HasMaxValue ? (object)range.Max : null);
+	}
 
-			var range = new Range<T>();
+	/// <summary>
+	/// Constructs a Range&lt;T&gt; object from the provided SettingsStorage.
+	/// </summary>
+	/// <typeparam name="T">The type of the range values. Must implement IComparable&lt;T&gt;.</typeparam>
+	/// <param name="storage">The SettingsStorage containing the range data.</param>
+	/// <returns>A new Range&lt;T&gt; initialized with the storage values.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when the storage is null.</exception>
+	public static Range<T> ToRange<T>(this SettingsStorage storage)
+		where T : IComparable<T>
+	{
+		if (storage is null)
+			throw new ArgumentNullException(nameof(storage));
 
-			var min = storage.GetValue<object>(nameof(range.Min));
-			var max = storage.GetValue<object>(nameof(range.Max));
+		var range = new Range<T>();
 
-			if (min is not null)
-				range.Min = min.To<T>();
+		var min = storage.GetValue<object>(nameof(range.Min));
+		var max = storage.GetValue<object>(nameof(range.Max));
 
-			if (max is not null)
-				range.Max = max.To<T>();
+		if (min is not null)
+			range.Min = min.To<T>();
 
-			return range;
-		}
+		if (max is not null)
+			range.Max = max.To<T>();
+
+		return range;
 	}
 }
\ No newline at end of file
diff --git a/ComponentModel/ServerCredentials.cs b/ComponentModel/ServerCredentials.cs
index 3797300f..1e35842e 100644
--- a/ComponentModel/ServerCredentials.cs
+++ b/ComponentModel/ServerCredentials.cs
@@ -1,97 +1,96 @@
-namespace Ecng.ComponentModel
-{
-	using System.Security;
+namespace Ecng.ComponentModel;
+
+using System.Security;
 
-	using Ecng.Common;
-	using Ecng.Serialization;
+using Ecng.Common;
+using Ecng.Serialization;
 
+/// <summary>
+/// The class that contains a login and password.
+/// </summary>
+public class ServerCredentials : NotifiableObject, IPersistable
+{
 	/// <summary>
-	/// The class that contains a login and password.
+	/// Initializes a new instance of the <see cref="ServerCredentials"/>.
 	/// </summary>
-	public class ServerCredentials : NotifiableObject, IPersistable
+	public ServerCredentials()
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="ServerCredentials"/>.
-		/// </summary>
-		public ServerCredentials()
-		{
-		}
+	}
 
-		private string _email;
+	private string _email;
 
-		/// <summary>
-		/// Email.
-		/// </summary>
-		public string Email
+	/// <summary>
+	/// Email.
+	/// </summary>
+	public string Email
+	{
+		get => _email;
+		set
 		{
-			get => _email;
-			set
-			{
-				if (_email == value)
-					return;
+			if (_email == value)
+				return;
 
-				_email = value;
-				NotifyChanged();
-			}
+			_email = value;
+			NotifyChanged();
 		}
+	}
 
-		private SecureString _password;
+	private SecureString _password;
 
-		/// <summary>
-		/// Password.
-		/// </summary>
-		public SecureString Password
+	/// <summary>
+	/// Password.
+	/// </summary>
+	public SecureString Password
+	{
+		get => _password;
+		set
 		{
-			get => _password;
-			set
-			{
-				if (_password.IsEqualTo(value))
-					return;
+			if (_password.IsEqualTo(value))
+				return;
 
-				_password = value;
-				NotifyChanged();
-			}
+			_password = value;
+			NotifyChanged();
 		}
+	}
 
-		private SecureString _token;
+	private SecureString _token;
 
-		/// <summary>
-		/// Token.
-		/// </summary>
-		public SecureString Token
+	/// <summary>
+	/// Token.
+	/// </summary>
+	public SecureString Token
+	{
+		get => _token;
+		set
 		{
-			get => _token;
-			set
-			{
-				if (_token.IsEqualTo(value))
-					return;
+			if (_token.IsEqualTo(value))
+				return;
 
-				_token = value;
-				NotifyChanged();
-			}
+			_token = value;
+			NotifyChanged();
 		}
+	}
 
-		/// <summary>
-		/// Load settings.
-		/// </summary>
-		/// <param name="storage">Settings storage.</param>
-		public virtual void Load(SettingsStorage storage)
-		{
-			Email = storage.GetValue<string>(nameof(Email));
-			Password = storage.GetValue<SecureString>(nameof(Password));
-			Token = storage.GetValue<SecureString>(nameof(Token));
-		}
+	/// <summary>
+	/// Load settings.
+	/// </summary>
+	/// <param name="storage">Settings storage.</param>
+	public virtual void Load(SettingsStorage storage)
+	{
+		Email = storage.GetValue<string>(nameof(Email));
+		Password = storage.GetValue<SecureString>(nameof(Password));
+		Token = storage.GetValue<SecureString>(nameof(Token));
+	}
 
-		/// <summary>
-		/// Save settings.
-		/// </summary>
-		/// <param name="storage">Settings storage.</param>
-		public virtual void Save(SettingsStorage storage)
-		{
-			storage
-				.Set(nameof(Email), Email)
-				.Set(nameof(Password), Password)
-				.Set(nameof(Token), Token);
-		}
+	/// <summary>
+	/// Save settings.
+	/// </summary>
+	/// <param name="storage">Settings storage.</param>
+	public virtual void Save(SettingsStorage storage)
+	{
+		storage
+			.Set(nameof(Email), Email)
+			.Set(nameof(Password), Password)
+			.Set(nameof(Token), Token);
 	}
 }
\ No newline at end of file
diff --git a/ComponentModel/Stat.cs b/ComponentModel/Stat.cs
index a1b9027a..105324b3 100644
--- a/ComponentModel/Stat.cs
+++ b/ComponentModel/Stat.cs
@@ -1,313 +1,312 @@
-namespace Ecng.ComponentModel
+namespace Ecng.ComponentModel;
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Net;
+using System.Linq;
+using System.Text;
+
+using Ecng.Common;
+using Ecng.Collections;
+
+/// <summary>
+/// Contains statistical information related to actions.
+/// </summary>
+/// <typeparam name="TAction">The type representing the action.</typeparam>
+public struct StatInfo<TAction>
 {
-	using System;
-	using System.Collections.Generic;
-	using System.Diagnostics;
-	using System.Net;
-	using System.Linq;
-	using System.Text;
-
-	using Ecng.Common;
-	using Ecng.Collections;
-
 	/// <summary>
-	/// Contains statistical information related to actions.
+	/// Represents an item that holds a value, an IP address, and an action.
 	/// </summary>
-	/// <typeparam name="TAction">The type representing the action.</typeparam>
-	public struct StatInfo<TAction>
+	/// <typeparam name="TValue">The type of the value.</typeparam>
+	public struct Item<TValue>
 	{
 		/// <summary>
-		/// Represents an item that holds a value, an IP address, and an action.
+		/// Gets or sets the value.
 		/// </summary>
-		/// <typeparam name="TValue">The type of the value.</typeparam>
-		public struct Item<TValue>
-		{
-			/// <summary>
-			/// Gets or sets the value.
-			/// </summary>
-			public TValue Value { get; set; }
-
-			/// <summary>
-			/// Gets or sets the IP address.
-			/// </summary>
-			public IPAddress Address { get; set; }
-
-			/// <summary>
-			/// Gets or sets the action.
-			/// </summary>
-			public TAction Action { get; set; }
-		}
+		public TValue Value { get; set; }
 
 		/// <summary>
-		/// Gets or sets the unique count.
+		/// Gets or sets the IP address.
 		/// </summary>
-		public int UniqueCount { get; set; }
+		public IPAddress Address { get; set; }
 
 		/// <summary>
-		/// Gets or sets the pending count.
+		/// Gets or sets the action.
 		/// </summary>
-		public int PendingCount { get; set; }
+		public TAction Action { get; set; }
+	}
 
-		/// <summary>
-		/// Gets or sets the aggressive IP address.
-		/// </summary>
-		public IPAddress AggressiveAddress { get; set; }
+	/// <summary>
+	/// Gets or sets the unique count.
+	/// </summary>
+	public int UniqueCount { get; set; }
 
-		/// <summary>
-		/// Gets or sets the aggressive time.
-		/// </summary>
-		public TimeSpan AggressiveTime { get; set; }
+	/// <summary>
+	/// Gets or sets the pending count.
+	/// </summary>
+	public int PendingCount { get; set; }
 
-		/// <summary>
-		/// Gets or sets the frequency information.
-		/// </summary>
-		public Item<int>[] Freq { get; set; }
+	/// <summary>
+	/// Gets or sets the aggressive IP address.
+	/// </summary>
+	public IPAddress AggressiveAddress { get; set; }
 
-		/// <summary>
-		/// Gets or sets the longest duration information.
-		/// </summary>
-		public Item<TimeSpan>[] Longest { get; set; }
+	/// <summary>
+	/// Gets or sets the aggressive time.
+	/// </summary>
+	public TimeSpan AggressiveTime { get; set; }
 
-		/// <summary>
-		/// Gets or sets the pending actions information.
-		/// </summary>
-		public Item<TimeSpan>[] Pendings { get; set; }
+	/// <summary>
+	/// Gets or sets the frequency information.
+	/// </summary>
+	public Item<int>[] Freq { get; set; }
 
-		/// <summary>
-		/// Returns a string representation of the statistical information.
-		/// </summary>
-		/// <returns>A string that represents the current stat info.</returns>
-		public override string ToString()
-		{
-			var sb = new StringBuilder();
+	/// <summary>
+	/// Gets or sets the longest duration information.
+	/// </summary>
+	public Item<TimeSpan>[] Longest { get; set; }
 
-			sb.AppendLine($"Unique count: {UniqueCount}");
-			sb.AppendLine($"Pending count: {PendingCount}");
-			sb.AppendLine($"Aggressive IP: {AggressiveAddress}");
-			sb.AppendLine($"Aggressive time: {AggressiveTime}");
+	/// <summary>
+	/// Gets or sets the pending actions information.
+	/// </summary>
+	public Item<TimeSpan>[] Pendings { get; set; }
 
-			sb.AppendLine();
+	/// <summary>
+	/// Returns a string representation of the statistical information.
+	/// </summary>
+	/// <returns>A string that represents the current stat info.</returns>
+	public override string ToString()
+	{
+		var sb = new StringBuilder();
 
-			sb.AppendLine("Freq:");
+		sb.AppendLine($"Unique count: {UniqueCount}");
+		sb.AppendLine($"Pending count: {PendingCount}");
+		sb.AppendLine($"Aggressive IP: {AggressiveAddress}");
+		sb.AppendLine($"Aggressive time: {AggressiveTime}");
 
-			foreach (var p in Freq)
-				sb.AppendLine($"({p.Value}): '{p.Action}'");
+		sb.AppendLine();
 
-			sb.AppendLine();
+		sb.AppendLine("Freq:");
 
-			sb.AppendLine("Long:");
+		foreach (var p in Freq)
+			sb.AppendLine($"({p.Value}): '{p.Action}'");
 
-			foreach (var p in Longest)
-				sb.AppendLine($"({p.Value}): '{p.Action}'");
+		sb.AppendLine();
 
-			sb.AppendLine();
+		sb.AppendLine("Long:");
 
-			sb.AppendLine("Pend:");
+		foreach (var p in Longest)
+			sb.AppendLine($"({p.Value}): '{p.Action}'");
 
-			foreach (var p in Pendings)
-				sb.AppendLine($"({p.Value}/{p.Address}): '{p.Action}'");
+		sb.AppendLine();
 
-			sb.AppendLine();
+		sb.AppendLine("Pend:");
 
-			return sb.ToString();
-		}
+		foreach (var p in Pendings)
+			sb.AppendLine($"({p.Value}/{p.Address}): '{p.Action}'");
+
+		sb.AppendLine();
+
+		return sb.ToString();
 	}
+}
 
+/// <summary>
+/// Provides statistical tracking for actions.
+/// </summary>
+/// <typeparam name="TAction">The type representing the action.</typeparam>
+public class Stat<TAction>
+{
 	/// <summary>
-	/// Provides statistical tracking for actions.
+	/// Represents an item that tracks the duration of an action.
 	/// </summary>
-	/// <typeparam name="TAction">The type representing the action.</typeparam>
-	public class Stat<TAction>
+	public class Item : Disposable
 	{
+		private readonly Stat<TAction> _parent;
+		private readonly Stopwatch _watch;
+
 		/// <summary>
-		/// Represents an item that tracks the duration of an action.
+		/// Initializes a new instance of the <see cref="Item"/> class.
 		/// </summary>
-		public class Item : Disposable
+		/// <param name="parent">The parent statistic instance.</param>
+		/// <param name="action">The action being tracked.</param>
+		/// <param name="address">The IP address associated with the action.</param>
+		/// <param name="watch">The stopwatch tracking the action duration.</param>
+		internal Item(Stat<TAction> parent, TAction action, IPAddress address, Stopwatch watch)
 		{
-			private readonly Stat<TAction> _parent;
-			private readonly Stopwatch _watch;
-
-			/// <summary>
-			/// Initializes a new instance of the <see cref="Item"/> class.
-			/// </summary>
-			/// <param name="parent">The parent statistic instance.</param>
-			/// <param name="action">The action being tracked.</param>
-			/// <param name="address">The IP address associated with the action.</param>
-			/// <param name="watch">The stopwatch tracking the action duration.</param>
-			internal Item(Stat<TAction> parent, TAction action, IPAddress address, Stopwatch watch)
-			{
-				_parent = parent ?? throw new ArgumentNullException(nameof(parent));
-				Action = action ?? throw new ArgumentNullException(nameof(action));
-				Address = address ?? throw new ArgumentNullException(nameof(address));
-				_watch = watch ?? throw new ArgumentNullException(nameof(watch));
-			}
-
-			/// <summary>
-			/// Gets the action being tracked.
-			/// </summary>
-			internal readonly TAction Action;
-
-			/// <summary>
-			/// Gets the IP address associated with the action.
-			/// </summary>
-			internal readonly IPAddress Address;
-
-			/// <summary>
-			/// Disposes the current tracking item and updates the parent statistics.
-			/// </summary>
-			protected override void DisposeManaged()
-			{
-				_watch.Stop();
-				_parent.End(this, _watch);
-
-				base.DisposeManaged();
-			}
+			_parent = parent ?? throw new ArgumentNullException(nameof(parent));
+			Action = action ?? throw new ArgumentNullException(nameof(action));
+			Address = address ?? throw new ArgumentNullException(nameof(address));
+			_watch = watch ?? throw new ArgumentNullException(nameof(watch));
 		}
 
 		/// <summary>
-		/// Gets or sets the maximum number of longest duration records to keep.
+		/// Gets the action being tracked.
 		/// </summary>
-		public int LongestLimit { get; set; } = 100;
+		internal readonly TAction Action;
 
 		/// <summary>
-		/// Gets or sets the maximum number of frequency records to keep.
+		/// Gets the IP address associated with the action.
 		/// </summary>
-		public int FreqLimit { get; set; } = 100000;
-
-		private IPAddress _aggressiveIp;
-		private TimeSpan _aggressiveTime;
-		private readonly Dictionary<TAction, int> _freq = [];
-		private readonly Collections.PriorityQueue<TimeSpan, TAction> _longests = new((p1, p2) => (p1 - p2).Abs(), new BackwardComparer<TimeSpan>());
-		private readonly Dictionary<Stopwatch, (IPAddress, TAction)> _pendings = [];
-		private readonly Dictionary<IPAddress, RefTriple<HashSet<Stopwatch>, long, TimeSpan>> _allWatches = [];
-		private readonly SyncObject _sync = new();
+		internal readonly IPAddress Address;
 
 		/// <summary>
-		/// Retrieves statistical information with support for paging.
+		/// Disposes the current tracking item and updates the parent statistics.
 		/// </summary>
-		/// <param name="skip">The number of records to skip.</param>
-		/// <param name="take">The number of records to take.</param>
-		/// <returns>A <see cref="StatInfo{TAction}"/> structure containing the current statistics.</returns>
-		public StatInfo<TAction> GetInfo(int skip, int take)
+		protected override void DisposeManaged()
 		{
-			lock (_sync)
-			{
-				return new()
-				{
-					UniqueCount = _allWatches.Count,
-					PendingCount = _pendings.Count,
-
-					AggressiveAddress = _aggressiveIp,
-					AggressiveTime = _aggressiveTime,
-
-					Freq = [.. _freq.OrderByDescending(p => p.Value).Skip(skip).Take(take).Select(p => new StatInfo<TAction>.Item<int>
-					{
-						Value = p.Value,
-						Action = p.Key,
-					})],
-
-					Longest = [.. _longests.Skip(skip).Take(take).Select(p => new StatInfo<TAction>.Item<TimeSpan>
-					{
-						Value = p.Item1,
-						Action = p.Item2,
-					})],
-
-					Pendings = [.. _pendings.Skip(skip).Take(take).Select(p => new StatInfo<TAction>.Item<TimeSpan>
-					{
-						Value = p.Key.Elapsed,
-						Address = p.Value.Item1,
-						Action = p.Value.Item2,
-					})],
-				};
-			}
+			_watch.Stop();
+			_parent.End(this, _watch);
+
+			base.DisposeManaged();
 		}
+	}
 
-		/// <summary>
-		/// Starts tracking an action.
-		/// </summary>
-		/// <param name="action">The action to track.</param>
-		/// <param name="address">The IP address associated with the action.</param>
-		/// <returns>An <see cref="Item"/> that represents the action tracking session.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when action or address is null.</exception>
-		public Item Begin(TAction action, IPAddress address)
-		{
-			if (action is null)		throw new ArgumentNullException(nameof(action));
-			if (address is null)	throw new ArgumentNullException(nameof(address));
+	/// <summary>
+	/// Gets or sets the maximum number of longest duration records to keep.
+	/// </summary>
+	public int LongestLimit { get; set; } = 100;
+
+	/// <summary>
+	/// Gets or sets the maximum number of frequency records to keep.
+	/// </summary>
+	public int FreqLimit { get; set; } = 100000;
 
-			var watch = Stopwatch.StartNew();
+	private IPAddress _aggressiveIp;
+	private TimeSpan _aggressiveTime;
+	private readonly Dictionary<TAction, int> _freq = [];
+	private readonly Collections.PriorityQueue<TimeSpan, TAction> _longests = new((p1, p2) => (p1 - p2).Abs(), new BackwardComparer<TimeSpan>());
+	private readonly Dictionary<Stopwatch, (IPAddress, TAction)> _pendings = [];
+	private readonly Dictionary<IPAddress, RefTriple<HashSet<Stopwatch>, long, TimeSpan>> _allWatches = [];
+	private readonly SyncObject _sync = new();
 
-			lock (_sync)
+	/// <summary>
+	/// Retrieves statistical information with support for paging.
+	/// </summary>
+	/// <param name="skip">The number of records to skip.</param>
+	/// <param name="take">The number of records to take.</param>
+	/// <returns>A <see cref="StatInfo{TAction}"/> structure containing the current statistics.</returns>
+	public StatInfo<TAction> GetInfo(int skip, int take)
+	{
+		lock (_sync)
+		{
+			return new()
 			{
-				_pendings.Add(watch, new(address, action));
-				var tuple = _allWatches.SafeAdd(address, key => new([], default, default));
-				tuple.First.Add(watch);
-				tuple.Second++;
+				UniqueCount = _allWatches.Count,
+				PendingCount = _pendings.Count,
+
+				AggressiveAddress = _aggressiveIp,
+				AggressiveTime = _aggressiveTime,
 
-				if (_freq.TryGetValue(action, out var counter))
+				Freq = [.. _freq.OrderByDescending(p => p.Value).Skip(skip).Take(take).Select(p => new StatInfo<TAction>.Item<int>
 				{
-					counter++;
-					_freq[action] = counter;
-				}
-				else
+					Value = p.Value,
+					Action = p.Key,
+				})],
+
+				Longest = [.. _longests.Skip(skip).Take(take).Select(p => new StatInfo<TAction>.Item<TimeSpan>
 				{
-					if (_freq.Count < FreqLimit)
-						_freq.Add(action, 1);
-				}
-			}
+					Value = p.Item1,
+					Action = p.Item2,
+				})],
 
-			return new(this, action, address, watch);
+				Pendings = [.. _pendings.Skip(skip).Take(take).Select(p => new StatInfo<TAction>.Item<TimeSpan>
+				{
+					Value = p.Key.Elapsed,
+					Address = p.Value.Item1,
+					Action = p.Value.Item2,
+				})],
+			};
 		}
+	}
+
+	/// <summary>
+	/// Starts tracking an action.
+	/// </summary>
+	/// <param name="action">The action to track.</param>
+	/// <param name="address">The IP address associated with the action.</param>
+	/// <returns>An <see cref="Item"/> that represents the action tracking session.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when action or address is null.</exception>
+	public Item Begin(TAction action, IPAddress address)
+	{
+		if (action is null)		throw new ArgumentNullException(nameof(action));
+		if (address is null)	throw new ArgumentNullException(nameof(address));
+
+		var watch = Stopwatch.StartNew();
 
-		private void End(Item item, Stopwatch watch)
+		lock (_sync)
 		{
-			if (item is null)	throw new ArgumentNullException(nameof(item));
-			if (watch is null)	throw new ArgumentNullException(nameof(watch));
+			_pendings.Add(watch, new(address, action));
+			var tuple = _allWatches.SafeAdd(address, key => new([], default, default));
+			tuple.First.Add(watch);
+			tuple.Second++;
+
+			if (_freq.TryGetValue(action, out var counter))
+			{
+				counter++;
+				_freq[action] = counter;
+			}
+			else
+			{
+				if (_freq.Count < FreqLimit)
+					_freq.Add(action, 1);
+			}
+		}
+
+		return new(this, action, address, watch);
+	}
+
+	private void End(Item item, Stopwatch watch)
+	{
+		if (item is null)	throw new ArgumentNullException(nameof(item));
+		if (watch is null)	throw new ArgumentNullException(nameof(watch));
+
+		var elapsed = watch.Elapsed;
+		var addr = item.Address;
 
-			var elapsed = watch.Elapsed;
-			var addr = item.Address;
+		lock (_sync)
+		{
+			_pendings.Remove(watch);
 
-			lock (_sync)
+			if (_allWatches.TryGetValue(addr, out var tuple))
 			{
-				_pendings.Remove(watch);
+				tuple.First.Remove(watch);
+				tuple.Third += elapsed;
 
-				if (_allWatches.TryGetValue(addr, out var tuple))
+				if (_aggressiveTime == default)
 				{
-					tuple.First.Remove(watch);
-					tuple.Third += elapsed;
-
-					if (_aggressiveTime == default)
-					{
-						_aggressiveTime = tuple.Third;
-						_aggressiveIp = addr;
-					}
-					else if (_aggressiveTime < tuple.Third)
-					{
-						_aggressiveTime = tuple.Third;
-						_aggressiveIp = addr;
-					}
+					_aggressiveTime = tuple.Third;
+					_aggressiveIp = addr;
+				}
+				else if (_aggressiveTime < tuple.Third)
+				{
+					_aggressiveTime = tuple.Third;
+					_aggressiveIp = addr;
 				}
-
-				if (_longests.Count >= LongestLimit)
-					_longests.EnqueueDequeue(watch.Elapsed, item.Action);
-				else
-					_longests.Enqueue(watch.Elapsed, item.Action);
 			}
+
+			if (_longests.Count >= LongestLimit)
+				_longests.EnqueueDequeue(watch.Elapsed, item.Action);
+			else
+				_longests.Enqueue(watch.Elapsed, item.Action);
 		}
+	}
 
-		/// <summary>
-		/// Clears all the recorded statistics.
-		/// </summary>
-		public void Clear()
+	/// <summary>
+	/// Clears all the recorded statistics.
+	/// </summary>
+	public void Clear()
+	{
+		lock (_sync)
 		{
-			lock (_sync)
-			{
-				_aggressiveIp = default;
-				_aggressiveTime = default;
-				_allWatches.Clear();
-				_freq.Clear();
-				_pendings.Clear();
-				_longests.Clear();
-			}
+			_aggressiveIp = default;
+			_aggressiveTime = default;
+			_allWatches.Clear();
+			_freq.Clear();
+			_pendings.Clear();
+			_longests.Clear();
 		}
 	}
 }
\ No newline at end of file
diff --git a/ComponentModel/TimeSpanEditorAttribute.cs b/ComponentModel/TimeSpanEditorAttribute.cs
index 3c105d62..f66e8b2d 100644
--- a/ComponentModel/TimeSpanEditorAttribute.cs
+++ b/ComponentModel/TimeSpanEditorAttribute.cs
@@ -1,57 +1,56 @@
-namespace Ecng.ComponentModel
+namespace Ecng.ComponentModel;
+
+using System;
+
+/// <summary>
+/// Show <see cref="TimeSpan"/> editor parts mask.
+/// </summary>
+[Flags]
+public enum TimeSpanEditorMask
+{
+	/// <summary>
+	/// Days.
+	/// </summary>
+	Days = 1,
+
+	/// <summary>
+	/// Hours.
+	/// </summary>
+	Hours = 2,
+
+	/// <summary>
+	/// Minutes.
+	/// </summary>
+	Minutes = 4,
+
+	/// <summary>
+	/// Seconds.
+	/// </summary>
+	Seconds = 8,
+
+	/// <summary>
+	/// Milliseconds.
+	/// </summary>
+	Milliseconds = 16,
+
+	/// <summary>
+	/// Microseconds.
+	/// </summary>
+	Microseconds = 32,
+}
+
+/// <summary>
+/// <see cref="TimeSpan"/> editor attribute.
+/// </summary>
+public class TimeSpanEditorAttribute : Attribute
 {
-	using System;
-
-	/// <summary>
-	/// Show <see cref="TimeSpan"/> editor parts mask.
-	/// </summary>
-	[Flags]
-	public enum TimeSpanEditorMask
-	{
-		/// <summary>
-		/// Days.
-		/// </summary>
-		Days = 1,
-
-		/// <summary>
-		/// Hours.
-		/// </summary>
-		Hours = 2,
-
-		/// <summary>
-		/// Minutes.
-		/// </summary>
-		Minutes = 4,
-
-		/// <summary>
-		/// Seconds.
-		/// </summary>
-		Seconds = 8,
-
-		/// <summary>
-		/// Milliseconds.
-		/// </summary>
-		Milliseconds = 16,
-
-		/// <summary>
-		/// Microseconds.
-		/// </summary>
-		Microseconds = 32,
-	}
-
-	/// <summary>
-	/// <see cref="TimeSpan"/> editor attribute.
-	/// </summary>
-	public class TimeSpanEditorAttribute : Attribute
-	{
-		/// <summary>
-		/// Show editor parts mask.
-		/// </summary>
-		public TimeSpanEditorMask Mask { get; set; } = DefaultMask;
-
-		/// <summary>
-		/// Default editor parts mask.
-		/// </summary>
-		public const TimeSpanEditorMask DefaultMask = TimeSpanEditorMask.Hours | TimeSpanEditorMask.Minutes | TimeSpanEditorMask.Seconds;
-	}
+	/// <summary>
+	/// Show editor parts mask.
+	/// </summary>
+	public TimeSpanEditorMask Mask { get; set; } = DefaultMask;
+
+	/// <summary>
+	/// Default editor parts mask.
+	/// </summary>
+	public const TimeSpanEditorMask DefaultMask = TimeSpanEditorMask.Hours | TimeSpanEditorMask.Minutes | TimeSpanEditorMask.Seconds;
 }
\ No newline at end of file
diff --git a/ComponentModel/TypeConverterHelper.cs b/ComponentModel/TypeConverterHelper.cs
index 66cce1c9..4a511a10 100644
--- a/ComponentModel/TypeConverterHelper.cs
+++ b/ComponentModel/TypeConverterHelper.cs
@@ -1,68 +1,67 @@
-namespace Ecng.ComponentModel
-{
-	#region Using Directives
+namespace Ecng.ComponentModel;
+
+#region Using Directives
 
-	using System.ComponentModel;
-	using System.Globalization;
+using System.ComponentModel;
+using System.Globalization;
 
-	#endregion
+#endregion
 
+/// <summary>
+/// Auxilary class for accessing typed data from type converters.
+/// </summary>
+public static class TypeConverterHelper
+{
 	/// <summary>
-	/// Auxilary class for accessing typed data from type converters.
+	/// Gets the converter.
 	/// </summary>
-	public static class TypeConverterHelper
+	/// <returns></returns>
+	public static TypeConverter GetConverter<T>()
 	{
-		/// <summary>
-		/// Gets the converter.
-		/// </summary>
-		/// <returns></returns>
-		public static TypeConverter GetConverter<T>()
-		{
-			return TypeDescriptor.GetConverter(typeof(T));
-		}
+		return TypeDescriptor.GetConverter(typeof(T));
+	}
 
-		/// <summary>
-		/// Converts the specified text to an object.
-		/// </summary>
-		/// <param name="value">The value.</param>
-		/// <returns></returns>
-		public static T FromString<T>(string value)
-		{
-			return (T)GetConverter<T>().ConvertFromString(value);
-		}
+	/// <summary>
+	/// Converts the specified text to an object.
+	/// </summary>
+	/// <param name="value">The value.</param>
+	/// <returns></returns>
+	public static T FromString<T>(string value)
+	{
+		return (T)GetConverter<T>().ConvertFromString(value);
+	}
 
-		/// <summary>
-		/// Converts the specified text to an object.
-		/// </summary>
-		/// <param name="context">The context.</param>
-		/// <param name="culture">The culture.</param>
-		/// <param name="value">The value.</param>
-		/// <returns></returns>
-		public static T FromString<T>(ITypeDescriptorContext context, CultureInfo culture, string value)
-		{
-			return (T)GetConverter<T>().ConvertFromString(context, culture, value);
-		}
+	/// <summary>
+	/// Converts the specified text to an object.
+	/// </summary>
+	/// <param name="context">The context.</param>
+	/// <param name="culture">The culture.</param>
+	/// <param name="value">The value.</param>
+	/// <returns></returns>
+	public static T FromString<T>(ITypeDescriptorContext context, CultureInfo culture, string value)
+	{
+		return (T)GetConverter<T>().ConvertFromString(context, culture, value);
+	}
 
-		/// <summary>
-		/// Converts the specified value to a string representation.
-		/// </summary>
-		/// <param name="value">The value.</param>
-		/// <returns></returns>
-		public static string ToString<T>(T value)
-		{
-			return GetConverter<T>().ConvertToString(value);
-		}
+	/// <summary>
+	/// Converts the specified value to a string representation.
+	/// </summary>
+	/// <param name="value">The value.</param>
+	/// <returns></returns>
+	public static string ToString<T>(T value)
+	{
+		return GetConverter<T>().ConvertToString(value);
+	}
 
-		/// <summary>
-		/// Converts the specified value to a string representation.
-		/// </summary>
-		/// <param name="context">The context.</param>
-		/// <param name="culture">The culture.</param>
-		/// <param name="value">The value.</param>
-		/// <returns></returns>
-		public static string ToString<T>(ITypeDescriptorContext context, CultureInfo culture, T value)
-		{
-			return GetConverter<T>().ConvertToString(context, culture, value);
-		}
+	/// <summary>
+	/// Converts the specified value to a string representation.
+	/// </summary>
+	/// <param name="context">The context.</param>
+	/// <param name="culture">The culture.</param>
+	/// <param name="value">The value.</param>
+	/// <returns></returns>
+	public static string ToString<T>(ITypeDescriptorContext context, CultureInfo culture, T value)
+	{
+		return GetConverter<T>().ConvertToString(context, culture, value);
 	}
 }
\ No newline at end of file
diff --git a/ComponentModel/VectorIconAttribute.cs b/ComponentModel/VectorIconAttribute.cs
index 4d425c7e..30247ff0 100644
--- a/ComponentModel/VectorIconAttribute.cs
+++ b/ComponentModel/VectorIconAttribute.cs
@@ -1,17 +1,16 @@
-namespace Ecng.ComponentModel
-{
-	using System;
+namespace Ecng.ComponentModel;
+
+using System;
 
-	using Ecng.Common;
+using Ecng.Common;
 
+/// <summary>
+/// Represents an attribute that specifies a vector icon.
+/// </summary>
+public class VectorIconAttribute(string icon) : Attribute
+{
 	/// <summary>
-	/// Represents an attribute that specifies a vector icon.
+	/// Gets the vector icon identifier.
 	/// </summary>
-	public class VectorIconAttribute(string icon) : Attribute
-	{
-		/// <summary>
-		/// Gets the vector icon identifier.
-		/// </summary>
-		public string Icon { get; } = icon.ThrowIfEmpty(nameof(icon));
-	}
+	public string Icon { get; } = icon.ThrowIfEmpty(nameof(icon));
 }
\ No newline at end of file
diff --git a/ComponentModel/ViewModelBase.cs b/ComponentModel/ViewModelBase.cs
index 0fea636e..48d0ddbc 100644
--- a/ComponentModel/ViewModelBase.cs
+++ b/ComponentModel/ViewModelBase.cs
@@ -1,74 +1,73 @@
-namespace Ecng.ComponentModel
+namespace Ecng.ComponentModel;
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.ComponentModel;
+using System.Linq.Expressions;
+
+using Ecng.Common;
+
+/// <summary>
+/// Базовый класс для реализации View-Model в модели MVVM
+/// </summary>
+public abstract class ViewModelBase : Disposable, INotifyPropertyChanged
 {
-	using System;
-	using System.Collections.Generic;
-	using System.Runtime.CompilerServices;
-	using System.ComponentModel;
-	using System.Linq.Expressions;
+	/// <inheritdoc />
+	public event PropertyChangedEventHandler PropertyChanged;
 
-	using Ecng.Common;
+	/// <summary>
+	/// </summary>
+	protected virtual void OnPropertyChanged([CallerMemberName] string name = null)
+	{
+		PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
+	}
 
 	/// <summary>
-	/// Базовый класс для реализации View-Model в модели MVVM
 	/// </summary>
-	public abstract class ViewModelBase : Disposable, INotifyPropertyChanged
+	protected void OnPropertyChanged<T>(Expression<Func<T>> selectorExpression)
 	{
-		/// <inheritdoc />
-		public event PropertyChangedEventHandler PropertyChanged;
+		OnPropertyChanged(PropertyName(selectorExpression));
+	}
 
-		/// <summary>
-		/// </summary>
-		protected virtual void OnPropertyChanged([CallerMemberName] string name = null)
-		{
-			PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
-		}
+	/// <summary>
+	/// </summary>
+	protected bool SetField<T>(ref T field, T value, Expression<Func<T>> selectorExpression)
+	{
+		return SetField(ref field, value, PropertyName(selectorExpression));
+	}
 
-		/// <summary>
-		/// </summary>
-		protected void OnPropertyChanged<T>(Expression<Func<T>> selectorExpression)
-		{
-			OnPropertyChanged(PropertyName(selectorExpression));
-		}
+	/// <summary>
+	/// установка требуемого поля в определенное значение и вызов события PropertyChanged при необходимости
+	/// </summary>
+	protected virtual bool SetField<T>(ref T field, T value, [CallerMemberName] string name = null)
+	{
+		if (EqualityComparer<T>.Default.Equals(field, value)) return false;
 
-		/// <summary>
-		/// </summary>
-		protected bool SetField<T>(ref T field, T value, Expression<Func<T>> selectorExpression)
-		{
-			return SetField(ref field, value, PropertyName(selectorExpression));
-		}
+		field = value;
+		OnPropertyChanged(name);
 
-		/// <summary>
-		/// установка требуемого поля в определенное значение и вызов события PropertyChanged при необходимости
-		/// </summary>
-		protected virtual bool SetField<T>(ref T field, T value, [CallerMemberName] string name = null)
-		{
-			if (EqualityComparer<T>.Default.Equals(field, value)) return false;
+		return true;
+	}
+
+	/// <summary>
+	/// </summary>
+	public static string PropertyName<T>(Expression<Func<T>> property)
+	{
+		var lambda = (LambdaExpression)property;
 
-			field = value;
-			OnPropertyChanged(name);
+		MemberExpression memberExpression;
 
-			return true;
+		if (lambda.Body is UnaryExpression exp)
+		{
+			var unaryExpression = exp;
+			memberExpression = (MemberExpression)unaryExpression.Operand;
 		}
-
-		/// <summary>
-		/// </summary>
-		public static string PropertyName<T>(Expression<Func<T>> property)
+		else
 		{
-			var lambda = (LambdaExpression)property;
-
-			MemberExpression memberExpression;
-
-			if (lambda.Body is UnaryExpression exp)
-			{
-				var unaryExpression = exp;
-				memberExpression = (MemberExpression)unaryExpression.Operand;
-			}
-			else
-			{
-				memberExpression = (MemberExpression)lambda.Body;
-			}
-
-			return memberExpression.Member.Name;
+			memberExpression = (MemberExpression)lambda.Body;
 		}
+
+		return memberExpression.Member.Name;
 	}
 }
diff --git a/Configuration/ConfigManager.cs b/Configuration/ConfigManager.cs
index f841e57b..49122ad3 100644
--- a/Configuration/ConfigManager.cs
+++ b/Configuration/ConfigManager.cs
@@ -1,341 +1,340 @@
-namespace Ecng.Configuration
-{
-	using System;
-	using System.Collections.Generic;
-	using System.Collections.Specialized;
-	using System.Configuration;
-	using System.Diagnostics;
-	using System.Linq;
+namespace Ecng.Configuration;
 
-	using Ecng.Common;
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Configuration;
+using System.Diagnostics;
+using System.Linq;
 
-	/// <summary>
-	/// Provides access to application configuration sections, groups, and services.
-	/// </summary>
-	public static class ConfigManager
-	{
-		private static readonly Dictionary<Type, ConfigurationSection> _sections = [];
-		private static readonly Dictionary<Type, ConfigurationSectionGroup> _sectionGroups = [];
+using Ecng.Common;
 
-		private static readonly SyncObject _sync = new();
-		private static readonly Dictionary<Type, Dictionary<string, object>> _services = [];
+/// <summary>
+/// Provides access to application configuration sections, groups, and services.
+/// </summary>
+public static class ConfigManager
+{
+	private static readonly Dictionary<Type, ConfigurationSection> _sections = [];
+	private static readonly Dictionary<Type, ConfigurationSectionGroup> _sectionGroups = [];
 
-		#region ConfigManager.cctor()
+	private static readonly SyncObject _sync = new();
+	private static readonly Dictionary<Type, Dictionary<string, object>> _services = [];
 
-		static ConfigManager()
+	#region ConfigManager.cctor()
+
+	static ConfigManager()
+	{
+		try
 		{
-			try
-			{
-				//http://csharp-tipsandtricks.blogspot.com/2010/01/identifying-whether-execution-context.html
-				InnerConfig = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
-			}
-			catch (Exception ex)
-			{
-				Trace.WriteLine(ex);
-			}
+			//http://csharp-tipsandtricks.blogspot.com/2010/01/identifying-whether-execution-context.html
+			InnerConfig = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
+		}
+		catch (Exception ex)
+		{
+			Trace.WriteLine(ex);
+		}
 
-			if (InnerConfig != null)
-			{
-				Trace.WriteLine("ConfigManager FilePath=" + InnerConfig.FilePath);
+		if (InnerConfig != null)
+		{
+			Trace.WriteLine("ConfigManager FilePath=" + InnerConfig.FilePath);
 
-				void InitSections(ConfigurationSectionCollection sections)
+			void InitSections(ConfigurationSectionCollection sections)
+			{
+				try
 				{
-					try
+					foreach (ConfigurationSection section in sections)
 					{
-						foreach (ConfigurationSection section in sections)
-						{
-							if (!_sections.ContainsKey(section.GetType()))
-								_sections.Add(section.GetType(), section);
-						}
-					}
-					catch (Exception ex)
-					{
-						Trace.WriteLine(ex);
+						if (!_sections.ContainsKey(section.GetType()))
+							_sections.Add(section.GetType(), section);
 					}
 				}
+				catch (Exception ex)
+				{
+					Trace.WriteLine(ex);
+				}
+			}
 
-				void InitSectionGroups(ConfigurationSectionGroupCollection groups)
+			void InitSectionGroups(ConfigurationSectionGroupCollection groups)
+			{
+				foreach (ConfigurationSectionGroup sectionGroup in groups)
 				{
-					foreach (ConfigurationSectionGroup sectionGroup in groups)
-					{
-						if (!_sectionGroups.ContainsKey(sectionGroup.GetType()))
-							_sectionGroups.Add(sectionGroup.GetType(), sectionGroup);
+					if (!_sectionGroups.ContainsKey(sectionGroup.GetType()))
+						_sectionGroups.Add(sectionGroup.GetType(), sectionGroup);
 
-						InitSections(sectionGroup.Sections);
-						InitSectionGroups(sectionGroup.SectionGroups);
-					}
+					InitSections(sectionGroup.Sections);
+					InitSectionGroups(sectionGroup.SectionGroups);
 				}
-
-				InitSections(InnerConfig.Sections);
-				InitSectionGroups(InnerConfig.SectionGroups);
 			}
+
+			InitSections(InnerConfig.Sections);
+			InitSectionGroups(InnerConfig.SectionGroups);
 		}
+	}
 
-		#endregion
-
-		/// <summary>
-		/// Gets the underlying configuration file used by the application.
-		/// </summary>
-		public static Configuration InnerConfig { get; }
-
-		#region GetSection
-
-		/// <summary>
-		/// Returns the configuration section of type T.
-		/// </summary>
-		/// <typeparam name="T">The type of the configuration section.</typeparam>
-		/// <returns>The configuration section instance of type T.</returns>
-		public static T GetSection<T>()
-			where T : ConfigurationSection
-			=> (T)GetSection(typeof(T));
-
-		/// <summary>
-		/// Returns the configuration section matching the specified type, or null if not found.
-		/// </summary>
-		/// <param name="sectionType">The type of the configuration section.</param>
-		/// <returns>The configuration section instance or null.</returns>
-		public static ConfigurationSection GetSection(Type sectionType)
-			=> _sections.ContainsKey(sectionType) ? _sections[sectionType] : null;
-
-		/// <summary>
-		/// Returns the configuration section of type T specified by the section name.
-		/// </summary>
-		/// <typeparam name="T">The type of the configuration section.</typeparam>
-		/// <param name="sectionName">The name of the configuration section.</param>
-		/// <returns>The configuration section instance of type T.</returns>
-		public static T GetSection<T>(string sectionName)
-			where T : ConfigurationSection
-			=> (T)GetSection(sectionName);
-
-		/// <summary>
-		/// Returns the configuration section specified by the section name.
-		/// </summary>
-		/// <param name="sectionName">The name of the configuration section.</param>
-		/// <returns>The configuration section instance.</returns>
-		public static ConfigurationSection GetSection(string sectionName)
-			=> InnerConfig.GetSection(sectionName);
-
-		#endregion
-
-		#region GetGroup
-
-		/// <summary>
-		/// Returns the configuration section group of type T.
-		/// </summary>
-		/// <typeparam name="T">The type of the configuration section group.</typeparam>
-		/// <returns>The configuration section group instance of type T.</returns>
-		public static T GetGroup<T>()
-			where T : ConfigurationSectionGroup
-			=> (T)GetGroup(typeof(T));
-
-		/// <summary>
-		/// Returns the configuration section group matching the specified type, or null if not found.
-		/// </summary>
-		/// <param name="sectionGroupType">The type of the configuration section group.</param>
-		/// <returns>The configuration section group instance or null.</returns>
-		public static ConfigurationSectionGroup GetGroup(Type sectionGroupType)
-			=> _sectionGroups.ContainsKey(sectionGroupType)
-				? _sectionGroups[sectionGroupType]
-				: null;
-
-		/// <summary>
-		/// Returns the configuration section group of type T specified by the section name.
-		/// </summary>
-		/// <typeparam name="T">The type of the configuration section group.</typeparam>
-		/// <param name="sectionName">The name of the configuration section group.</param>
-		/// <returns>The configuration section group instance of type T.</returns>
-		public static T GetGroup<T>(string sectionName)
-			where T : ConfigurationSectionGroup
-			=> (T)GetGroup(sectionName);
-
-		/// <summary>
-		/// Returns the configuration section group specified by the section name.
-		/// </summary>
-		/// <param name="sectionName">The name of the configuration section group.</param>
-		/// <returns>The configuration section group instance.</returns>
-		public static ConfigurationSectionGroup GetGroup(string sectionName)
-			=> InnerConfig.GetSectionGroup(sectionName);
-
-		#endregion
-
-		/// <summary>
-		/// Tries to get a configuration value from the configuration file using the specified key.
-		/// </summary>
-		/// <typeparam name="T">The expected value type.</typeparam>
-		/// <param name="name">The key name.</param>
-		/// <param name="defaultValue">The default value if the key is not found or empty.</param>
-		/// <returns>The configuration value, or the default value if not found.</returns>
-		public static T TryGet<T>(string name, T defaultValue = default)
-		{
-			var str = AppSettings.Get(name);
+	#endregion
 
-			return str.IsEmpty() ? defaultValue : str.To<T>();
-		}
+	/// <summary>
+	/// Gets the underlying configuration file used by the application.
+	/// </summary>
+	public static Configuration InnerConfig { get; }
 
-		/// <summary>
-		/// Gets the application settings.
-		/// </summary>
-		public static NameValueCollection AppSettings => ConfigurationManager.AppSettings;
+	#region GetSection
 
-		/// <summary>
-		/// Occurs when a service is registered.
-		/// </summary>
-		public static event Action<Type, object> ServiceRegistered;
+	/// <summary>
+	/// Returns the configuration section of type T.
+	/// </summary>
+	/// <typeparam name="T">The type of the configuration section.</typeparam>
+	/// <returns>The configuration section instance of type T.</returns>
+	public static T GetSection<T>()
+		where T : ConfigurationSection
+		=> (T)GetSection(typeof(T));
 
-		private static readonly Dictionary<Type, List<Action<object>>> _subscribers = new();
+	/// <summary>
+	/// Returns the configuration section matching the specified type, or null if not found.
+	/// </summary>
+	/// <param name="sectionType">The type of the configuration section.</param>
+	/// <returns>The configuration section instance or null.</returns>
+	public static ConfigurationSection GetSection(Type sectionType)
+		=> _sections.ContainsKey(sectionType) ? _sections[sectionType] : null;
 
-		/// <summary>
-		/// Subscribes to the service registration event for the specified type.
-		/// </summary>
-		/// <typeparam name="T">The type of service to subscribe for.</typeparam>
-		/// <param name="registered">The action to invoke when a service is registered.</param>
-		public static void SubscribeOnRegister<T>(Action<T> registered)
-		{
-			if (registered is null)
-				throw new ArgumentNullException(nameof(registered));
+	/// <summary>
+	/// Returns the configuration section of type T specified by the section name.
+	/// </summary>
+	/// <typeparam name="T">The type of the configuration section.</typeparam>
+	/// <param name="sectionName">The name of the configuration section.</param>
+	/// <returns>The configuration section instance of type T.</returns>
+	public static T GetSection<T>(string sectionName)
+		where T : ConfigurationSection
+		=> (T)GetSection(sectionName);
 
-			if (!_subscribers.TryGetValue(typeof(T), out var subscribers))
-			{
-				subscribers = [];
-				_subscribers.Add(typeof(T), subscribers);
-			}
+	/// <summary>
+	/// Returns the configuration section specified by the section name.
+	/// </summary>
+	/// <param name="sectionName">The name of the configuration section.</param>
+	/// <returns>The configuration section instance.</returns>
+	public static ConfigurationSection GetSection(string sectionName)
+		=> InnerConfig.GetSection(sectionName);
 
-			subscribers.Add(svc => registered((T)svc));
-		}
+	#endregion
 
-		private static void RaiseServiceRegistered(Type type, object service)
-		{
-			ServiceRegistered?.Invoke(type, service);
+	#region GetGroup
 
-			if (!_subscribers.TryGetValue(type, out var subscribers))
-				return;
+	/// <summary>
+	/// Returns the configuration section group of type T.
+	/// </summary>
+	/// <typeparam name="T">The type of the configuration section group.</typeparam>
+	/// <returns>The configuration section group instance of type T.</returns>
+	public static T GetGroup<T>()
+		where T : ConfigurationSectionGroup
+		=> (T)GetGroup(typeof(T));
 
-			foreach (var subscriber in subscribers)
-				subscriber(service);
-		}
+	/// <summary>
+	/// Returns the configuration section group matching the specified type, or null if not found.
+	/// </summary>
+	/// <param name="sectionGroupType">The type of the configuration section group.</param>
+	/// <returns>The configuration section group instance or null.</returns>
+	public static ConfigurationSectionGroup GetGroup(Type sectionGroupType)
+		=> _sectionGroups.ContainsKey(sectionGroupType)
+			? _sectionGroups[sectionGroupType]
+			: null;
 
-		private static Dictionary<string, object> GetDict<T>() => GetDict(typeof(T));
+	/// <summary>
+	/// Returns the configuration section group of type T specified by the section name.
+	/// </summary>
+	/// <typeparam name="T">The type of the configuration section group.</typeparam>
+	/// <param name="sectionName">The name of the configuration section group.</param>
+	/// <returns>The configuration section group instance of type T.</returns>
+	public static T GetGroup<T>(string sectionName)
+		where T : ConfigurationSectionGroup
+		=> (T)GetGroup(sectionName);
 
-		private static Dictionary<string, object> GetDict(Type type)
-		{
-			if (_services.TryGetValue(type, out var dict))
-				return dict;
+	/// <summary>
+	/// Returns the configuration section group specified by the section name.
+	/// </summary>
+	/// <param name="sectionName">The name of the configuration section group.</param>
+	/// <returns>The configuration section group instance.</returns>
+	public static ConfigurationSectionGroup GetGroup(string sectionName)
+		=> InnerConfig.GetSectionGroup(sectionName);
 
-			dict = new Dictionary<string, object>(StringComparer.InvariantCultureIgnoreCase);
-			_services.Add(type, dict);
-			return dict;
-		}
+	#endregion
 
-		/// <summary>
-		/// Registers the specified service of type T using the default name.
-		/// </summary>
-		/// <typeparam name="T">The type of the service to register.</typeparam>
-		/// <param name="service">The service instance.</param>
-		public static void RegisterService<T>(T service)
-			=> RegisterService(typeof(T).AssemblyQualifiedName, service);
-
-		/// <summary>
-		/// Registers the specified service of type T with the provided name.
-		/// </summary>
-		/// <typeparam name="T">The type of the service to register.</typeparam>
-		/// <param name="name">The unique name to register the service.</param>
-		/// <param name="service">The service instance.</param>
-		public static void RegisterService<T>(string name, T service)
-		{
-			lock (_sync)
-				GetDict<T>()[name] = service;
+	/// <summary>
+	/// Tries to get a configuration value from the configuration file using the specified key.
+	/// </summary>
+	/// <typeparam name="T">The expected value type.</typeparam>
+	/// <param name="name">The key name.</param>
+	/// <param name="defaultValue">The default value if the key is not found or empty.</param>
+	/// <returns>The configuration value, or the default value if not found.</returns>
+	public static T TryGet<T>(string name, T defaultValue = default)
+	{
+		var str = AppSettings.Get(name);
 
-			RaiseServiceRegistered(typeof(T), service);
-		}
+		return str.IsEmpty() ? defaultValue : str.To<T>();
+	}
+
+	/// <summary>
+	/// Gets the application settings.
+	/// </summary>
+	public static NameValueCollection AppSettings => ConfigurationManager.AppSettings;
+
+	/// <summary>
+	/// Occurs when a service is registered.
+	/// </summary>
+	public static event Action<Type, object> ServiceRegistered;
+
+	private static readonly Dictionary<Type, List<Action<object>>> _subscribers = new();
+
+	/// <summary>
+	/// Subscribes to the service registration event for the specified type.
+	/// </summary>
+	/// <typeparam name="T">The type of service to subscribe for.</typeparam>
+	/// <param name="registered">The action to invoke when a service is registered.</param>
+	public static void SubscribeOnRegister<T>(Action<T> registered)
+	{
+		if (registered is null)
+			throw new ArgumentNullException(nameof(registered));
 
-		/// <summary>
-		/// Checks if a service of type T is registered using the default name.
-		/// </summary>
-		/// <typeparam name="T">The type of the service.</typeparam>
-		/// <returns>True if the service is registered; otherwise, false.</returns>
-		public static bool IsServiceRegistered<T>()
-			=> IsServiceRegistered<T>(typeof(T).AssemblyQualifiedName);
-
-		/// <summary>
-		/// Checks if a service of type T with the provided name is registered.
-		/// </summary>
-		/// <typeparam name="T">The type of the service.</typeparam>
-		/// <param name="name">The unique name of the service.</param>
-		/// <returns>True if the service is registered; otherwise, false.</returns>
-		public static bool IsServiceRegistered<T>(string name)
+		if (!_subscribers.TryGetValue(typeof(T), out var subscribers))
 		{
-			lock (_sync)
-				return GetDict<T>().ContainsKey(name);
+			subscribers = [];
+			_subscribers.Add(typeof(T), subscribers);
 		}
 
-		/// <summary>
-		/// Tries to retrieve the registered service of type T, returning default if not registered.
-		/// </summary>
-		/// <typeparam name="T">The type of the service.</typeparam>
-		/// <returns>The service instance, or default if not registered.</returns>
-		public static T TryGetService<T>()
-			=> IsServiceRegistered<T>() ? GetService<T>() : default;
-
-		/// <summary>
-		/// Registers the service of type T if it is not already registered.
-		/// </summary>
-		/// <typeparam name="T">The type of the service.</typeparam>
-		/// <param name="service">The service instance.</param>
-		public static void TryRegisterService<T>(T service)
-		{
-			if (IsServiceRegistered<T>())
-				return;
+		subscribers.Add(svc => registered((T)svc));
+	}
 
-			RegisterService(service);
-		}
+	private static void RaiseServiceRegistered(Type type, object service)
+	{
+		ServiceRegistered?.Invoke(type, service);
 
-		/// <summary>
-		/// Occurs when a service fallback is invoked to construct a service.
-		/// </summary>
-		public static event Func<Type, string, object> ServiceFallback;
-
-		/// <summary>
-		/// Retrieves the service of type T by the default name, using fallback if necessary.
-		/// </summary>
-		/// <typeparam name="T">The type of the service.</typeparam>
-		/// <returns>The service instance.</returns>
-		public static T GetService<T>()
-			=> GetService<T>(typeof(T).AssemblyQualifiedName);
-
-		/// <summary>
-		/// Retrieves the service of type T by specified name, using fallback if necessary.
-		/// </summary>
-		/// <typeparam name="T">The type of the service.</typeparam>
-		/// <param name="name">The unique name of the service.</param>
-		/// <returns>The service instance.</returns>
-		public static T GetService<T>(string name)
-		{
-			lock (_sync)
-			{
-				var dict = GetDict<T>();
+		if (!_subscribers.TryGetValue(type, out var subscribers))
+			return;
 
-				if (dict.TryGetValue(name, out var service))
-					return (T)service;
-			}
+		foreach (var subscriber in subscribers)
+			subscriber(service);
+	}
 
-			var fallback = ServiceFallback ?? throw new InvalidOperationException($"Service '{name}' not registered.");
+	private static Dictionary<string, object> GetDict<T>() => GetDict(typeof(T));
 
-			var typed = (T)fallback(typeof(T), name) ?? throw new InvalidOperationException($"Service '{name}' not constructed.");
+	private static Dictionary<string, object> GetDict(Type type)
+	{
+		if (_services.TryGetValue(type, out var dict))
+			return dict;
 
-			RegisterService(name, typed);
+		dict = new Dictionary<string, object>(StringComparer.InvariantCultureIgnoreCase);
+		_services.Add(type, dict);
+		return dict;
+	}
 
-			return typed;
-		}
+	/// <summary>
+	/// Registers the specified service of type T using the default name.
+	/// </summary>
+	/// <typeparam name="T">The type of the service to register.</typeparam>
+	/// <param name="service">The service instance.</param>
+	public static void RegisterService<T>(T service)
+		=> RegisterService(typeof(T).AssemblyQualifiedName, service);
+
+	/// <summary>
+	/// Registers the specified service of type T with the provided name.
+	/// </summary>
+	/// <typeparam name="T">The type of the service to register.</typeparam>
+	/// <param name="name">The unique name to register the service.</param>
+	/// <param name="service">The service instance.</param>
+	public static void RegisterService<T>(string name, T service)
+	{
+		lock (_sync)
+			GetDict<T>()[name] = service;
+
+		RaiseServiceRegistered(typeof(T), service);
+	}
 
-		/// <summary>
-		/// Returns all distinct registered services of type T.
-		/// </summary>
-		/// <typeparam name="T">The type of the services.</typeparam>
-		/// <returns>An enumerable of service instances.</returns>
-		public static IEnumerable<T> GetServices<T>()
+	/// <summary>
+	/// Checks if a service of type T is registered using the default name.
+	/// </summary>
+	/// <typeparam name="T">The type of the service.</typeparam>
+	/// <returns>True if the service is registered; otherwise, false.</returns>
+	public static bool IsServiceRegistered<T>()
+		=> IsServiceRegistered<T>(typeof(T).AssemblyQualifiedName);
+
+	/// <summary>
+	/// Checks if a service of type T with the provided name is registered.
+	/// </summary>
+	/// <typeparam name="T">The type of the service.</typeparam>
+	/// <param name="name">The unique name of the service.</param>
+	/// <returns>True if the service is registered; otherwise, false.</returns>
+	public static bool IsServiceRegistered<T>(string name)
+	{
+		lock (_sync)
+			return GetDict<T>().ContainsKey(name);
+	}
+
+	/// <summary>
+	/// Tries to retrieve the registered service of type T, returning default if not registered.
+	/// </summary>
+	/// <typeparam name="T">The type of the service.</typeparam>
+	/// <returns>The service instance, or default if not registered.</returns>
+	public static T TryGetService<T>()
+		=> IsServiceRegistered<T>() ? GetService<T>() : default;
+
+	/// <summary>
+	/// Registers the service of type T if it is not already registered.
+	/// </summary>
+	/// <typeparam name="T">The type of the service.</typeparam>
+	/// <param name="service">The service instance.</param>
+	public static void TryRegisterService<T>(T service)
+	{
+		if (IsServiceRegistered<T>())
+			return;
+
+		RegisterService(service);
+	}
+
+	/// <summary>
+	/// Occurs when a service fallback is invoked to construct a service.
+	/// </summary>
+	public static event Func<Type, string, object> ServiceFallback;
+
+	/// <summary>
+	/// Retrieves the service of type T by the default name, using fallback if necessary.
+	/// </summary>
+	/// <typeparam name="T">The type of the service.</typeparam>
+	/// <returns>The service instance.</returns>
+	public static T GetService<T>()
+		=> GetService<T>(typeof(T).AssemblyQualifiedName);
+
+	/// <summary>
+	/// Retrieves the service of type T by specified name, using fallback if necessary.
+	/// </summary>
+	/// <typeparam name="T">The type of the service.</typeparam>
+	/// <param name="name">The unique name of the service.</param>
+	/// <returns>The service instance.</returns>
+	public static T GetService<T>(string name)
+	{
+		lock (_sync)
 		{
-			lock (_sync)
-				return [.. GetDict<T>().Values.Cast<T>().Distinct()];
+			var dict = GetDict<T>();
+
+			if (dict.TryGetValue(name, out var service))
+				return (T)service;
 		}
+
+		var fallback = ServiceFallback ?? throw new InvalidOperationException($"Service '{name}' not registered.");
+
+		var typed = (T)fallback(typeof(T), name) ?? throw new InvalidOperationException($"Service '{name}' not constructed.");
+
+		RegisterService(name, typed);
+
+		return typed;
+	}
+
+	/// <summary>
+	/// Returns all distinct registered services of type T.
+	/// </summary>
+	/// <typeparam name="T">The type of the services.</typeparam>
+	/// <returns>An enumerable of service instances.</returns>
+	public static IEnumerable<T> GetServices<T>()
+	{
+		lock (_sync)
+			return [.. GetDict<T>().Values.Cast<T>().Distinct()];
 	}
 }
\ No newline at end of file
diff --git a/Data.Linq2db/DataHelper.cs b/Data.Linq2db/DataHelper.cs
index dafb4852..6ca0b157 100644
--- a/Data.Linq2db/DataHelper.cs
+++ b/Data.Linq2db/DataHelper.cs
@@ -1,37 +1,36 @@
-namespace Ecng.Data
-{
-	using System;
+namespace Ecng.Data;
+
+using System;
 
-	using Ecng.Common;
+using Ecng.Common;
 
-	using LinqToDB.Data;
+using LinqToDB.Data;
 
+/// <summary>
+/// Extensions for <see cref="Data"/>.
+/// </summary>
+public static class DataHelper
+{
 	/// <summary>
-	/// Extensions for <see cref="Data"/>.
+	/// Create connection.
 	/// </summary>
-	public static class DataHelper
+	/// <param name="pair"><see cref="DatabaseConnectionPair"/>.</param>
+	/// <returns><see cref="DataConnection"/>.</returns>
+	public static DataConnection CreateConnection(this DatabaseConnectionPair pair)
 	{
-		/// <summary>
-		/// Create connection.
-		/// </summary>
-		/// <param name="pair"><see cref="DatabaseConnectionPair"/>.</param>
-		/// <returns><see cref="DataConnection"/>.</returns>
-		public static DataConnection CreateConnection(this DatabaseConnectionPair pair)
-		{
-			if (pair is null)
-				throw new ArgumentNullException(nameof(pair));
+		if (pair is null)
+			throw new ArgumentNullException(nameof(pair));
 
-			var provider = pair.Provider;
+		var provider = pair.Provider;
 
-			if (provider.IsEmpty())
-				throw new InvalidOperationException("Provider is not set.");
+		if (provider.IsEmpty())
+			throw new InvalidOperationException("Provider is not set.");
 
-			var connStr = pair.ConnectionString;
+		var connStr = pair.ConnectionString;
 
-			if (connStr.IsEmpty())
-				throw new InvalidOperationException("Cannot create a connection, because some data was not entered.");
+		if (connStr.IsEmpty())
+			throw new InvalidOperationException("Cannot create a connection, because some data was not entered.");
 
-			return new DataConnection(provider, connStr);
-		}
+		return new DataConnection(provider, connStr);
 	}
 }
\ No newline at end of file
diff --git a/Data/DatabaseConnectionCache.cs b/Data/DatabaseConnectionCache.cs
index 972a56d6..ceba7755 100644
--- a/Data/DatabaseConnectionCache.cs
+++ b/Data/DatabaseConnectionCache.cs
@@ -1,117 +1,116 @@
-namespace Ecng.Data
+namespace Ecng.Data;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using Ecng.Collections;
+using Ecng.Common;
+using Ecng.Serialization;
+
+/// <summary>
+/// Represents a cache for <see cref="DatabaseConnectionPair"/> objects.
+/// </summary>
+public class DatabaseConnectionCache : IPersistable
 {
-	using System;
-	using System.Collections.Generic;
-	using System.Linq;
+	private readonly CachedSynchronizedSet<DatabaseConnectionPair> _connections = new();
+
+	/// <summary>
+	/// Gets all database connection pairs.
+	/// </summary>
+	public IEnumerable<DatabaseConnectionPair> Connections => _connections.Cache;
+
+	/// <summary>
+	/// Occurs when a new database connection pair is created.
+	/// </summary>
+	public event Action<DatabaseConnectionPair> ConnectionCreated;
+
+	/// <summary>
+	/// Occurs when a database connection pair is deleted.
+	/// </summary>
+	public event Action<DatabaseConnectionPair> ConnectionDeleted;
 
-	using Ecng.Collections;
-	using Ecng.Common;
-	using Ecng.Serialization;
+	/// <summary>
+	/// Occurs when the connection cache is updated.
+	/// </summary>
+	public event Action Updated;
 
 	/// <summary>
-	/// Represents a cache for <see cref="DatabaseConnectionPair"/> objects.
+	/// Retrieves an existing connection matching the specified provider and connection string or adds a new connection if it does not exist.
 	/// </summary>
-	public class DatabaseConnectionCache : IPersistable
+	/// <param name="provider">The database provider.</param>
+	/// <param name="connectionString">The connection string.</param>
+	/// <returns>The corresponding <see cref="DatabaseConnectionPair"/>.</returns>
+	public DatabaseConnectionPair GetOrAdd(string provider, string connectionString)
 	{
-		private readonly CachedSynchronizedSet<DatabaseConnectionPair> _connections = new();
-
-		/// <summary>
-		/// Gets all database connection pairs.
-		/// </summary>
-		public IEnumerable<DatabaseConnectionPair> Connections => _connections.Cache;
-
-		/// <summary>
-		/// Occurs when a new database connection pair is created.
-		/// </summary>
-		public event Action<DatabaseConnectionPair> ConnectionCreated;
-
-		/// <summary>
-		/// Occurs when a database connection pair is deleted.
-		/// </summary>
-		public event Action<DatabaseConnectionPair> ConnectionDeleted;
-
-		/// <summary>
-		/// Occurs when the connection cache is updated.
-		/// </summary>
-		public event Action Updated;
-
-		/// <summary>
-		/// Retrieves an existing connection matching the specified provider and connection string or adds a new connection if it does not exist.
-		/// </summary>
-		/// <param name="provider">The database provider.</param>
-		/// <param name="connectionString">The connection string.</param>
-		/// <returns>The corresponding <see cref="DatabaseConnectionPair"/>.</returns>
-		public DatabaseConnectionPair GetOrAdd(string provider, string connectionString)
-		{
-			if (provider.IsEmpty())
-				throw new ArgumentNullException(nameof(provider));
+		if (provider.IsEmpty())
+			throw new ArgumentNullException(nameof(provider));
 
-			if (connectionString.IsEmpty())
-				throw new ArgumentNullException(nameof(connectionString));
+		if (connectionString.IsEmpty())
+			throw new ArgumentNullException(nameof(connectionString));
 
-			var isNew = false;
-			DatabaseConnectionPair connection;
+		var isNew = false;
+		DatabaseConnectionPair connection;
 
-			lock (_connections.SyncRoot)
-			{
-				connection = _connections.FirstOrDefault(p => p.Provider == provider && p.ConnectionString.EqualsIgnoreCase(connectionString));
+		lock (_connections.SyncRoot)
+		{
+			connection = _connections.FirstOrDefault(p => p.Provider == provider && p.ConnectionString.EqualsIgnoreCase(connectionString));
 
-				if (connection is null)
+			if (connection is null)
+			{
+				isNew = true;
+				_connections.Add(connection = new()
 				{
-					isNew = true;
-					_connections.Add(connection = new()
-					{
-						Provider = provider,
-						ConnectionString = connectionString,
-					});
-				}
+					Provider = provider,
+					ConnectionString = connectionString,
+				});
 			}
+		}
 
-			if (isNew)
-				ConnectionCreated?.Invoke(connection);
+		if (isNew)
+			ConnectionCreated?.Invoke(connection);
 
-			Updated?.Invoke();
-			return connection;
-		}
+		Updated?.Invoke();
+		return connection;
+	}
 
-		/// <summary>
-		/// Deletes the specified database connection pair from the cache.
-		/// </summary>
-		/// <param name="connection">The database connection pair to delete.</param>
-		/// <returns>
-		/// True if the connection was successfully removed; otherwise, false.
-		/// </returns>
-		public bool DeleteConnection(DatabaseConnectionPair connection)
-		{
-			if (connection is null)
-				throw new ArgumentNullException(nameof(connection));
+	/// <summary>
+	/// Deletes the specified database connection pair from the cache.
+	/// </summary>
+	/// <param name="connection">The database connection pair to delete.</param>
+	/// <returns>
+	/// True if the connection was successfully removed; otherwise, false.
+	/// </returns>
+	public bool DeleteConnection(DatabaseConnectionPair connection)
+	{
+		if (connection is null)
+			throw new ArgumentNullException(nameof(connection));
 
-			if (!_connections.Remove(connection))
-				return false;
+		if (!_connections.Remove(connection))
+			return false;
 
-			ConnectionDeleted?.Invoke(connection);
-			Updated?.Invoke();
-			return true;
-		}
+		ConnectionDeleted?.Invoke(connection);
+		Updated?.Invoke();
+		return true;
+	}
 
-		/// <summary>
-		/// Loads the database connection pairs from the specified settings storage.
-		/// </summary>
-		/// <param name="storage">The settings storage to load from.</param>
-		public void Load(SettingsStorage storage)
-		{
-			_connections.AddRange(storage
-				.GetValue<IEnumerable<DatabaseConnectionPair>>(nameof(Connections))
-				.Where(p => p.Provider != null));
-		}
+	/// <summary>
+	/// Loads the database connection pairs from the specified settings storage.
+	/// </summary>
+	/// <param name="storage">The settings storage to load from.</param>
+	public void Load(SettingsStorage storage)
+	{
+		_connections.AddRange(storage
+			.GetValue<IEnumerable<DatabaseConnectionPair>>(nameof(Connections))
+			.Where(p => p.Provider != null));
+	}
 
-		/// <summary>
-		/// Saves the database connection pairs to the specified settings storage.
-		/// </summary>
-		/// <param name="storage">The settings storage to save to.</param>
-		public void Save(SettingsStorage storage)
-		{
-			storage.SetValue(nameof(Connections), Connections.Select(pair => pair.Save()).ToArray());
-		}
+	/// <summary>
+	/// Saves the database connection pairs to the specified settings storage.
+	/// </summary>
+	/// <param name="storage">The settings storage to save to.</param>
+	public void Save(SettingsStorage storage)
+	{
+		storage.SetValue(nameof(Connections), Connections.Select(pair => pair.Save()).ToArray());
 	}
 }
\ No newline at end of file
diff --git a/Data/DatabaseConnectionPair.cs b/Data/DatabaseConnectionPair.cs
index 28cb6ccd..4f6da509 100644
--- a/Data/DatabaseConnectionPair.cs
+++ b/Data/DatabaseConnectionPair.cs
@@ -1,68 +1,67 @@
-namespace Ecng.Data
+namespace Ecng.Data;
+
+using Ecng.ComponentModel;
+using Ecng.Serialization;
+
+/// <summary>
+/// Provider and connection string pair.
+/// </summary>
+public class DatabaseConnectionPair : NotifiableObject, IPersistable
 {
-	using Ecng.ComponentModel;
-	using Ecng.Serialization;
+	private string _provider;
 
 	/// <summary>
-	/// Provider and connection string pair.
+	/// Provider type.
 	/// </summary>
-	public class DatabaseConnectionPair : NotifiableObject, IPersistable
+	public string Provider
 	{
-		private string _provider;
-
-		/// <summary>
-		/// Provider type.
-		/// </summary>
-		public string Provider
+		get => _provider;
+		set
 		{
-			get => _provider;
-			set
-			{
-				_provider = value;
-				UpdateTitle();
-			}
+			_provider = value;
+			UpdateTitle();
 		}
+	}
 
-		private string _connectionString;
+	private string _connectionString;
 
-		/// <summary>
-		/// Connection settings.
-		/// </summary>
-		public string ConnectionString
+	/// <summary>
+	/// Connection settings.
+	/// </summary>
+	public string ConnectionString
+	{
+		get => _connectionString;
+		set
 		{
-			get => _connectionString;
-			set
-			{
-				_connectionString = value;
-				UpdateTitle();
-			}
+			_connectionString = value;
+			UpdateTitle();
 		}
+	}
 
-		/// <summary>
-		/// Connection title.
-		/// </summary>
-		public string Title => $"({Provider}) {ConnectionString}";
+	/// <summary>
+	/// Connection title.
+	/// </summary>
+	public string Title => $"({Provider}) {ConnectionString}";
 
-		private void UpdateTitle()
-		{
-			NotifyChanged(nameof(Title));
-		}
+	private void UpdateTitle()
+	{
+		NotifyChanged(nameof(Title));
+	}
 
-		/// <inheritdoc />
-		public override string ToString() => Title;
+	/// <inheritdoc />
+	public override string ToString() => Title;
 
-		void IPersistable.Load(SettingsStorage storage)
-		{
-			Provider = storage.GetValue<string>(nameof(Provider));
-			ConnectionString = storage.GetValue<string>(nameof(ConnectionString));
-		}
+	void IPersistable.Load(SettingsStorage storage)
+	{
+		Provider = storage.GetValue<string>(nameof(Provider));
+		ConnectionString = storage.GetValue<string>(nameof(ConnectionString));
+	}
 
-		void IPersistable.Save(SettingsStorage storage)
-		{
-			storage
-				.Set(nameof(Provider), Provider)
-				.Set(nameof(ConnectionString), ConnectionString)
-				;
-		}
+	void IPersistable.Save(SettingsStorage storage)
+	{
+		storage
+			.Set(nameof(Provider), Provider)
+			.Set(nameof(ConnectionString), ConnectionString)
+			;
 	}
 }
\ No newline at end of file
diff --git a/IO/CompressionHelper.cs b/IO/CompressionHelper.cs
index 35c0c5aa..3a8c1711 100644
--- a/IO/CompressionHelper.cs
+++ b/IO/CompressionHelper.cs
@@ -1,331 +1,330 @@
-namespace Ecng.IO
-{
-	using System;
-	using System.Collections.Generic;
-	using System.IO;
-	using System.IO.Compression;
-	using System.Threading;
-	using System.Threading.Tasks;
+namespace Ecng.IO;
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Compression;
+using System.Threading;
+using System.Threading.Tasks;
 
-	using Ecng.Common;
+using Ecng.Common;
 
-	using Nito.AsyncEx;
+using Nito.AsyncEx;
 
+/// <summary>
+/// Provides helper methods for compressing and decompressing data using various algorithms.
+/// </summary>
+public static class CompressionHelper
+{
 	/// <summary>
-	/// Provides helper methods for compressing and decompressing data using various algorithms.
+	/// Extracts entries from a ZIP archive contained in the specified byte array.
 	/// </summary>
-	public static class CompressionHelper
+	/// <param name="input">The byte array containing the ZIP archive.</param>
+	/// <param name="leaveOpen">Whether to leave the underlying stream open.</param>
+	/// <param name="filter">A function to filter entries by name. Only entries returning true will be processed.</param>
+	/// <returns>An enumerable of tuples with the entry name and its content stream.</returns>
+	public static IEnumerable<(string name, Stream body)> Unzip(this byte[] input, bool leaveOpen = false, Func<string, bool> filter = null)
 	{
-		/// <summary>
-		/// Extracts entries from a ZIP archive contained in the specified byte array.
-		/// </summary>
-		/// <param name="input">The byte array containing the ZIP archive.</param>
-		/// <param name="leaveOpen">Whether to leave the underlying stream open.</param>
-		/// <param name="filter">A function to filter entries by name. Only entries returning true will be processed.</param>
-		/// <returns>An enumerable of tuples with the entry name and its content stream.</returns>
-		public static IEnumerable<(string name, Stream body)> Unzip(this byte[] input, bool leaveOpen = false, Func<string, bool> filter = null)
-		{
-			return input.To<MemoryStream>().Unzip(leaveOpen, filter);
-		}
+		return input.To<MemoryStream>().Unzip(leaveOpen, filter);
+	}
 
-		/// <summary>
-		/// Extracts entries from a ZIP archive contained in the specified stream.
-		/// </summary>
-		/// <param name="input">The stream containing the ZIP archive.</param>
-		/// <param name="leaveOpen">Whether to leave the underlying stream open after processing.</param>
-		/// <param name="filter">A function to filter entries by name. Only entries returning true will be processed.</param>
-		/// <returns>An enumerable of tuples with the entry full name and its content stream.</returns>
-		public static IEnumerable<(string name, Stream body)> Unzip(this Stream input, bool leaveOpen = false, Func<string, bool> filter = null)
+	/// <summary>
+	/// Extracts entries from a ZIP archive contained in the specified stream.
+	/// </summary>
+	/// <param name="input">The stream containing the ZIP archive.</param>
+	/// <param name="leaveOpen">Whether to leave the underlying stream open after processing.</param>
+	/// <param name="filter">A function to filter entries by name. Only entries returning true will be processed.</param>
+	/// <returns>An enumerable of tuples with the entry full name and its content stream.</returns>
+	public static IEnumerable<(string name, Stream body)> Unzip(this Stream input, bool leaveOpen = false, Func<string, bool> filter = null)
+	{
+		using (var zip = new ZipArchive(input, ZipArchiveMode.Read, leaveOpen))
 		{
-			using (var zip = new ZipArchive(input, ZipArchiveMode.Read, leaveOpen))
+			foreach (var entry in zip.Entries)
 			{
-				foreach (var entry in zip.Entries)
-				{
-					if (filter?.Invoke(entry.Name) == false)
-						continue;
-
-					using var stream = entry.Open();
-					yield return (entry.FullName, stream);
-				}
-			}
+				if (filter?.Invoke(entry.Name) == false)
+					continue;
 
-			if (!leaveOpen)
-				input.Close();
+				using var stream = entry.Open();
+				yield return (entry.FullName, stream);
+			}
 		}
 
-		/// <summary>
-		/// Represents the default buffer size used in compression and decompression operations.
-		/// </summary>
-		public const int DefaultBufferSize = FileSizes.KB * 80;
-
-		/// <summary>
-		/// Decompresses a GZip-compressed byte array into a UTF-8 encoded string.
-		/// </summary>
-		/// <param name="input">The byte array containing GZip-compressed data.</param>
-		/// <returns>A string resulting from decompression.</returns>
-		public static string UnGZip(this byte[] input)
-			=> input.UnGZip(0, input.Length);
-
-		/// <summary>
-		/// Decompresses a GZip-compressed segment of bytes into a UTF-8 encoded string.
-		/// </summary>
-		/// <param name="v">The byte array segment containing GZip-compressed data.</param>
-		/// <returns>A string resulting from decompression.</returns>
-		public static string UnGZip(this ArraySegment<byte> v)
-			=> v.Array.UnGZip(v.Offset, v.Count);
-
-		/// <summary>
-		/// Decompresses a GZip-compressed portion of a byte array into a UTF-8 encoded string.
-		/// </summary>
-		/// <param name="input">The byte array containing GZip-compressed data.</param>
-		/// <param name="index">The starting index from which to begin decompression.</param>
-		/// <param name="count">The number of bytes to decompress.</param>
-		/// <returns>A string resulting from decompression.</returns>
-		public static string UnGZip(this byte[] input, int index, int count)
-			=> input.Uncompress<GZipStream>(index, count).UTF8();
-
-		/// <summary>
-		/// Decompresses a GZip-compressed segment of bytes into the provided destination buffer.
-		/// </summary>
-		/// <param name="input">The byte array segment containing GZip-compressed data.</param>
-		/// <param name="destination">The buffer to store decompressed data.</param>
-		/// <returns>The number of bytes written into the destination buffer.</returns>
-		public static int UnGZip(this ArraySegment<byte> input, byte[] destination)
-			=> UnGZip(input.Array, input.Offset, input.Count, destination);
-
-		/// <summary>
-		/// Decompresses a portion of a GZip-compressed byte array into the provided destination buffer.
-		/// </summary>
-		/// <param name="input">The byte array containing GZip-compressed data.</param>
-		/// <param name="index">The starting index for decompression.</param>
-		/// <param name="count">The number of bytes to decompress.</param>
-		/// <param name="destination">The buffer to store decompressed data.</param>
-		/// <returns>The number of bytes written into the destination buffer.</returns>
-		public static int UnGZip(this byte[] input, int index, int count, byte[] destination)
-		{
-			using var inputStream = new MemoryStream(input, index, count);
-			using var outputStream = new MemoryStream(destination);
-			AsyncContext.Run(() => inputStream.UncompressAsync<GZipStream>(outputStream, true));
-			return (int)outputStream.Position;
-		}
+		if (!leaveOpen)
+			input.Close();
+	}
 
-		/// <summary>
-		/// Decompresses a Deflate-compressed byte array into a UTF-8 encoded string.
-		/// </summary>
-		/// <param name="input">The byte array containing Deflate-compressed data.</param>
-		/// <returns>A string resulting from decompression.</returns>
-		public static string UnDeflate(this byte[] input)
-			=> input.UnDeflate(0, input.Length);
-
-		/// <summary>
-		/// Decompresses a segment of Deflate-compressed bytes into a UTF-8 encoded string.
-		/// </summary>
-		/// <param name="v">The byte array segment containing Deflate-compressed data.</param>
-		/// <returns>A string resulting from decompression.</returns>
-		public static string UnDeflate(this ArraySegment<byte> v)
-			=> v.Array.UnDeflate(v.Offset, v.Count);
-
-		/// <summary>
-		/// Decompresses a portion of a Deflate-compressed byte array into a UTF-8 encoded string.
-		/// </summary>
-		/// <param name="input">The byte array containing Deflate-compressed data.</param>
-		/// <param name="index">The starting index for decompression.</param>
-		/// <param name="count">The number of bytes to decompress.</param>
-		/// <returns>A string resulting from decompression.</returns>
-		public static string UnDeflate(this byte[] input, int index, int count)
-			=> input.DeflateFrom(index, count).UTF8();
-
-		/// <summary>
-		/// Decompresses a Deflate-compressed segment of bytes into the provided destination buffer.
-		/// </summary>
-		/// <param name="input">The byte array segment containing Deflate-compressed data.</param>
-		/// <param name="destination">The buffer to store decompressed data.</param>
-		/// <returns>The number of bytes written into the destination buffer.</returns>
-		public static int UnDeflate(this ArraySegment<byte> input, byte[] destination)
-			=> UnDeflate(input.Array, input.Offset, input.Count, destination);
-
-		/// <summary>
-		/// Decompresses a portion of a Deflate-compressed byte array into the provided destination buffer.
-		/// </summary>
-		/// <param name="input">The byte array containing Deflate-compressed data.</param>
-		/// <param name="index">The starting index for decompression.</param>
-		/// <param name="count">The number of bytes to decompress.</param>
-		/// <param name="destination">The buffer to store decompressed data.</param>
-		/// <returns>The number of bytes written into the destination buffer.</returns>
-		public static int UnDeflate(this byte[] input, int index, int count, byte[] destination)
-		{
-			using var inputStream = new MemoryStream(input, index, count);
-			using var outputStream = new MemoryStream(destination);
-			AsyncContext.Run(() => inputStream.UncompressAsync<DeflateStream>(outputStream, true));
-			return (int)outputStream.Position;
-		}
+	/// <summary>
+	/// Represents the default buffer size used in compression and decompression operations.
+	/// </summary>
+	public const int DefaultBufferSize = FileSizes.KB * 80;
 
-		/// <summary>
-		/// Compresses the specified byte array using the Deflate algorithm.
-		/// </summary>
-		/// <param name="input">The byte array to compress.</param>
-		/// <returns>A compressed byte array.</returns>
-		public static byte[] DeflateTo(this byte[] input)
-			=> input.Compress<DeflateStream>();
-
-		/// <summary>
-		/// Compresses a segment of a byte array using the Deflate algorithm.
-		/// </summary>
-		/// <param name="v">The byte array segment to compress.</param>
-		/// <returns>A compressed byte array.</returns>
-		public static byte[] DeflateFrom(this ArraySegment<byte> v)
-			=> v.Array.DeflateFrom(v.Offset, v.Count);
-
-		/// <summary>
-		/// Compresses a portion of a byte array using the Deflate algorithm.
-		/// </summary>
-		/// <param name="input">The byte array to compress.</param>
-		/// <param name="index">The starting index from which to begin compression.</param>
-		/// <param name="count">The number of bytes to compress.</param>
-		/// <param name="bufferSize">The buffer size to use during compression.</param>
-		/// <returns>A compressed byte array.</returns>
-		public static byte[] DeflateFrom(this byte[] input, int? index = default, int? count = default, int bufferSize = DefaultBufferSize)
-			=> input.Uncompress<DeflateStream>(index, count, bufferSize);
-
-		/// <summary>
-		/// Compresses the specified byte array using the 7Zip (LZMA) algorithm.
-		/// </summary>
-		/// <param name="input">The byte array to compress.</param>
-		/// <returns>A compressed byte array.</returns>
-		public static byte[] Do7Zip(this byte[] input)
-			=> input.Compress<Lzma.LzmaStream>();
-
-		/// <summary>
-		/// Decompresses a 7Zip (LZMA) compressed byte array.
-		/// </summary>
-		/// <param name="input">The byte array containing 7Zip-compressed data.</param>
-		/// <returns>A decompressed byte array.</returns>
-		public static byte[] Un7Zip(this byte[] input)
-			=> input.Uncompress<Lzma.LzmaStream>();
-
-		/// <summary>
-		/// Compresses a portion of a byte array using the specified compression stream.
-		/// </summary>
-		/// <typeparam name="TCompressStream">The type of compression stream to use.</typeparam>
-		/// <param name="input">The byte array to compress.</param>
-		/// <param name="index">The starting index for compression.</param>
-		/// <param name="count">The number of bytes to compress.</param>
-		/// <param name="level">The compression level to use.</param>
-		/// <param name="bufferSize">The buffer size to use during compression.</param>
-		/// <returns>A compressed byte array.</returns>
-		public static byte[] Compress<TCompressStream>(this byte[] input, int? index = default, int? count = default, CompressionLevel level = CompressionLevel.Optimal, int bufferSize = DefaultBufferSize)
-			where TCompressStream : Stream
-			=> AsyncContext.Run(() => input.CompressAsync<TCompressStream>(index, count, level, bufferSize));
-
-		/// <summary>
-		/// Decompresses a portion of a byte array using the specified compression stream.
-		/// </summary>
-		/// <typeparam name="TCompressStream">The type of compression stream to use.</typeparam>
-		/// <param name="input">The byte array containing compressed data.</param>
-		/// <param name="index">The starting index for decompression.</param>
-		/// <param name="count">The number of bytes to decompress.</param>
-		/// <param name="bufferSize">The buffer size to use during decompression.</param>
-		/// <returns>A decompressed byte array.</returns>
-		public static byte[] Uncompress<TCompressStream>(this byte[] input, int? index = default, int? count = default, int bufferSize = DefaultBufferSize)
-			where TCompressStream : Stream
-			=> AsyncContext.Run(() => input.UncompressAsync<TCompressStream>(index, count, bufferSize));
-
-		/// <summary>
-		/// Asynchronously compresses a segment of a byte array using the specified compression stream.
-		/// </summary>
-		/// <typeparam name="TCompressStream">The type of compression stream to use.</typeparam>
-		/// <param name="v">The segment of the byte array to compress.</param>
-		/// <param name="level">The compression level to use.</param>
-		/// <param name="bufferSize">The buffer size to use during compression.</param>
-		/// <returns>A task representing the asynchronous operation, with a compressed byte array as the result.</returns>
-		public static Task<byte[]> CompressAsync<TCompressStream>(this ArraySegment<byte> v, CompressionLevel level = CompressionLevel.Optimal, int bufferSize = DefaultBufferSize)
-			where TCompressStream : Stream
-			=> v.Array.CompressAsync<TCompressStream>(v.Offset, v.Count, level, bufferSize);
-
-		/// <summary>
-		/// Asynchronously compresses a portion of a byte array using the specified compression stream.
-		/// </summary>
-		/// <typeparam name="TCompressStream">The type of compression stream to use.</typeparam>
-		/// <param name="input">The byte array to compress.</param>
-		/// <param name="index">The starting index for compression.</param>
-		/// <param name="count">The number of bytes to compress.</param>
-		/// <param name="level">The compression level to use.</param>
-		/// <param name="bufferSize">The buffer size to use during compression.</param>
-		/// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
-		/// <returns>A task representing the asynchronous operation, with a compressed byte array as the result.</returns>
-		public static async Task<byte[]> CompressAsync<TCompressStream>(this byte[] input, int? index = default, int? count = default, CompressionLevel level = CompressionLevel.Optimal, int bufferSize = DefaultBufferSize, CancellationToken cancellationToken = default)
-			where TCompressStream : Stream
-		{
-			if (input is null)
-				throw new ArgumentNullException(nameof(input));
+	/// <summary>
+	/// Decompresses a GZip-compressed byte array into a UTF-8 encoded string.
+	/// </summary>
+	/// <param name="input">The byte array containing GZip-compressed data.</param>
+	/// <returns>A string resulting from decompression.</returns>
+	public static string UnGZip(this byte[] input)
+		=> input.UnGZip(0, input.Length);
 
-			using var inputStream = new MemoryStream(input, index ?? 0, count ?? input.Length);
-			using var outputStream = new MemoryStream();
-			await inputStream.CompressAsync<TCompressStream>(outputStream, level, true, bufferSize, cancellationToken);
-			return outputStream.To<byte[]>();
-		}
+	/// <summary>
+	/// Decompresses a GZip-compressed segment of bytes into a UTF-8 encoded string.
+	/// </summary>
+	/// <param name="v">The byte array segment containing GZip-compressed data.</param>
+	/// <returns>A string resulting from decompression.</returns>
+	public static string UnGZip(this ArraySegment<byte> v)
+		=> v.Array.UnGZip(v.Offset, v.Count);
 
-		/// <summary>
-		/// Asynchronously decompresses a portion of a byte array using the specified compression stream.
-		/// </summary>
-		/// <typeparam name="TCompressStream">The type of compression stream to use.</typeparam>
-		/// <param name="input">The byte array containing compressed data.</param>
-		/// <param name="index">The starting index for decompression.</param>
-		/// <param name="count">The number of bytes to decompress.</param>
-		/// <param name="bufferSize">The buffer size to use during decompression.</param>
-		/// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
-		/// <returns>A task representing the asynchronous operation, with a decompressed byte array as the result.</returns>
-		public static async Task<byte[]> UncompressAsync<TCompressStream>(this byte[] input, int? index = default, int? count = default, int bufferSize = DefaultBufferSize, CancellationToken cancellationToken = default)
-			where TCompressStream : Stream
-		{
-			if (input is null)
-				throw new ArgumentNullException(nameof(input));
+	/// <summary>
+	/// Decompresses a GZip-compressed portion of a byte array into a UTF-8 encoded string.
+	/// </summary>
+	/// <param name="input">The byte array containing GZip-compressed data.</param>
+	/// <param name="index">The starting index from which to begin decompression.</param>
+	/// <param name="count">The number of bytes to decompress.</param>
+	/// <returns>A string resulting from decompression.</returns>
+	public static string UnGZip(this byte[] input, int index, int count)
+		=> input.Uncompress<GZipStream>(index, count).UTF8();
 
-			using var inputStream = new MemoryStream(input, index ?? 0, count ?? input.Length);
-			using var outputStream = new MemoryStream();
-			await inputStream.UncompressAsync<TCompressStream>(outputStream, true, bufferSize, cancellationToken);
-			return outputStream.To<byte[]>();
-		}
+	/// <summary>
+	/// Decompresses a GZip-compressed segment of bytes into the provided destination buffer.
+	/// </summary>
+	/// <param name="input">The byte array segment containing GZip-compressed data.</param>
+	/// <param name="destination">The buffer to store decompressed data.</param>
+	/// <returns>The number of bytes written into the destination buffer.</returns>
+	public static int UnGZip(this ArraySegment<byte> input, byte[] destination)
+		=> UnGZip(input.Array, input.Offset, input.Count, destination);
 
-		/// <summary>
-		/// Asynchronously compresses data from the input stream and writes the compressed data to the output stream using the specified compression stream.
-		/// </summary>
-		/// <typeparam name="TCompressStream">The type of compression stream to use.</typeparam>
-		/// <param name="input">The input stream containing data to compress.</param>
-		/// <param name="output">The output stream to write compressed data to.</param>
-		/// <param name="level">The compression level to use.</param>
-		/// <param name="leaveOpen">Whether to leave the output stream open after compression.</param>
-		/// <param name="bufferSize">The buffer size to use during compression.</param>
-		/// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
-		/// <returns>A task representing the asynchronous compression operation.</returns>
-		public static async Task CompressAsync<TCompressStream>(this Stream input, Stream output, CompressionLevel level = CompressionLevel.Optimal, bool leaveOpen = true, int bufferSize = DefaultBufferSize, CancellationToken cancellationToken = default)
-			where TCompressStream : Stream
-		{
-			if (input is null)
-				throw new ArgumentNullException(nameof(input));
+	/// <summary>
+	/// Decompresses a portion of a GZip-compressed byte array into the provided destination buffer.
+	/// </summary>
+	/// <param name="input">The byte array containing GZip-compressed data.</param>
+	/// <param name="index">The starting index for decompression.</param>
+	/// <param name="count">The number of bytes to decompress.</param>
+	/// <param name="destination">The buffer to store decompressed data.</param>
+	/// <returns>The number of bytes written into the destination buffer.</returns>
+	public static int UnGZip(this byte[] input, int index, int count, byte[] destination)
+	{
+		using var inputStream = new MemoryStream(input, index, count);
+		using var outputStream = new MemoryStream(destination);
+		AsyncContext.Run(() => inputStream.UncompressAsync<GZipStream>(outputStream, true));
+		return (int)outputStream.Position;
+	}
 
-			using var compress = (TCompressStream)Activator.CreateInstance(typeof(TCompressStream), output, level, leaveOpen);
-			await input.CopyToAsync(compress, bufferSize, cancellationToken);
-		}
+	/// <summary>
+	/// Decompresses a Deflate-compressed byte array into a UTF-8 encoded string.
+	/// </summary>
+	/// <param name="input">The byte array containing Deflate-compressed data.</param>
+	/// <returns>A string resulting from decompression.</returns>
+	public static string UnDeflate(this byte[] input)
+		=> input.UnDeflate(0, input.Length);
 
-		/// <summary>
-		/// Asynchronously decompresses data from the input stream and writes the decompressed data to the output stream using the specified compression stream.
-		/// </summary>
-		/// <typeparam name="TCompressStream">The type of compression stream to use.</typeparam>
-		/// <param name="input">The input stream containing compressed data.</param>
-		/// <param name="output">The output stream to write decompressed data to.</param>
-		/// <param name="leaveOpen">Whether to leave the input stream open after decompression.</param>
-		/// <param name="bufferSize">The buffer size to use during decompression.</param>
-		/// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
-		/// <returns>A task representing the asynchronous decompression operation.</returns>
-		public static async Task UncompressAsync<TCompressStream>(this Stream input, Stream output, bool leaveOpen = true, int bufferSize = DefaultBufferSize, CancellationToken cancellationToken = default)
-			where TCompressStream : Stream
-		{
-			if (input is null)
-				throw new ArgumentNullException(nameof(input));
+	/// <summary>
+	/// Decompresses a segment of Deflate-compressed bytes into a UTF-8 encoded string.
+	/// </summary>
+	/// <param name="v">The byte array segment containing Deflate-compressed data.</param>
+	/// <returns>A string resulting from decompression.</returns>
+	public static string UnDeflate(this ArraySegment<byte> v)
+		=> v.Array.UnDeflate(v.Offset, v.Count);
 
-			using var compress = (TCompressStream)Activator.CreateInstance(typeof(TCompressStream), input, CompressionMode.Decompress, leaveOpen);
-			await compress.CopyToAsync(output, bufferSize, cancellationToken);
-		}
+	/// <summary>
+	/// Decompresses a portion of a Deflate-compressed byte array into a UTF-8 encoded string.
+	/// </summary>
+	/// <param name="input">The byte array containing Deflate-compressed data.</param>
+	/// <param name="index">The starting index for decompression.</param>
+	/// <param name="count">The number of bytes to decompress.</param>
+	/// <returns>A string resulting from decompression.</returns>
+	public static string UnDeflate(this byte[] input, int index, int count)
+		=> input.DeflateFrom(index, count).UTF8();
+
+	/// <summary>
+	/// Decompresses a Deflate-compressed segment of bytes into the provided destination buffer.
+	/// </summary>
+	/// <param name="input">The byte array segment containing Deflate-compressed data.</param>
+	/// <param name="destination">The buffer to store decompressed data.</param>
+	/// <returns>The number of bytes written into the destination buffer.</returns>
+	public static int UnDeflate(this ArraySegment<byte> input, byte[] destination)
+		=> UnDeflate(input.Array, input.Offset, input.Count, destination);
+
+	/// <summary>
+	/// Decompresses a portion of a Deflate-compressed byte array into the provided destination buffer.
+	/// </summary>
+	/// <param name="input">The byte array containing Deflate-compressed data.</param>
+	/// <param name="index">The starting index for decompression.</param>
+	/// <param name="count">The number of bytes to decompress.</param>
+	/// <param name="destination">The buffer to store decompressed data.</param>
+	/// <returns>The number of bytes written into the destination buffer.</returns>
+	public static int UnDeflate(this byte[] input, int index, int count, byte[] destination)
+	{
+		using var inputStream = new MemoryStream(input, index, count);
+		using var outputStream = new MemoryStream(destination);
+		AsyncContext.Run(() => inputStream.UncompressAsync<DeflateStream>(outputStream, true));
+		return (int)outputStream.Position;
+	}
+
+	/// <summary>
+	/// Compresses the specified byte array using the Deflate algorithm.
+	/// </summary>
+	/// <param name="input">The byte array to compress.</param>
+	/// <returns>A compressed byte array.</returns>
+	public static byte[] DeflateTo(this byte[] input)
+		=> input.Compress<DeflateStream>();
+
+	/// <summary>
+	/// Compresses a segment of a byte array using the Deflate algorithm.
+	/// </summary>
+	/// <param name="v">The byte array segment to compress.</param>
+	/// <returns>A compressed byte array.</returns>
+	public static byte[] DeflateFrom(this ArraySegment<byte> v)
+		=> v.Array.DeflateFrom(v.Offset, v.Count);
+
+	/// <summary>
+	/// Compresses a portion of a byte array using the Deflate algorithm.
+	/// </summary>
+	/// <param name="input">The byte array to compress.</param>
+	/// <param name="index">The starting index from which to begin compression.</param>
+	/// <param name="count">The number of bytes to compress.</param>
+	/// <param name="bufferSize">The buffer size to use during compression.</param>
+	/// <returns>A compressed byte array.</returns>
+	public static byte[] DeflateFrom(this byte[] input, int? index = default, int? count = default, int bufferSize = DefaultBufferSize)
+		=> input.Uncompress<DeflateStream>(index, count, bufferSize);
+
+	/// <summary>
+	/// Compresses the specified byte array using the 7Zip (LZMA) algorithm.
+	/// </summary>
+	/// <param name="input">The byte array to compress.</param>
+	/// <returns>A compressed byte array.</returns>
+	public static byte[] Do7Zip(this byte[] input)
+		=> input.Compress<Lzma.LzmaStream>();
+
+	/// <summary>
+	/// Decompresses a 7Zip (LZMA) compressed byte array.
+	/// </summary>
+	/// <param name="input">The byte array containing 7Zip-compressed data.</param>
+	/// <returns>A decompressed byte array.</returns>
+	public static byte[] Un7Zip(this byte[] input)
+		=> input.Uncompress<Lzma.LzmaStream>();
+
+	/// <summary>
+	/// Compresses a portion of a byte array using the specified compression stream.
+	/// </summary>
+	/// <typeparam name="TCompressStream">The type of compression stream to use.</typeparam>
+	/// <param name="input">The byte array to compress.</param>
+	/// <param name="index">The starting index for compression.</param>
+	/// <param name="count">The number of bytes to compress.</param>
+	/// <param name="level">The compression level to use.</param>
+	/// <param name="bufferSize">The buffer size to use during compression.</param>
+	/// <returns>A compressed byte array.</returns>
+	public static byte[] Compress<TCompressStream>(this byte[] input, int? index = default, int? count = default, CompressionLevel level = CompressionLevel.Optimal, int bufferSize = DefaultBufferSize)
+		where TCompressStream : Stream
+		=> AsyncContext.Run(() => input.CompressAsync<TCompressStream>(index, count, level, bufferSize));
+
+	/// <summary>
+	/// Decompresses a portion of a byte array using the specified compression stream.
+	/// </summary>
+	/// <typeparam name="TCompressStream">The type of compression stream to use.</typeparam>
+	/// <param name="input">The byte array containing compressed data.</param>
+	/// <param name="index">The starting index for decompression.</param>
+	/// <param name="count">The number of bytes to decompress.</param>
+	/// <param name="bufferSize">The buffer size to use during decompression.</param>
+	/// <returns>A decompressed byte array.</returns>
+	public static byte[] Uncompress<TCompressStream>(this byte[] input, int? index = default, int? count = default, int bufferSize = DefaultBufferSize)
+		where TCompressStream : Stream
+		=> AsyncContext.Run(() => input.UncompressAsync<TCompressStream>(index, count, bufferSize));
+
+	/// <summary>
+	/// Asynchronously compresses a segment of a byte array using the specified compression stream.
+	/// </summary>
+	/// <typeparam name="TCompressStream">The type of compression stream to use.</typeparam>
+	/// <param name="v">The segment of the byte array to compress.</param>
+	/// <param name="level">The compression level to use.</param>
+	/// <param name="bufferSize">The buffer size to use during compression.</param>
+	/// <returns>A task representing the asynchronous operation, with a compressed byte array as the result.</returns>
+	public static Task<byte[]> CompressAsync<TCompressStream>(this ArraySegment<byte> v, CompressionLevel level = CompressionLevel.Optimal, int bufferSize = DefaultBufferSize)
+		where TCompressStream : Stream
+		=> v.Array.CompressAsync<TCompressStream>(v.Offset, v.Count, level, bufferSize);
+
+	/// <summary>
+	/// Asynchronously compresses a portion of a byte array using the specified compression stream.
+	/// </summary>
+	/// <typeparam name="TCompressStream">The type of compression stream to use.</typeparam>
+	/// <param name="input">The byte array to compress.</param>
+	/// <param name="index">The starting index for compression.</param>
+	/// <param name="count">The number of bytes to compress.</param>
+	/// <param name="level">The compression level to use.</param>
+	/// <param name="bufferSize">The buffer size to use during compression.</param>
+	/// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
+	/// <returns>A task representing the asynchronous operation, with a compressed byte array as the result.</returns>
+	public static async Task<byte[]> CompressAsync<TCompressStream>(this byte[] input, int? index = default, int? count = default, CompressionLevel level = CompressionLevel.Optimal, int bufferSize = DefaultBufferSize, CancellationToken cancellationToken = default)
+		where TCompressStream : Stream
+	{
+		if (input is null)
+			throw new ArgumentNullException(nameof(input));
+
+		using var inputStream = new MemoryStream(input, index ?? 0, count ?? input.Length);
+		using var outputStream = new MemoryStream();
+		await inputStream.CompressAsync<TCompressStream>(outputStream, level, true, bufferSize, cancellationToken);
+		return outputStream.To<byte[]>();
+	}
+
+	/// <summary>
+	/// Asynchronously decompresses a portion of a byte array using the specified compression stream.
+	/// </summary>
+	/// <typeparam name="TCompressStream">The type of compression stream to use.</typeparam>
+	/// <param name="input">The byte array containing compressed data.</param>
+	/// <param name="index">The starting index for decompression.</param>
+	/// <param name="count">The number of bytes to decompress.</param>
+	/// <param name="bufferSize">The buffer size to use during decompression.</param>
+	/// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
+	/// <returns>A task representing the asynchronous operation, with a decompressed byte array as the result.</returns>
+	public static async Task<byte[]> UncompressAsync<TCompressStream>(this byte[] input, int? index = default, int? count = default, int bufferSize = DefaultBufferSize, CancellationToken cancellationToken = default)
+		where TCompressStream : Stream
+	{
+		if (input is null)
+			throw new ArgumentNullException(nameof(input));
+
+		using var inputStream = new MemoryStream(input, index ?? 0, count ?? input.Length);
+		using var outputStream = new MemoryStream();
+		await inputStream.UncompressAsync<TCompressStream>(outputStream, true, bufferSize, cancellationToken);
+		return outputStream.To<byte[]>();
+	}
+
+	/// <summary>
+	/// Asynchronously compresses data from the input stream and writes the compressed data to the output stream using the specified compression stream.
+	/// </summary>
+	/// <typeparam name="TCompressStream">The type of compression stream to use.</typeparam>
+	/// <param name="input">The input stream containing data to compress.</param>
+	/// <param name="output">The output stream to write compressed data to.</param>
+	/// <param name="level">The compression level to use.</param>
+	/// <param name="leaveOpen">Whether to leave the output stream open after compression.</param>
+	/// <param name="bufferSize">The buffer size to use during compression.</param>
+	/// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
+	/// <returns>A task representing the asynchronous compression operation.</returns>
+	public static async Task CompressAsync<TCompressStream>(this Stream input, Stream output, CompressionLevel level = CompressionLevel.Optimal, bool leaveOpen = true, int bufferSize = DefaultBufferSize, CancellationToken cancellationToken = default)
+		where TCompressStream : Stream
+	{
+		if (input is null)
+			throw new ArgumentNullException(nameof(input));
+
+		using var compress = (TCompressStream)Activator.CreateInstance(typeof(TCompressStream), output, level, leaveOpen);
+		await input.CopyToAsync(compress, bufferSize, cancellationToken);
+	}
+
+	/// <summary>
+	/// Asynchronously decompresses data from the input stream and writes the decompressed data to the output stream using the specified compression stream.
+	/// </summary>
+	/// <typeparam name="TCompressStream">The type of compression stream to use.</typeparam>
+	/// <param name="input">The input stream containing compressed data.</param>
+	/// <param name="output">The output stream to write decompressed data to.</param>
+	/// <param name="leaveOpen">Whether to leave the input stream open after decompression.</param>
+	/// <param name="bufferSize">The buffer size to use during decompression.</param>
+	/// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
+	/// <returns>A task representing the asynchronous decompression operation.</returns>
+	public static async Task UncompressAsync<TCompressStream>(this Stream input, Stream output, bool leaveOpen = true, int bufferSize = DefaultBufferSize, CancellationToken cancellationToken = default)
+		where TCompressStream : Stream
+	{
+		if (input is null)
+			throw new ArgumentNullException(nameof(input));
+
+		using var compress = (TCompressStream)Activator.CreateInstance(typeof(TCompressStream), input, CompressionMode.Decompress, leaveOpen);
+		await compress.CopyToAsync(output, bufferSize, cancellationToken);
 	}
 }
\ No newline at end of file
diff --git a/Interop.Windows/Dde/DdeSettings.cs b/Interop.Windows/Dde/DdeSettings.cs
index 84cd732b..aa41752f 100644
--- a/Interop.Windows/Dde/DdeSettings.cs
+++ b/Interop.Windows/Dde/DdeSettings.cs
@@ -1,126 +1,125 @@
-namespace Ecng.Interop.Dde
+namespace Ecng.Interop.Dde;
+
+using System;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+
+using Ecng.Common;
+using Ecng.Serialization;
+
+/// <summary>
+/// Represents the settings for DDE (Dynamic Data Exchange) communication.
+/// </summary>
+[DisplayName("DDE settings")]
+public class DdeSettings : Cloneable<DdeSettings>, IPersistable
 {
-	using System;
-	using System.ComponentModel;
-	using System.ComponentModel.DataAnnotations;
+	/// <summary>
+	/// Initializes a new instance of the <see cref="DdeSettings"/> class with default values.
+	/// </summary>
+	public DdeSettings()
+	{
+		Server = "EXCEL";
+		Topic = "[Book1.xlsx]Sheet1";
+	}
+
+	/// <summary>
+	/// Gets or sets the DDE server name.
+	/// </summary>
+	[Display(Name = "Server", Description = "DDE server name.", Order = 0)]
+	public string Server { get; set; }
+
+	/// <summary>
+	/// Gets or sets the DDE topic name (for example, "[Book1.xlsx]Sheet1").
+	/// </summary>
+	[Display(Name = "Topic", Description = "Topic name (like [Book1.xlsx].Sheet1).", Order = 1)]
+	public string Topic { get; set; }
 
-	using Ecng.Common;
-	using Ecng.Serialization;
+	private int _columnOffset;
 
 	/// <summary>
-	/// Represents the settings for DDE (Dynamic Data Exchange) communication.
+	/// Gets or sets the column offset from the left top corner.
 	/// </summary>
-	[DisplayName("DDE settings")]
-	public class DdeSettings : Cloneable<DdeSettings>, IPersistable
+	/// <exception cref="ArgumentOutOfRangeException">Thrown when a negative value is assigned.</exception>
+	[Display(Name = "Column offset", Description = "Column offset from left top corner.", Order = 2)]
+	public int ColumnOffset
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="DdeSettings"/> class with default values.
-		/// </summary>
-		public DdeSettings()
+		get { return _columnOffset; }
+		set
 		{
-			Server = "EXCEL";
-			Topic = "[Book1.xlsx]Sheet1";
-		}
+			if (value < 0)
+				throw new ArgumentOutOfRangeException();
 
-		/// <summary>
-		/// Gets or sets the DDE server name.
-		/// </summary>
-		[Display(Name = "Server", Description = "DDE server name.", Order = 0)]
-		public string Server { get; set; }
-
-		/// <summary>
-		/// Gets or sets the DDE topic name (for example, "[Book1.xlsx]Sheet1").
-		/// </summary>
-		[Display(Name = "Topic", Description = "Topic name (like [Book1.xlsx].Sheet1).", Order = 1)]
-		public string Topic { get; set; }
-
-		private int _columnOffset;
-
-		/// <summary>
-		/// Gets or sets the column offset from the left top corner.
-		/// </summary>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown when a negative value is assigned.</exception>
-		[Display(Name = "Column offset", Description = "Column offset from left top corner.", Order = 2)]
-		public int ColumnOffset
-		{
-			get { return _columnOffset; }
-			set
-			{
-				if (value < 0)
-					throw new ArgumentOutOfRangeException();
-
-				_columnOffset = value;
-			}
+			_columnOffset = value;
 		}
+	}
 
-		private int _rowOffset;
+	private int _rowOffset;
 
-		/// <summary>
-		/// Gets or sets the row offset from the left top corner.
-		/// </summary>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown when a negative value is assigned.</exception>
-		[Display(Name = "Row offset", Description = "Row offset from left top corner.", Order = 2)]
-		public int RowOffset
+	/// <summary>
+	/// Gets or sets the row offset from the left top corner.
+	/// </summary>
+	/// <exception cref="ArgumentOutOfRangeException">Thrown when a negative value is assigned.</exception>
+	[Display(Name = "Row offset", Description = "Row offset from left top corner.", Order = 2)]
+	public int RowOffset
+	{
+		get { return _rowOffset; }
+		set
 		{
-			get { return _rowOffset; }
-			set
-			{
-				if (value < 0)
-					throw new ArgumentOutOfRangeException();
-
-				_rowOffset = value;
-			}
-		}
+			if (value < 0)
+				throw new ArgumentOutOfRangeException();
 
-		/// <summary>
-		/// Gets or sets a value indicating whether header names should be displayed.
-		/// </summary>
-		[Display(Name = "Headers", Description = "Show headers name.", Order = 2)]
-		public bool ShowHeaders { get; set; }
-
-		/// <summary>
-		/// Applies the settings from the specified <see cref="DdeSettings"/> instance.
-		/// </summary>
-		/// <param name="clone">The instance containing the new settings.</param>
-		public void Apply(DdeSettings clone)
-		{
-			PersistableHelper.Apply(this, clone);
+			_rowOffset = value;
 		}
+	}
 
-		/// <summary>
-		/// Creates a deep copy of the current <see cref="DdeSettings"/> instance.
-		/// </summary>
-		/// <returns>A new instance that is a deep copy of this instance.</returns>
-		public override DdeSettings Clone()
-		{
-			return PersistableHelper.Clone(this);
-		}
+	/// <summary>
+	/// Gets or sets a value indicating whether header names should be displayed.
+	/// </summary>
+	[Display(Name = "Headers", Description = "Show headers name.", Order = 2)]
+	public bool ShowHeaders { get; set; }
 
-		/// <summary>
-		/// Loads the settings from the provided <see cref="SettingsStorage"/>.
-		/// </summary>
-		/// <param name="storage">The storage from which to load the settings.</param>
-		public void Load(SettingsStorage storage)
-		{
-			Server = storage.GetValue<string>(nameof(Server));
-			Topic = storage.GetValue<string>(nameof(Topic));
-			ColumnOffset = storage.GetValue<int>(nameof(ColumnOffset));
-			RowOffset = storage.GetValue<int>(nameof(RowOffset));
-			ShowHeaders = storage.GetValue<bool>(nameof(ShowHeaders));
-		}
+	/// <summary>
+	/// Applies the settings from the specified <see cref="DdeSettings"/> instance.
+	/// </summary>
+	/// <param name="clone">The instance containing the new settings.</param>
+	public void Apply(DdeSettings clone)
+	{
+		PersistableHelper.Apply(this, clone);
+	}
 
-		/// <summary>
-		/// Saves the current settings to the provided <see cref="SettingsStorage"/>.
-		/// </summary>
-		/// <param name="storage">The storage to which the settings will be saved.</param>
-		public void Save(SettingsStorage storage)
-		{
-			storage
-				.Set(nameof(Server), Server)
-				.Set(nameof(Topic), Topic)
-				.Set(nameof(ColumnOffset), ColumnOffset)
-				.Set(nameof(RowOffset), RowOffset)
-				.Set(nameof(ShowHeaders), ShowHeaders);
-		}
+	/// <summary>
+	/// Creates a deep copy of the current <see cref="DdeSettings"/> instance.
+	/// </summary>
+	/// <returns>A new instance that is a deep copy of this instance.</returns>
+	public override DdeSettings Clone()
+	{
+		return PersistableHelper.Clone(this);
+	}
+
+	/// <summary>
+	/// Loads the settings from the provided <see cref="SettingsStorage"/>.
+	/// </summary>
+	/// <param name="storage">The storage from which to load the settings.</param>
+	public void Load(SettingsStorage storage)
+	{
+		Server = storage.GetValue<string>(nameof(Server));
+		Topic = storage.GetValue<string>(nameof(Topic));
+		ColumnOffset = storage.GetValue<int>(nameof(ColumnOffset));
+		RowOffset = storage.GetValue<int>(nameof(RowOffset));
+		ShowHeaders = storage.GetValue<bool>(nameof(ShowHeaders));
+	}
+
+	/// <summary>
+	/// Saves the current settings to the provided <see cref="SettingsStorage"/>.
+	/// </summary>
+	/// <param name="storage">The storage to which the settings will be saved.</param>
+	public void Save(SettingsStorage storage)
+	{
+		storage
+			.Set(nameof(Server), Server)
+			.Set(nameof(Topic), Topic)
+			.Set(nameof(ColumnOffset), ColumnOffset)
+			.Set(nameof(RowOffset), RowOffset)
+			.Set(nameof(ShowHeaders), ShowHeaders);
 	}
 }
\ No newline at end of file
diff --git a/Interop.Windows/Dde/XlsDdeClient.cs b/Interop.Windows/Dde/XlsDdeClient.cs
index be8efb2a..adc98591 100644
--- a/Interop.Windows/Dde/XlsDdeClient.cs
+++ b/Interop.Windows/Dde/XlsDdeClient.cs
@@ -1,84 +1,83 @@
-namespace Ecng.Interop.Dde
+namespace Ecng.Interop.Dde;
+
+using System;
+using System.Collections.Generic;
+
+using Ecng.Common;
+
+using NDde.Client;
+
+/// <summary>
+/// A client for interacting with Excel via Dynamic Data Exchange (DDE), providing methods to start, stop, and send data.
+/// </summary>
+public class XlsDdeClient(DdeSettings settings) : Disposable
 {
-	using System;
-	using System.Collections.Generic;
+	private DdeClient _client;
 
-	using Ecng.Common;
+	/// <summary>
+	/// Gets a value indicating whether the DDE client is currently started and connected.
+	/// </summary>
+	public bool IsStarted => _client != null;
 
-	using NDde.Client;
+	/// <summary>
+	/// Gets the settings used to configure the DDE client.
+	/// </summary>
+	/// <exception cref="ArgumentNullException">Thrown when the settings provided during construction are null.</exception>
+	public DdeSettings Settings { get; } = settings ?? throw new ArgumentNullException(nameof(settings));
 
 	/// <summary>
-	/// A client for interacting with Excel via Dynamic Data Exchange (DDE), providing methods to start, stop, and send data.
+	/// Starts the DDE client and establishes a connection to the specified server and topic.
 	/// </summary>
-	public class XlsDdeClient(DdeSettings settings) : Disposable
+	public void Start()
 	{
-		private DdeClient _client;
-
-		/// <summary>
-		/// Gets a value indicating whether the DDE client is currently started and connected.
-		/// </summary>
-		public bool IsStarted => _client != null;
-
-		/// <summary>
-		/// Gets the settings used to configure the DDE client.
-		/// </summary>
-		/// <exception cref="ArgumentNullException">Thrown when the settings provided during construction are null.</exception>
-		public DdeSettings Settings { get; } = settings ?? throw new ArgumentNullException(nameof(settings));
-
-		/// <summary>
-		/// Starts the DDE client and establishes a connection to the specified server and topic.
-		/// </summary>
-		public void Start()
-		{
-			_client = new DdeClient(Settings.Server, Settings.Topic);
-			_client.Connect();
-		}
-
-		/// <summary>
-		/// Stops the DDE client and disconnects from the server if currently connected.
-		/// </summary>
-		public void Stop()
-		{
-			if (_client.IsConnected)
-				_client.Disconnect();
-
-			_client = null;
-		}
-
-		/// <summary>
-		/// Sends a block of data to Excel via DDE using the specified row and column offsets.
-		/// </summary>
-		/// <param name="rows">A list of rows, where each row is a list of cell values to send.</param>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="rows"/> is null.</exception>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="rows"/> is empty.</exception>
-		public void Poke(IList<IList<object>> rows)
-		{
-			if (rows is null)
-				throw new ArgumentNullException(nameof(rows));
-
-			if (rows.Count == 0)
-				throw new ArgumentOutOfRangeException(nameof(rows));
-
-			if (!Settings.ShowHeaders)
-				rows.RemoveAt(0);
-
-			var rowStart = 1 + Settings.RowOffset;
-			var columnStart = 1 + Settings.ColumnOffset;
-			var colCount = rows.Count == 0 ? 0 : rows[0].Count;
-
-			_client.Poke($"R{rowStart}C{columnStart}:R{rowStart + rows.Count}C{columnStart + colCount}",
-				XlsDdeSerializer.Serialize(rows), 0x0090 | 0x4000, (int)TimeSpan.FromSeconds(10).TotalMilliseconds);
-		}
-
-		/// <summary>
-		/// Releases managed resources by stopping the DDE client if it is started.
-		/// </summary>
-		protected override void DisposeManaged()
-		{
-			if (IsStarted)
-				Stop();
-
-			base.DisposeManaged();
-		}
+		_client = new DdeClient(Settings.Server, Settings.Topic);
+		_client.Connect();
+	}
+
+	/// <summary>
+	/// Stops the DDE client and disconnects from the server if currently connected.
+	/// </summary>
+	public void Stop()
+	{
+		if (_client.IsConnected)
+			_client.Disconnect();
+
+		_client = null;
+	}
+
+	/// <summary>
+	/// Sends a block of data to Excel via DDE using the specified row and column offsets.
+	/// </summary>
+	/// <param name="rows">A list of rows, where each row is a list of cell values to send.</param>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="rows"/> is null.</exception>
+	/// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="rows"/> is empty.</exception>
+	public void Poke(IList<IList<object>> rows)
+	{
+		if (rows is null)
+			throw new ArgumentNullException(nameof(rows));
+
+		if (rows.Count == 0)
+			throw new ArgumentOutOfRangeException(nameof(rows));
+
+		if (!Settings.ShowHeaders)
+			rows.RemoveAt(0);
+
+		var rowStart = 1 + Settings.RowOffset;
+		var columnStart = 1 + Settings.ColumnOffset;
+		var colCount = rows.Count == 0 ? 0 : rows[0].Count;
+
+		_client.Poke($"R{rowStart}C{columnStart}:R{rowStart + rows.Count}C{columnStart + colCount}",
+			XlsDdeSerializer.Serialize(rows), 0x0090 | 0x4000, (int)TimeSpan.FromSeconds(10).TotalMilliseconds);
+	}
+
+	/// <summary>
+	/// Releases managed resources by stopping the DDE client if it is started.
+	/// </summary>
+	protected override void DisposeManaged()
+	{
+		if (IsStarted)
+			Stop();
+
+		base.DisposeManaged();
 	}
 }
\ No newline at end of file
diff --git a/Interop.Windows/Dde/XlsDdeSerializer.cs b/Interop.Windows/Dde/XlsDdeSerializer.cs
index 26d4032a..a1fb16d0 100644
--- a/Interop.Windows/Dde/XlsDdeSerializer.cs
+++ b/Interop.Windows/Dde/XlsDdeSerializer.cs
@@ -1,182 +1,181 @@
-namespace Ecng.Interop.Dde
-{
-	using System;
-	using System.Collections.Generic;
-	using System.IO;
-	using System.Text;
+namespace Ecng.Interop.Dde;
 
-	using Ecng.Common;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
 
-	/// <summary>
-	/// Provides methods for serializing and deserializing data to and from a format compatible with Excel DDE.
-	/// </summary>
-	static class XlsDdeSerializer
+using Ecng.Common;
+
+/// <summary>
+/// Provides methods for serializing and deserializing data to and from a format compatible with Excel DDE.
+/// </summary>
+static class XlsDdeSerializer
+{
+	private enum DataTypes : short
 	{
-		private enum DataTypes : short
-		{
-			Table = 0x0010,
-			Float = 0x0001,
-			String = 0x0002,
-			Bool = 0x0003,
-			Error = 0x0004,
-			Blank = 0x0005,
-			Int = 0x0006,
-			Skip = 0x0007,
-		}
+		Table = 0x0010,
+		Float = 0x0001,
+		String = 0x0002,
+		Bool = 0x0003,
+		Error = 0x0004,
+		Blank = 0x0005,
+		Int = 0x0006,
+		Skip = 0x0007,
+	}
 
-		private static Type GetCompType(DataTypes type)
+	private static Type GetCompType(DataTypes type)
+	{
+		return type switch
 		{
-			return type switch
-			{
-				DataTypes.Float => typeof(double),
-				DataTypes.String => typeof(string),
-				DataTypes.Bool => typeof(bool),
-				DataTypes.Int => typeof(int),
-				DataTypes.Skip => null,
-				_ => throw new ArgumentOutOfRangeException(nameof(type)),
-			};
-		}
+			DataTypes.Float => typeof(double),
+			DataTypes.String => typeof(string),
+			DataTypes.Bool => typeof(bool),
+			DataTypes.Int => typeof(int),
+			DataTypes.Skip => null,
+			_ => throw new ArgumentOutOfRangeException(nameof(type)),
+		};
+	}
 
-		private static DataTypes GetXlsType(object cell)
-		{
-			if (cell is null)
-				return DataTypes.Blank;
+	private static DataTypes GetXlsType(object cell)
+	{
+		if (cell is null)
+			return DataTypes.Blank;
 
-			if (cell is float || cell is double || cell is decimal)
-				return DataTypes.Float;
+		if (cell is float || cell is double || cell is decimal)
+			return DataTypes.Float;
 
-			if (cell is byte || cell is sbyte || cell is short || cell is int || cell is long || cell is ushort || cell is uint || cell is ulong)
-				return DataTypes.Int;
+		if (cell is byte || cell is sbyte || cell is short || cell is int || cell is long || cell is ushort || cell is uint || cell is ulong)
+			return DataTypes.Int;
 
-			if (cell is string)
-				return DataTypes.String;
+		if (cell is string)
+			return DataTypes.String;
 
-			if (cell is bool)
-				return DataTypes.Bool;
+		if (cell is bool)
+			return DataTypes.Bool;
 
-			throw new ArgumentException($"Unknown cell value type '{cell.GetType()}'.", nameof(cell));
-		}
+		throw new ArgumentException($"Unknown cell value type '{cell.GetType()}'.", nameof(cell));
+	}
 
-		/// <summary>
-		/// Serializes a table of data into a byte array compatible with Excel DDE.
-		/// </summary>
-		/// <param name="rows">A list of rows, where each row is a list of cell values to serialize.</param>
-		/// <returns>A byte array representing the serialized data.</returns>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown when an unsupported cell type is encountered.</exception>
-		public static byte[] Serialize(IList<IList<object>> rows)
-		{
-			var stream = new MemoryStream();
+	/// <summary>
+	/// Serializes a table of data into a byte array compatible with Excel DDE.
+	/// </summary>
+	/// <param name="rows">A list of rows, where each row is a list of cell values to serialize.</param>
+	/// <returns>A byte array representing the serialized data.</returns>
+	/// <exception cref="ArgumentOutOfRangeException">Thrown when an unsupported cell type is encountered.</exception>
+	public static byte[] Serialize(IList<IList<object>> rows)
+	{
+		var stream = new MemoryStream();
 
-			stream.WriteEx(DataTypes.Table);
-			stream.WriteEx((short)4);
-			stream.WriteEx((short)rows.Count);
-			stream.WriteEx((short)(rows.Count == 0 ? 0 : rows[0].Count));
+		stream.WriteEx(DataTypes.Table);
+		stream.WriteEx((short)4);
+		stream.WriteEx((short)rows.Count);
+		stream.WriteEx((short)(rows.Count == 0 ? 0 : rows[0].Count));
 
-			foreach (var row in rows)
+		foreach (var row in rows)
+		{
+			foreach (var cell in row)
 			{
-				foreach (var cell in row)
-				{
-					var cellDt = GetXlsType(cell);
+				var cellDt = GetXlsType(cell);
 
-					switch (cellDt)
-					{
-						case DataTypes.Float:
-							stream.WriteEx((short)8);
-							stream.WriteEx(cell);
-							break;
-						case DataTypes.String:
-							var str = (string)cell;
-							stream.WriteEx((byte)str.Length);
-							stream.WriteRaw(str.Default());
-							break;
-						case DataTypes.Bool:
-							stream.WriteEx((short)2);
-							stream.WriteEx(cell);
-							break;
-						case DataTypes.Blank:
-							stream.WriteEx((short)2);
-							stream.WriteEx(new byte[2]);
-							break;
-						case DataTypes.Int:
-							stream.WriteEx((short)4);
-							stream.WriteEx(cell);
-							break;
-						default:
-							throw new ArgumentOutOfRangeException(cellDt.To<string>());
-					}
+				switch (cellDt)
+				{
+					case DataTypes.Float:
+						stream.WriteEx((short)8);
+						stream.WriteEx(cell);
+						break;
+					case DataTypes.String:
+						var str = (string)cell;
+						stream.WriteEx((byte)str.Length);
+						stream.WriteRaw(str.Default());
+						break;
+					case DataTypes.Bool:
+						stream.WriteEx((short)2);
+						stream.WriteEx(cell);
+						break;
+					case DataTypes.Blank:
+						stream.WriteEx((short)2);
+						stream.WriteEx(new byte[2]);
+						break;
+					case DataTypes.Int:
+						stream.WriteEx((short)4);
+						stream.WriteEx(cell);
+						break;
+					default:
+						throw new ArgumentOutOfRangeException(cellDt.To<string>());
 				}
 			}
-
-			return stream.ToArray();
 		}
 
-		/// <summary>
-		/// Deserializes a byte array from Excel DDE format into a table of data.
-		/// </summary>
-		/// <param name="data">The byte array containing the serialized DDE data.</param>
-		/// <returns>A list of rows, where each row is a list of cell values.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="data"/> is null.</exception>
-		public static IList<IList<object>> Deserialize(byte[] data)
-		{
-			if (data is null)
-				throw new ArgumentNullException(nameof(data));
+		return stream.ToArray();
+	}
 
-			var stream = data.To<Stream>();
+	/// <summary>
+	/// Deserializes a byte array from Excel DDE format into a table of data.
+	/// </summary>
+	/// <param name="data">The byte array containing the serialized DDE data.</param>
+	/// <returns>A list of rows, where each row is a list of cell values.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="data"/> is null.</exception>
+	public static IList<IList<object>> Deserialize(byte[] data)
+	{
+		if (data is null)
+			throw new ArgumentNullException(nameof(data));
 
-			/*var dt = */stream.Read<DataTypes>();
-			/*var size = */stream.Read<short>();
-			var rowCount = stream.Read<short>();
-			var columnCount = stream.Read<short>();
+		var stream = data.To<Stream>();
 
-			var rows = new List<IList<object>>();
+		/*var dt = */stream.Read<DataTypes>();
+		/*var size = */stream.Read<short>();
+		var rowCount = stream.Read<short>();
+		var columnCount = stream.Read<short>();
 
-			for (var row = 0; row < rowCount; row++)
+		var rows = new List<IList<object>>();
+
+		for (var row = 0; row < rowCount; row++)
+		{
+			var cells = new List<object>();
+
+			do
 			{
-				var cells = new List<object>();
+				var cellDt = stream.Read<DataTypes>();
+				var cellSize = stream.Read<short>();
 
-				do
+				if (cellDt != DataTypes.Skip)
 				{
-					var cellDt = stream.Read<DataTypes>();
-					var cellSize = stream.Read<short>();
-
-					if (cellDt != DataTypes.Skip)
-					{
-						var type = GetCompType(cellDt);
-						var typeSize = type == typeof(string) ? cellSize : type.SizeOf();
+					var type = GetCompType(cellDt);
+					var typeSize = type == typeof(string) ? cellSize : type.SizeOf();
 
-						var cellColumnCount = cellSize / typeSize;
+					var cellColumnCount = cellSize / typeSize;
 
-						for (var column = 0; column < cellColumnCount; column++)
+					for (var column = 0; column < cellColumnCount; column++)
+					{
+						if (type == typeof(string))
 						{
-							if (type == typeof(string))
+							var pos = 0;
+							var buffer = stream.ReadBuffer(typeSize);
+							while (pos < buffer.Length)
 							{
-								var pos = 0;
-								var buffer = stream.ReadBuffer(typeSize);
-								while (pos < buffer.Length)
-								{
-									var len = buffer[pos];
-									var str = new byte[len];
-									Buffer.BlockCopy(buffer, pos + 1, str, 0, len);
-									cells.Add(Encoding.Default.GetString(str));
-									pos += len + 1;
-								}
+								var len = buffer[pos];
+								var str = new byte[len];
+								Buffer.BlockCopy(buffer, pos + 1, str, 0, len);
+								cells.Add(Encoding.Default.GetString(str));
+								pos += len + 1;
 							}
-							else
-								cells.Add(stream.Read(type));
 						}
-					}
-					else
-					{
-						stream.ReadBuffer(cellSize);
-						cells.AddRange(new object[cellSize]);
+						else
+							cells.Add(stream.Read(type));
 					}
 				}
-				while (cells.Count < columnCount);
-
-				rows.Add(cells);
+				else
+				{
+					stream.ReadBuffer(cellSize);
+					cells.AddRange(new object[cellSize]);
+				}
 			}
+			while (cells.Count < columnCount);
 
-			return rows;
+			rows.Add(cells);
 		}
+
+		return rows;
 	}
 }
\ No newline at end of file
diff --git a/Interop.Windows/Dde/XlsDdeServer.cs b/Interop.Windows/Dde/XlsDdeServer.cs
index ec7ea855..656b75fc 100644
--- a/Interop.Windows/Dde/XlsDdeServer.cs
+++ b/Interop.Windows/Dde/XlsDdeServer.cs
@@ -1,187 +1,186 @@
-namespace Ecng.Interop.Dde
-{
-	using System;
-	using System.Collections.Generic;
-	using System.Threading;
+namespace Ecng.Interop.Dde;
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
 
-	using Ecng.Collections;
-	using Ecng.Common;
+using Ecng.Collections;
+using Ecng.Common;
 
-	using NDde.Server;
+using NDde.Server;
 
+/// <summary>
+/// Provides a DDE server for Excel that handles poke requests and advises clients of updated data.
+/// </summary>
+[CLSCompliant(false)]
+public class XlsDdeServer(string service, Action<string, IList<IList<object>>> poke, Action<Exception> error) : DdeServer(service)
+{
 	/// <summary>
-	/// Provides a DDE server for Excel that handles poke requests and advises clients of updated data.
+	/// Private helper class that dispatches events on dedicated threads.
 	/// </summary>
-	[CLSCompliant(false)]
-	public class XlsDdeServer(string service, Action<string, IList<IList<object>>> poke, Action<Exception> error) : DdeServer(service)
+	private class EventDispatcher(Action<Exception> errorHandler) : Disposable
 	{
+		private readonly Action<Exception> _errorHandler = errorHandler ?? throw new ArgumentNullException(nameof(errorHandler));
+		private readonly SynchronizedDictionary<string, BlockingQueue<Action>> _events = [];
+
 		/// <summary>
-		/// Private helper class that dispatches events on dedicated threads.
+		/// Adds an event to be executed.
 		/// </summary>
-		private class EventDispatcher(Action<Exception> errorHandler) : Disposable
+		/// <param name="evt">The event action to add.</param>
+		public void Add(Action evt)
 		{
-			private readonly Action<Exception> _errorHandler = errorHandler ?? throw new ArgumentNullException(nameof(errorHandler));
-			private readonly SynchronizedDictionary<string, BlockingQueue<Action>> _events = [];
-
-			/// <summary>
-			/// Adds an event to be executed.
-			/// </summary>
-			/// <param name="evt">The event action to add.</param>
-			public void Add(Action evt)
-			{
-				Add(evt, string.Empty);
-			}
+			Add(evt, string.Empty);
+		}
+
+		/// <summary>
+		/// Adds an event to be executed with a synchronization token.
+		/// </summary>
+		/// <param name="evt">The event action to add.</param>
+		/// <param name="syncToken">The synchronization token to group events.</param>
+		public virtual void Add(Action evt, string syncToken)
+		{
+			if (evt is null)
+				throw new ArgumentNullException(nameof(evt));
+
+			var queue = _events.SafeAdd(syncToken, CreateNewThreadQueuePair);
 
-			/// <summary>
-			/// Adds an event to be executed with a synchronization token.
-			/// </summary>
-			/// <param name="evt">The event action to add.</param>
-			/// <param name="syncToken">The synchronization token to group events.</param>
-			public virtual void Add(Action evt, string syncToken)
+			queue.Enqueue(() =>
 			{
-				if (evt is null)
-					throw new ArgumentNullException(nameof(evt));
+				try
+				{
+					evt();
+				}
+				catch (Exception ex)
+				{
+					_errorHandler(ex);
+				}
+			});
+		}
 
-				var queue = _events.SafeAdd(syncToken, CreateNewThreadQueuePair);
+		private static BlockingQueue<Action> CreateNewThreadQueuePair(string syncToken)
+		{
+			var queue = new BlockingQueue<Action>();
 
-				queue.Enqueue(() =>
+			ThreadingHelper
+				.Thread(() =>
 				{
-					try
+					while (!queue.IsClosed)
 					{
+						if (!queue.TryDequeue(out var evt))
+							break;
+
 						evt();
 					}
-					catch (Exception ex)
-					{
-						_errorHandler(ex);
-					}
-				});
-			}
-
-			private static BlockingQueue<Action> CreateNewThreadQueuePair(string syncToken)
-			{
-				var queue = new BlockingQueue<Action>();
-
-				ThreadingHelper
-					.Thread(() =>
-					{
-						while (!queue.IsClosed)
-						{
-							if (!queue.TryDequeue(out var evt))
-								break;
-
-							evt();
-						}
-					})
-					.Name("EventDispatcher thread #" + syncToken)
-					.Start();
-
-				return queue;
-			}
+				})
+				.Name("EventDispatcher thread #" + syncToken)
+				.Start();
 
-			/// <summary>
-			/// Disposes the managed resources by closing all event queues.
-			/// </summary>
-			protected override void DisposeManaged()
-			{
-				_events.SyncDo(d => d.ForEach(p => p.Value.Close()));
-				base.DisposeManaged();
-			}
+			return queue;
 		}
 
-		private readonly SyncObject _registerWait = new();
-		private Timer _adviseTimer;
-		private readonly EventDispatcher _dispather = new(error);
-		private readonly Action<string, IList<IList<object>>> _poke = poke ?? throw new ArgumentNullException(nameof(poke));
-		private readonly Action<Exception> _error = error ?? throw new ArgumentNullException(nameof(error));
-
 		/// <summary>
-		/// Starts the DDE server and initializes the timer to advise clients.
+		/// Disposes the managed resources by closing all event queues.
 		/// </summary>
-		public void Start()
+		protected override void DisposeManaged()
 		{
-			Exception error = null;
+			_events.SyncDo(d => d.ForEach(p => p.Value.Close()));
+			base.DisposeManaged();
+		}
+	}
 
-			var regLock = new SyncObject();
+	private readonly SyncObject _registerWait = new();
+	private Timer _adviseTimer;
+	private readonly EventDispatcher _dispather = new(error);
+	private readonly Action<string, IList<IList<object>>> _poke = poke ?? throw new ArgumentNullException(nameof(poke));
+	private readonly Action<Exception> _error = error ?? throw new ArgumentNullException(nameof(error));
 
-			lock (regLock)
-			{
-				ThreadingHelper
-					.Thread(() =>
-					{
-						try
-						{
-							Register();
-							regLock.Pulse();
-
-							_registerWait.Wait();
-						}
-						catch (Exception ex)
-						{
-							error = ex;
-							regLock.Pulse();
-						}
-					})
-					.Name("Dde thread")
-					.Launch();
-
-				Monitor.Wait(regLock);
-			}
+	/// <summary>
+	/// Starts the DDE server and initializes the timer to advise clients.
+	/// </summary>
+	public void Start()
+	{
+		Exception error = null;
 
-			if (error != null)
-				throw new InvalidOperationException("������ ������� DDE �������.", error);
+		var regLock = new SyncObject();
 
-			// Create a timer that will be used to advise clients of new data.
-			_adviseTimer = ThreadingHelper.Timer(() =>
-			{
-				try
-				{
-					// Advise all topic name and item name pairs.
-					Advise("*", "*");
-				}
-				catch (Exception ex)
+		lock (regLock)
+		{
+			ThreadingHelper
+				.Thread(() =>
 				{
-					_error(ex);
-				}
-			})
-			.Interval(TimeSpan.FromSeconds(1));
+					try
+					{
+						Register();
+						regLock.Pulse();
+
+						_registerWait.Wait();
+					}
+					catch (Exception ex)
+					{
+						error = ex;
+						regLock.Pulse();
+					}
+				})
+				.Name("Dde thread")
+				.Launch();
+
+			Monitor.Wait(regLock);
 		}
 
-		/// <summary>
-		/// Handles poke requests from DDE conversations.
-		/// </summary>
-		/// <param name="conversation">The DDE conversation instance.</param>
-		/// <param name="item">The item name requested.</param>
-		/// <param name="data">The data payload in byte array format.</param>
-		/// <param name="format">The format of the data received.</param>
-		/// <returns>A result indicating that the poke has been processed.</returns>
-		protected override PokeResult OnPoke(DdeConversation conversation, string item, byte[] data, int format)
+		if (error != null)
+			throw new InvalidOperationException("������ ������� DDE �������.", error);
+
+		// Create a timer that will be used to advise clients of new data.
+		_adviseTimer = ThreadingHelper.Timer(() =>
 		{
-			_dispather.Add(() =>
+			try
 			{
-				var rows = XlsDdeSerializer.Deserialize(data);
-				_poke(conversation.Topic, rows);
-			}, conversation.Topic);
-
-			return PokeResult.Processed;
-		}
+				// Advise all topic name and item name pairs.
+				Advise("*", "*");
+			}
+			catch (Exception ex)
+			{
+				_error(ex);
+			}
+		})
+		.Interval(TimeSpan.FromSeconds(1));
+	}
 
-		/// <summary>
-		/// Releases the unmanaged resources and, optionally, the managed resources.
-		/// </summary>
-		/// <param name="disposing">True to release both managed and unmanaged resources; false to release only unmanaged resources.</param>
-		protected override void Dispose(bool disposing)
+	/// <summary>
+	/// Handles poke requests from DDE conversations.
+	/// </summary>
+	/// <param name="conversation">The DDE conversation instance.</param>
+	/// <param name="item">The item name requested.</param>
+	/// <param name="data">The data payload in byte array format.</param>
+	/// <param name="format">The format of the data received.</param>
+	/// <returns>A result indicating that the poke has been processed.</returns>
+	protected override PokeResult OnPoke(DdeConversation conversation, string item, byte[] data, int format)
+	{
+		_dispather.Add(() =>
 		{
-			_dispather.Dispose();
+			var rows = XlsDdeSerializer.Deserialize(data);
+			_poke(conversation.Topic, rows);
+		}, conversation.Topic);
 
-			if (disposing)
-			{
-				if (!_adviseTimer.IsNull())
-					_adviseTimer.Dispose();
+		return PokeResult.Processed;
+	}
 
-				_registerWait.Pulse();
-			}
+	/// <summary>
+	/// Releases the unmanaged resources and, optionally, the managed resources.
+	/// </summary>
+	/// <param name="disposing">True to release both managed and unmanaged resources; false to release only unmanaged resources.</param>
+	protected override void Dispose(bool disposing)
+	{
+		_dispather.Dispose();
 
-			base.Dispose(disposing);
+		if (disposing)
+		{
+			if (!_adviseTimer.IsNull())
+				_adviseTimer.Dispose();
+
+			_registerWait.Pulse();
 		}
+
+		base.Dispose(disposing);
 	}
 }
\ No newline at end of file
diff --git a/Interop.Windows/WinApi.cs b/Interop.Windows/WinApi.cs
index 51de6c30..d0350988 100644
--- a/Interop.Windows/WinApi.cs
+++ b/Interop.Windows/WinApi.cs
@@ -1,54 +1,53 @@
-namespace Ecng.Interop
+namespace Ecng.Interop;
+
+using System;
+using System.Windows.Forms;
+
+using Microsoft.Win32;
+
+/// <summary>
+/// Provides Windows API utility methods.
+/// </summary>
+[CLSCompliant(false)]
+public static class WinApi
 {
-	using System;
-	using System.Windows.Forms;
+	/// <summary>
+	/// Retrieves the screen boundaries (left, top, width, height) for the screen that contains the specified window handle.
+	/// </summary>
+	/// <param name="hwnd">The handle of the window.</param>
+	/// <param name="left">Output parameter that returns the left coordinate of the screen.</param>
+	/// <param name="top">Output parameter that returns the top coordinate of the screen.</param>
+	/// <param name="width">Output parameter that returns the width of the screen.</param>
+	/// <param name="height">Output parameter that returns the height of the screen.</param>
+	public static void GetScreenParams(IntPtr hwnd, out int left, out int top, out int width, out int height)
+	{
+		var activeScreen = Screen.FromHandle(hwnd);
+		var bounds = activeScreen.Bounds;
+
+		left = bounds.Left;
+		top = bounds.Top;
+		width = bounds.Width;
+		height = bounds.Height;
+	}
 
-	using Microsoft.Win32;
+	private const string _path = @"SOFTWARE\Microsoft\Windows\CurrentVersion\Run";
+
+	private static RegistryKey BaseKey => Registry.CurrentUser;
 
 	/// <summary>
-	/// Provides Windows API utility methods.
+	/// Updates the auto-run registry entry for a given application.
 	/// </summary>
-	[CLSCompliant(false)]
-	public static class WinApi
+	/// <param name="appName">The name of the application.</param>
+	/// <param name="path">The full path to the application executable.</param>
+	/// <param name="enabled">True to enable auto-run; false to disable it.</param>
+	/// <exception cref="InvalidOperationException">Thrown when the autorun registry key cannot be found.</exception>
+	public static void UpdateAutoRun(string appName, string path, bool enabled)
 	{
-		/// <summary>
-		/// Retrieves the screen boundaries (left, top, width, height) for the screen that contains the specified window handle.
-		/// </summary>
-		/// <param name="hwnd">The handle of the window.</param>
-		/// <param name="left">Output parameter that returns the left coordinate of the screen.</param>
-		/// <param name="top">Output parameter that returns the top coordinate of the screen.</param>
-		/// <param name="width">Output parameter that returns the width of the screen.</param>
-		/// <param name="height">Output parameter that returns the height of the screen.</param>
-		public static void GetScreenParams(IntPtr hwnd, out int left, out int top, out int width, out int height)
-		{
-			var activeScreen = Screen.FromHandle(hwnd);
-			var bounds = activeScreen.Bounds;
-
-			left = bounds.Left;
-			top = bounds.Top;
-			width = bounds.Width;
-			height = bounds.Height;
-		}
-
-		private const string _path = @"SOFTWARE\Microsoft\Windows\CurrentVersion\Run";
-
-		private static RegistryKey BaseKey => Registry.CurrentUser;
-
-		/// <summary>
-		/// Updates the auto-run registry entry for a given application.
-		/// </summary>
-		/// <param name="appName">The name of the application.</param>
-		/// <param name="path">The full path to the application executable.</param>
-		/// <param name="enabled">True to enable auto-run; false to disable it.</param>
-		/// <exception cref="InvalidOperationException">Thrown when the autorun registry key cannot be found.</exception>
-		public static void UpdateAutoRun(string appName, string path, bool enabled)
-		{
-			using var key = BaseKey.OpenSubKey(_path, true) ?? throw new InvalidOperationException($"autorun not found ({_path})");
-
-			if (enabled)
-				key.SetValue(appName, path);
-			else
-				key.DeleteValue(appName, false);
-		}
+		using var key = BaseKey.OpenSubKey(_path, true) ?? throw new InvalidOperationException($"autorun not found ({_path})");
+
+		if (enabled)
+			key.SetValue(appName, path);
+		else
+			key.DeleteValue(appName, false);
 	}
 }
\ No newline at end of file
diff --git a/Interop.Windows/WindowsThreadingHelper.cs b/Interop.Windows/WindowsThreadingHelper.cs
index a42600cf..075697d1 100644
--- a/Interop.Windows/WindowsThreadingHelper.cs
+++ b/Interop.Windows/WindowsThreadingHelper.cs
@@ -1,100 +1,99 @@
-namespace Ecng.Interop
-{
-	using System;
-	using System.Threading;
+namespace Ecng.Interop;
+
+using System;
+using System.Threading;
 
-	using Ecng.Common;
+using Ecng.Common;
 
+/// <summary>
+/// Provides helper methods to run code on threads with specific apartment states.
+/// </summary>
+public static class WindowsThreadingHelper
+{
 	/// <summary>
-	/// Provides helper methods to run code on threads with specific apartment states.
+	/// Sets the apartment state of the specified thread to single-threaded apartment (STA).
 	/// </summary>
-	public static class WindowsThreadingHelper
+	/// <param name="thread">The thread to set the apartment state for.</param>
+	/// <returns>The same thread with the updated apartment state.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when the thread is null.</exception>
+	public static Thread STA(this Thread thread)
 	{
-		/// <summary>
-		/// Sets the apartment state of the specified thread to single-threaded apartment (STA).
-		/// </summary>
-		/// <param name="thread">The thread to set the apartment state for.</param>
-		/// <returns>The same thread with the updated apartment state.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when the thread is null.</exception>
-		public static Thread STA(this Thread thread)
-		{
-			if (thread is null)
-				throw new ArgumentNullException(nameof(thread));
+		if (thread is null)
+			throw new ArgumentNullException(nameof(thread));
 
-			thread.SetApartmentState(ApartmentState.STA);
-			return thread;
-		}
+		thread.SetApartmentState(ApartmentState.STA);
+		return thread;
+	}
 
-		/// <summary>
-		/// Sets the apartment state of the specified thread to multi-threaded apartment (MTA).
-		/// </summary>
-		/// <param name="thread">The thread to set the apartment state for.</param>
-		/// <returns>The same thread with the updated apartment state.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when the thread is null.</exception>
-		public static Thread MTA(this Thread thread)
-		{
-			if (thread is null)
-				throw new ArgumentNullException(nameof(thread));
+	/// <summary>
+	/// Sets the apartment state of the specified thread to multi-threaded apartment (MTA).
+	/// </summary>
+	/// <param name="thread">The thread to set the apartment state for.</param>
+	/// <returns>The same thread with the updated apartment state.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when the thread is null.</exception>
+	public static Thread MTA(this Thread thread)
+	{
+		if (thread is null)
+			throw new ArgumentNullException(nameof(thread));
 
-			thread.SetApartmentState(ApartmentState.MTA);
-			return thread;
-		}
+		thread.SetApartmentState(ApartmentState.MTA);
+		return thread;
+	}
 
-		/// <summary>
-		/// Invokes the specified action on a new STA (single-threaded apartment) thread.
-		/// </summary>
-		/// <param name="action">The action to invoke.</param>
-		/// <exception cref="ArgumentNullException">Thrown when the action is null.</exception>
-		public static void InvokeAsSTA(this Action action)
-		{
-			if (action is null)
-				throw new ArgumentNullException(nameof(action));
+	/// <summary>
+	/// Invokes the specified action on a new STA (single-threaded apartment) thread.
+	/// </summary>
+	/// <param name="action">The action to invoke.</param>
+	/// <exception cref="ArgumentNullException">Thrown when the action is null.</exception>
+	public static void InvokeAsSTA(this Action action)
+	{
+		if (action is null)
+			throw new ArgumentNullException(nameof(action));
 
-			InvokeAsSTA<object>(() =>
-			{
-				action();
-				return null;
-			});
-		}
+		InvokeAsSTA<object>(() =>
+		{
+			action();
+			return null;
+		});
+	}
 
-		// http://stackoverflow.com/questions/518701/clipboard-gettext-returns-null-empty-string
+	// http://stackoverflow.com/questions/518701/clipboard-gettext-returns-null-empty-string
 
-		/// <summary>
-		/// Invokes the specified function on a new STA (single-threaded apartment) thread and returns a result.
-		/// </summary>
-		/// <typeparam name="T">The type of the return value.</typeparam>
-		/// <param name="func">The function to invoke.</param>
-		/// <returns>The result returned by the function.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when the function is null.</exception>
-		/// <exception cref="Exception">Throws any exception that occurs during the function execution.</exception>
-		public static T InvokeAsSTA<T>(this Func<T> func)
-		{
-			if (func is null)
-				throw new ArgumentNullException(nameof(func));
+	/// <summary>
+	/// Invokes the specified function on a new STA (single-threaded apartment) thread and returns a result.
+	/// </summary>
+	/// <typeparam name="T">The type of the return value.</typeparam>
+	/// <param name="func">The function to invoke.</param>
+	/// <returns>The result returned by the function.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when the function is null.</exception>
+	/// <exception cref="Exception">Throws any exception that occurs during the function execution.</exception>
+	public static T InvokeAsSTA<T>(this Func<T> func)
+	{
+		if (func is null)
+			throw new ArgumentNullException(nameof(func));
 
-			T retVal = default;
-			Exception threadEx = null;
+		T retVal = default;
+		Exception threadEx = null;
 
-			var staThread = ThreadingHelper.Thread(() =>
+		var staThread = ThreadingHelper.Thread(() =>
+		{
+			try
+			{
+				retVal = func();
+			}
+			catch (Exception ex)
 			{
-				try
-				{
-					retVal = func();
-				}
-				catch (Exception ex)
-				{
-					threadEx = ex;
-				}
-			})
-			.STA()
-			.Launch();
+				threadEx = ex;
+			}
+		})
+		.STA()
+		.Launch();
 
-			staThread.Join();
+		staThread.Join();
 
-			if (threadEx != null)
-				throw threadEx;
+		if (threadEx != null)
+			throw threadEx;
 
-			return retVal;
-		}
+		return retVal;
 	}
 }
\ No newline at end of file
diff --git a/Interop/BlittableDecimal.cs b/Interop/BlittableDecimal.cs
index 745aa0ea..0c9072c0 100644
--- a/Interop/BlittableDecimal.cs
+++ b/Interop/BlittableDecimal.cs
@@ -1,61 +1,60 @@
-namespace Ecng.Interop
-{
-	using System.Runtime.InteropServices;
+namespace Ecng.Interop;
+
+using System.Runtime.InteropServices;
 
-	using Ecng.Common;
+using Ecng.Common;
+
+/// <summary>
+/// Represents a blittable version of a decimal value.
+/// </summary>
+[StructLayout(LayoutKind.Sequential)]
+public struct BlittableDecimal
+{
+	private int _bit0;
+	private int _bit1;
+	private int _bit2;
+	private int _bit3;
 
 	/// <summary>
-	/// Represents a blittable version of a decimal value.
+	/// Gets or sets the decimal value.
 	/// </summary>
-	[StructLayout(LayoutKind.Sequential)]
-	public struct BlittableDecimal
+	public decimal Value
 	{
-		private int _bit0;
-		private int _bit1;
-		private int _bit2;
-		private int _bit3;
-
-		/// <summary>
-		/// Gets or sets the decimal value.
-		/// </summary>
-		public decimal Value
+		get => new[] { _bit0, _bit1, _bit2, _bit3 }.To<decimal>();
+		set
 		{
-			get => new[] { _bit0, _bit1, _bit2, _bit3 }.To<decimal>();
-			set
-			{
-				var bits = value.To<int[]>();
-
-				_bit0 = bits[0];
-				_bit1 = bits[1];
-				_bit2 = bits[2];
-				_bit3 = bits[3];
-			}
-		}
+			var bits = value.To<int[]>();
 
-		/// <summary>
-		/// Converts a decimal value to a <see cref="BlittableDecimal"/>.
-		/// </summary>
-		/// <param name="value">The decimal value to convert.</param>
-		/// <returns>A <see cref="BlittableDecimal"/> representing the decimal value.</returns>
-		public static explicit operator BlittableDecimal(decimal value)
-		{
-			return new BlittableDecimal { Value = value };
+			_bit0 = bits[0];
+			_bit1 = bits[1];
+			_bit2 = bits[2];
+			_bit3 = bits[3];
 		}
+	}
 
-		/// <summary>
-		/// Converts a <see cref="BlittableDecimal"/> to a decimal value.
-		/// </summary>
-		/// <param name="value">The <see cref="BlittableDecimal"/> to convert.</param>
-		/// <returns>A decimal value.</returns>
-		public static implicit operator decimal(BlittableDecimal value)
-		{
-			return value.Value;
-		}
+	/// <summary>
+	/// Converts a decimal value to a <see cref="BlittableDecimal"/>.
+	/// </summary>
+	/// <param name="value">The decimal value to convert.</param>
+	/// <returns>A <see cref="BlittableDecimal"/> representing the decimal value.</returns>
+	public static explicit operator BlittableDecimal(decimal value)
+	{
+		return new BlittableDecimal { Value = value };
+	}
 
-		/// <summary>
-		/// Returns a string that represents the decimal value.
-		/// </summary>
-		/// <returns>A string representation of the decimal value.</returns>
-		public override string ToString() => Value.ToString();
+	/// <summary>
+	/// Converts a <see cref="BlittableDecimal"/> to a decimal value.
+	/// </summary>
+	/// <param name="value">The <see cref="BlittableDecimal"/> to convert.</param>
+	/// <returns>A decimal value.</returns>
+	public static implicit operator decimal(BlittableDecimal value)
+	{
+		return value.Value;
 	}
+
+	/// <summary>
+	/// Returns a string that represents the decimal value.
+	/// </summary>
+	/// <returns>A string representation of the decimal value.</returns>
+	public override string ToString() => Value.ToString();
 }
\ No newline at end of file
diff --git a/Interop/DllLibrary.cs b/Interop/DllLibrary.cs
index 57cfdc93..e78273d9 100644
--- a/Interop/DllLibrary.cs
+++ b/Interop/DllLibrary.cs
@@ -1,62 +1,61 @@
-namespace Ecng.Interop
+namespace Ecng.Interop;
+
+using System;
+using System.Diagnostics;
+
+using Ecng.Common;
+
+/// <summary>
+/// Represents a base class that manages a DLL library and provides access to its exported functions.
+/// </summary>
+/// <param name="dllPath">The file path to the DLL.</param>
+public abstract class DllLibrary(string dllPath) : Disposable
 {
-	using System;
-	using System.Diagnostics;
+	/// <summary>
+	/// Gets the file path to the DLL.
+	/// </summary>
+	public string DllPath { get; private set; } = dllPath.ThrowIfEmpty(nameof(dllPath));
+
+	private Version _dllVersion;
+
+	/// <summary>
+	/// Gets the version of the DLL by retrieving product information.
+	/// </summary>
+	public Version DllVersion => _dllVersion ??=
+		FileVersionInfo.GetVersionInfo(DllPath).ProductVersion?
+			.Replace(',', '.')
+			?.RemoveSpaces()
+			?.To<Version>();
 
-	using Ecng.Common;
+	/// <summary>
+	/// Gets the pointer to the loaded DLL.
+	/// </summary>
+	protected IntPtr Handler { get; } = Marshaler.LoadLibrary(dllPath);
+
+	/// <summary>
+	/// Retrieves a function pointer from the DLL and casts it to the specified delegate type.
+	/// </summary>
+	/// <typeparam name="T">The type of the delegate.</typeparam>
+	/// <param name="procName">The name of the procedure to retrieve.</param>
+	/// <returns>A delegate of type <typeparamref name="T"/>.</returns>
+	protected T GetHandler<T>(string procName) => Handler.GetHandler<T>(procName);
+
+	/// <summary>
+	/// Attempts to retrieve a function pointer from the DLL as the specified delegate type. Returns null if not found.
+	/// </summary>
+	/// <typeparam name="T">The type of the delegate.</typeparam>
+	/// <param name="procName">The name of the procedure to retrieve.</param>
+	/// <returns>A delegate of type <typeparamref name="T"/>, or null if the procedure is not found.</returns>
+	protected T TryGetHandler<T>(string procName)
+		where T : Delegate
+		=> Handler.TryGetHandler<T>(procName);
 
 	/// <summary>
-	/// Represents a base class that manages a DLL library and provides access to its exported functions.
+	/// Disposes native resources associated with the DLL.
 	/// </summary>
-	/// <param name="dllPath">The file path to the DLL.</param>
-	public abstract class DllLibrary(string dllPath) : Disposable
+	protected override void DisposeNative()
 	{
-		/// <summary>
-		/// Gets the file path to the DLL.
-		/// </summary>
-		public string DllPath { get; private set; } = dllPath.ThrowIfEmpty(nameof(dllPath));
-
-		private Version _dllVersion;
-
-		/// <summary>
-		/// Gets the version of the DLL by retrieving product information.
-		/// </summary>
-		public Version DllVersion => _dllVersion ??=
-			FileVersionInfo.GetVersionInfo(DllPath).ProductVersion?
-				.Replace(',', '.')
-				?.RemoveSpaces()
-				?.To<Version>();
-
-		/// <summary>
-		/// Gets the pointer to the loaded DLL.
-		/// </summary>
-		protected IntPtr Handler { get; } = Marshaler.LoadLibrary(dllPath);
-
-		/// <summary>
-		/// Retrieves a function pointer from the DLL and casts it to the specified delegate type.
-		/// </summary>
-		/// <typeparam name="T">The type of the delegate.</typeparam>
-		/// <param name="procName">The name of the procedure to retrieve.</param>
-		/// <returns>A delegate of type <typeparamref name="T"/>.</returns>
-		protected T GetHandler<T>(string procName) => Handler.GetHandler<T>(procName);
-
-		/// <summary>
-		/// Attempts to retrieve a function pointer from the DLL as the specified delegate type. Returns null if not found.
-		/// </summary>
-		/// <typeparam name="T">The type of the delegate.</typeparam>
-		/// <param name="procName">The name of the procedure to retrieve.</param>
-		/// <returns>A delegate of type <typeparamref name="T"/>, or null if the procedure is not found.</returns>
-		protected T TryGetHandler<T>(string procName)
-			where T : Delegate
-			=> Handler.TryGetHandler<T>(procName);
-
-		/// <summary>
-		/// Disposes native resources associated with the DLL.
-		/// </summary>
-		protected override void DisposeNative()
-		{
-			Handler.FreeLibrary();
-			base.DisposeNative();
-		}
+		Handler.FreeLibrary();
+		base.DisposeNative();
 	}
 }
\ No newline at end of file
diff --git a/Interop/GCHandle.cs b/Interop/GCHandle.cs
index 5672d840..d6df7192 100644
--- a/Interop/GCHandle.cs
+++ b/Interop/GCHandle.cs
@@ -1,70 +1,69 @@
-namespace Ecng.Interop
-{
-	using System;
-	using System.Runtime.InteropServices;
+namespace Ecng.Interop;
+
+using System;
+using System.Runtime.InteropServices;
+
+using Ecng.Common;
 
-	using Ecng.Common;
+/// <summary>
+/// Generic version of structure <see cref="T:System.Runtime.InteropServices.GCHandle"/>.
+/// </summary>
+/// <typeparam name="T"></typeparam>
+/// <remarks>
+/// Initializes a new instance of the <see cref="GCHandle{T}"/> class.
+/// </remarks>
+public class GCHandle<T>(GCHandle handle) : Wrapper<GCHandle>(handle)
+{
+	private readonly int? _size;
 
 	/// <summary>
-	/// Generic version of structure <see cref="T:System.Runtime.InteropServices.GCHandle"/>.
-	/// </summary>
-	/// <typeparam name="T"></typeparam>
-	/// <remarks>
 	/// Initializes a new instance of the <see cref="GCHandle{T}"/> class.
-	/// </remarks>
-	public class GCHandle<T>(GCHandle handle) : Wrapper<GCHandle>(handle)
+	/// </summary>
+	/// <param name="value">The native value.</param>
+	/// <param name="type">One of the <see cref="GCHandleType"/> values, indicating the type of <see cref="GCHandle"/> to create.</param>
+	public GCHandle(byte[] value, GCHandleType type = GCHandleType.Pinned)
+		: this(value.To<T>(), type, value.Length)
 	{
-		private readonly int? _size;
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="GCHandle{T}"/> class.
-		/// </summary>
-		/// <param name="value">The native value.</param>
-		/// <param name="type">One of the <see cref="GCHandleType"/> values, indicating the type of <see cref="GCHandle"/> to create.</param>
-		public GCHandle(byte[] value, GCHandleType type = GCHandleType.Pinned)
-			: this(value.To<T>(), type, value.Length)
-		{
-		}
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="GCHandle{T}"/> class.
-		/// </summary>
-		/// <param name="value">The native value.</param>
-		/// <param name="type">One of the <see cref="GCHandleType"/> values, indicating the type of <see cref="GCHandle"/> to create.</param>
-		/// <param name="size">Size of the <paramref name="value"/>.</param>
-		public GCHandle(T value, GCHandleType type, int? size)
-			: this(GCHandle.Alloc(value, type))
-		{
-			if (size < 0)
-				throw new ArgumentOutOfRangeException(nameof(size));
+	/// <summary>
+	/// Initializes a new instance of the <see cref="GCHandle{T}"/> class.
+	/// </summary>
+	/// <param name="value">The native value.</param>
+	/// <param name="type">One of the <see cref="GCHandleType"/> values, indicating the type of <see cref="GCHandle"/> to create.</param>
+	/// <param name="size">Size of the <paramref name="value"/>.</param>
+	public GCHandle(T value, GCHandleType type, int? size)
+		: this(GCHandle.Alloc(value, type))
+	{
+		if (size < 0)
+			throw new ArgumentOutOfRangeException(nameof(size));
 
-			_size = size;
-		}
+		_size = size;
+	}
 
-		/// <summary>
-		/// Create safe pointer.
-		/// </summary>
-		/// <returns><see cref="SafePointer"/></returns>
-		public SafePointer CreatePointer() => new(Value.AddrOfPinnedObject(), _size);
+	/// <summary>
+	/// Create safe pointer.
+	/// </summary>
+	/// <returns><see cref="SafePointer"/></returns>
+	public SafePointer CreatePointer() => new(Value.AddrOfPinnedObject(), _size);
 
-		/// <summary>
-		/// Disposes the native values.
-		/// </summary>
-		protected override void DisposeNative()
-		{
-			Value.Free();
-			base.DisposeNative();
-		}
+	/// <summary>
+	/// Disposes the native values.
+	/// </summary>
+	protected override void DisposeNative()
+	{
+		Value.Free();
+		base.DisposeNative();
+	}
 
-		/// <summary>
-		/// Creates a new object that is a copy of the current instance.
-		/// </summary>
-		/// <returns>
-		/// A new object that is a copy of this instance.
-		/// </returns>
-		public override Wrapper<GCHandle> Clone()
-		{
-			throw new NotSupportedException();
-		}
+	/// <summary>
+	/// Creates a new object that is a copy of the current instance.
+	/// </summary>
+	/// <returns>
+	/// A new object that is a copy of this instance.
+	/// </returns>
+	public override Wrapper<GCHandle> Clone()
+	{
+		throw new NotSupportedException();
 	}
 }
\ No newline at end of file
diff --git a/Interop/HGlobalSafeHandle.cs b/Interop/HGlobalSafeHandle.cs
index cdca5915..cfe6ec6e 100644
--- a/Interop/HGlobalSafeHandle.cs
+++ b/Interop/HGlobalSafeHandle.cs
@@ -1,32 +1,31 @@
-namespace Ecng.Interop
-{
-	using System;
+namespace Ecng.Interop;
+
+using System;
 
-	using Microsoft.Win32.SafeHandles;
+using Microsoft.Win32.SafeHandles;
 
+/// <summary>
+/// Represents a safe handle for unmanaged memory allocated with HGlobal.
+/// </summary>
+public class HGlobalSafeHandle : SafeHandleZeroOrMinusOneIsInvalid
+{
 	/// <summary>
-	/// Represents a safe handle for unmanaged memory allocated with HGlobal.
+	/// Initializes a new instance of the <see cref="HGlobalSafeHandle"/> class with the specified pointer.
 	/// </summary>
-	public class HGlobalSafeHandle : SafeHandleZeroOrMinusOneIsInvalid
+	/// <param name="ptr">An <see cref="IntPtr"/> that represents the allocated unmanaged memory.</param>
+	public HGlobalSafeHandle(IntPtr ptr)
+		: base(true)
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="HGlobalSafeHandle"/> class with the specified pointer.
-		/// </summary>
-		/// <param name="ptr">An <see cref="IntPtr"/> that represents the allocated unmanaged memory.</param>
-		public HGlobalSafeHandle(IntPtr ptr)
-			: base(true)
-		{
-			SetHandle(ptr);
-		}
+		SetHandle(ptr);
+	}
 
-		/// <summary>
-		/// Releases the unmanaged memory by freeing the HGlobal allocation.
-		/// </summary>
-		/// <returns>true if the handle is released successfully; otherwise, false.</returns>
-		protected override bool ReleaseHandle()
-		{
-			DangerousGetHandle().FreeHGlobal();
-			return true;
-		}
+	/// <summary>
+	/// Releases the unmanaged memory by freeing the HGlobal allocation.
+	/// </summary>
+	/// <returns>true if the handle is released successfully; otherwise, false.</returns>
+	protected override bool ReleaseHandle()
+	{
+		DangerousGetHandle().FreeHGlobal();
+		return true;
 	}
 }
diff --git a/Interop/HardwareInfo.cs b/Interop/HardwareInfo.cs
index a37acb41..da818959 100644
--- a/Interop/HardwareInfo.cs
+++ b/Interop/HardwareInfo.cs
@@ -1,132 +1,131 @@
-namespace Ecng.Interop
-{
-	using System;
-	using System.Linq;
-	using System.Collections.Generic;
-	using System.Net.NetworkInformation;
-	using System.Text.RegularExpressions;
-	using System.Threading;
-	using System.Threading.Tasks;
+namespace Ecng.Interop;
+
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.Net.NetworkInformation;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
 
-	using Ecng.Common;
+using Ecng.Common;
 
-	using Nito.AsyncEx;
+using Nito.AsyncEx;
 
-	using WmiLight;
+using WmiLight;
 
+/// <summary>
+/// Provides methods to generate a hardware-based identifier.
+/// </summary>
+public static class HardwareInfo
+{
 	/// <summary>
-	/// Provides methods to generate a hardware-based identifier.
+	/// Gets the hardware identifier.
 	/// </summary>
-	public static class HardwareInfo
+	/// <returns>A string representing the hardware identifier.</returns>
+	public static string GetId()
+		=> AsyncContext.Run(() => GetIdAsync());
+
+	/// <summary>
+	/// Asynchronously gets the hardware identifier.
+	/// </summary>
+	/// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
+	/// <returns>A task that represents the asynchronous operation. The task result contains a string representing the hardware identifier.</returns>
+	public static async Task<string> GetIdAsync(CancellationToken cancellationToken = default)
+	{
+		string id;
+
+		if (OperatingSystemEx.IsWindows())
+			id = await GetIdWindows(cancellationToken);
+		else
+			id = await GetIdLinuxAsync(cancellationToken);
+
+		if (id.IsEmpty())
+			throw new InvalidOperationException("Cannot generate HDDID.");
+
+		return id;
+	}
+
+	private static async Task<string> GetWMIIdAsync(string table, string field, CancellationToken cancellationToken)
+	{
+		using var con = new WmiConnection();
+		var query = con.CreateQuery($"Select * From {table}");
+		var list = await Task.Run(() => query.ToArray(), cancellationToken);
+		return list.Select(o => (string)o[field]).FirstOrDefault(f => !f.IsEmptyOrWhiteSpace());
+	}
+
+	private static async Task<string> GetIdWindows(CancellationToken cancellationToken)
+	{
+		var cpuid = await GetWMIIdAsync("Win32_processor", "ProcessorID", cancellationToken);
+		var mbId = await GetWMIIdAsync("Win32_BaseBoard", "SerialNumber", cancellationToken);
+
+		if (
+			mbId.EqualsIgnoreCase("none") ||
+			mbId.EqualsIgnoreCase("n/a") ||
+			mbId.EqualsIgnoreCase("invalid") ||
+			mbId.EqualsIgnoreCase("To be filled by O.E.M.") ||
+			mbId.EqualsIgnoreCase("Not Applicable")
+		)
+			mbId = null;
+
+		var netId = await GetWMIIdAsync("Win32_NetworkAdapter", "MACAddress", cancellationToken);
+
+		if (mbId.IsEmpty() && netId.IsEmpty())
+			throw new InvalidOperationException("MotherBoard and Network are both is empty.");
+
+		return cpuid + (mbId.IsEmpty() ? netId : mbId);
+	}
+
+	private static async Task<string> GetIdLinuxAsync(CancellationToken cancellationToken)
+	{
+		var macs = GetLinuxMacs();
+		var volId = await GetLinuxVolumeIdAsync(cancellationToken);
+
+		return macs.Join(string.Empty) + volId;
+	}
+
+	private static List<string> GetLinuxMacs()
 	{
-		/// <summary>
-		/// Gets the hardware identifier.
-		/// </summary>
-		/// <returns>A string representing the hardware identifier.</returns>
-		public static string GetId()
-			=> AsyncContext.Run(() => GetIdAsync());
-
-		/// <summary>
-		/// Asynchronously gets the hardware identifier.
-		/// </summary>
-		/// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
-		/// <returns>A task that represents the asynchronous operation. The task result contains a string representing the hardware identifier.</returns>
-		public static async Task<string> GetIdAsync(CancellationToken cancellationToken = default)
-		{
-			string id;
-
-			if (OperatingSystemEx.IsWindows())
-				id = await GetIdWindows(cancellationToken);
-			else
-				id = await GetIdLinuxAsync(cancellationToken);
-
-			if (id.IsEmpty())
-				throw new InvalidOperationException("Cannot generate HDDID.");
-
-			return id;
-		}
-
-		private static async Task<string> GetWMIIdAsync(string table, string field, CancellationToken cancellationToken)
-		{
-			using var con = new WmiConnection();
-			var query = con.CreateQuery($"Select * From {table}");
-			var list = await Task.Run(() => query.ToArray(), cancellationToken);
-			return list.Select(o => (string)o[field]).FirstOrDefault(f => !f.IsEmptyOrWhiteSpace());
-		}
-
-		private static async Task<string> GetIdWindows(CancellationToken cancellationToken)
-		{
-			var cpuid = await GetWMIIdAsync("Win32_processor", "ProcessorID", cancellationToken);
-			var mbId = await GetWMIIdAsync("Win32_BaseBoard", "SerialNumber", cancellationToken);
-
-			if (
-				mbId.EqualsIgnoreCase("none") ||
-				mbId.EqualsIgnoreCase("n/a") ||
-				mbId.EqualsIgnoreCase("invalid") ||
-				mbId.EqualsIgnoreCase("To be filled by O.E.M.") ||
-				mbId.EqualsIgnoreCase("Not Applicable")
-			)
-				mbId = null;
-
-			var netId = await GetWMIIdAsync("Win32_NetworkAdapter", "MACAddress", cancellationToken);
-
-			if (mbId.IsEmpty() && netId.IsEmpty())
-				throw new InvalidOperationException("MotherBoard and Network are both is empty.");
-
-			return cpuid + (mbId.IsEmpty() ? netId : mbId);
-		}
-
-		private static async Task<string> GetIdLinuxAsync(CancellationToken cancellationToken)
-		{
-			var macs = GetLinuxMacs();
-			var volId = await GetLinuxVolumeIdAsync(cancellationToken);
-
-			return macs.Join(string.Empty) + volId;
-		}
-
-		private static List<string> GetLinuxMacs()
-		{
-			var result = new HashSet<string>();
-			var ifaces = NetworkInterface
-				.GetAllNetworkInterfaces()
-				.Where(i => i.NetworkInterfaceType != NetworkInterfaceType.Loopback &&
-							i.NetworkInterfaceType != NetworkInterfaceType.Tunnel &&
-							i.OperationalStatus == OperationalStatus.Up);
-
-			foreach (var iface in ifaces)
-				result.Add(iface.GetPhysicalAddress().ToString().ToLowerInvariant());
-
-			var list = result
-				.OrderBy(s => s)
-				.Where(s => s != "ffffffffffff" && s != "000000000000")
-				.ToList();
-
-			return list;
-		}
-
-		private static readonly Regex _lsblkRegex = new(@"^\s*/\s+([\da-f-]+)\s*$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
-
-		private static async Task<string> GetLinuxVolumeIdAsync(CancellationToken cancellationToken)
-		{
-			var errors = new List<string>();
-			var result = new List<string>();
-
-			var res = await IOHelper.ExecuteAsync("lsblk", "-r -o MOUNTPOINT,UUID", str =>
-				{
-					var m = _lsblkRegex.Match(str);
-					if (m.Success)
-						result.Add(m.Groups[1].Value);
-				},
-				errStr => errors.Add(errStr),
-				info => info.EnvironmentVariables["PATH"] = "/bin:/sbin:/usr/bin:/usr/sbin", cancellationToken: cancellationToken);
-
-			if (res != 0 || errors.Any())
-				throw new InvalidOperationException($"Unable to execute lsblk. Return code {res}.\n{errors.JoinNL()}");
-
-			//if (result.Count != 1)
-			//	throw new InvalidOperationException($"invalid lsblk result. got {result.Count} values: {result.JoinComma()}");
-
-			return result.FirstOrDefault()?.Remove("-").ToLowerInvariant();
-		}
+		var result = new HashSet<string>();
+		var ifaces = NetworkInterface
+			.GetAllNetworkInterfaces()
+			.Where(i => i.NetworkInterfaceType != NetworkInterfaceType.Loopback &&
+						i.NetworkInterfaceType != NetworkInterfaceType.Tunnel &&
+						i.OperationalStatus == OperationalStatus.Up);
+
+		foreach (var iface in ifaces)
+			result.Add(iface.GetPhysicalAddress().ToString().ToLowerInvariant());
+
+		var list = result
+			.OrderBy(s => s)
+			.Where(s => s != "ffffffffffff" && s != "000000000000")
+			.ToList();
+
+		return list;
+	}
+
+	private static readonly Regex _lsblkRegex = new(@"^\s*/\s+([\da-f-]+)\s*$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+
+	private static async Task<string> GetLinuxVolumeIdAsync(CancellationToken cancellationToken)
+	{
+		var errors = new List<string>();
+		var result = new List<string>();
+
+		var res = await IOHelper.ExecuteAsync("lsblk", "-r -o MOUNTPOINT,UUID", str =>
+			{
+				var m = _lsblkRegex.Match(str);
+				if (m.Success)
+					result.Add(m.Groups[1].Value);
+			},
+			errStr => errors.Add(errStr),
+			info => info.EnvironmentVariables["PATH"] = "/bin:/sbin:/usr/bin:/usr/sbin", cancellationToken: cancellationToken);
+
+		if (res != 0 || errors.Any())
+			throw new InvalidOperationException($"Unable to execute lsblk. Return code {res}.\n{errors.JoinNL()}");
+
+		//if (result.Count != 1)
+		//	throw new InvalidOperationException($"invalid lsblk result. got {result.Count} values: {result.JoinComma()}");
+
+		return result.FirstOrDefault()?.Remove("-").ToLowerInvariant();
 	}
 }
\ No newline at end of file
diff --git a/Interop/IExcelWorker.cs b/Interop/IExcelWorker.cs
index 6f88a5cf..d3fb1545 100644
--- a/Interop/IExcelWorker.cs
+++ b/Interop/IExcelWorker.cs
@@ -1,119 +1,118 @@
-namespace Ecng.Interop
-{
-	using System;
-	using System.IO;
+namespace Ecng.Interop;
+
+using System;
+using System.IO;
 
-	using Ecng.Common;
+using Ecng.Common;
 
+/// <summary>
+/// Defines a contract for working with Excel files, providing methods to manipulate cells, styles, sheets, and formatting.
+/// </summary>
+public interface IExcelWorker : IDisposable
+{
 	/// <summary>
-	/// Defines a contract for working with Excel files, providing methods to manipulate cells, styles, sheets, and formatting.
+	/// Sets the value of a cell at the specified column and row.
 	/// </summary>
-	public interface IExcelWorker : IDisposable
-	{
-		/// <summary>
-		/// Sets the value of a cell at the specified column and row.
-		/// </summary>
-		/// <typeparam name="T">The type of the value to set.</typeparam>
-		/// <param name="col">The column index (1-based).</param>
-		/// <param name="row">The row index (1-based).</param>
-		/// <param name="value">The value to set in the cell.</param>
-		/// <returns>The current <see cref="IExcelWorker"/> instance for method chaining.</returns>
-		IExcelWorker SetCell<T>(int col, int row, T value);
+	/// <typeparam name="T">The type of the value to set.</typeparam>
+	/// <param name="col">The column index (1-based).</param>
+	/// <param name="row">The row index (1-based).</param>
+	/// <param name="value">The value to set in the cell.</param>
+	/// <returns>The current <see cref="IExcelWorker"/> instance for method chaining.</returns>
+	IExcelWorker SetCell<T>(int col, int row, T value);
 
-		/// <summary>
-		/// Gets the value of a cell at the specified column and row.
-		/// </summary>
-		/// <typeparam name="T">The type of the value to retrieve.</typeparam>
-		/// <param name="col">The column index (1-based).</param>
-		/// <param name="row">The row index (1-based).</param>
-		/// <returns>The value of the cell cast to type <typeparamref name="T"/>.</returns>
-		T GetCell<T>(int col, int row);
+	/// <summary>
+	/// Gets the value of a cell at the specified column and row.
+	/// </summary>
+	/// <typeparam name="T">The type of the value to retrieve.</typeparam>
+	/// <param name="col">The column index (1-based).</param>
+	/// <param name="row">The row index (1-based).</param>
+	/// <returns>The value of the cell cast to type <typeparamref name="T"/>.</returns>
+	T GetCell<T>(int col, int row);
 
-		/// <summary>
-		/// Sets the style of a column based on a specified type.
-		/// </summary>
-		/// <param name="col">The column index (1-based).</param>
-		/// <param name="type">The <see cref="Type"/> that determines the style.</param>
-		/// <returns>The current <see cref="IExcelWorker"/> instance for method chaining.</returns>
-		IExcelWorker SetStyle(int col, Type type);
+	/// <summary>
+	/// Sets the style of a column based on a specified type.
+	/// </summary>
+	/// <param name="col">The column index (1-based).</param>
+	/// <param name="type">The <see cref="Type"/> that determines the style.</param>
+	/// <returns>The current <see cref="IExcelWorker"/> instance for method chaining.</returns>
+	IExcelWorker SetStyle(int col, Type type);
 
-		/// <summary>
-		/// Sets the style of a column using a custom format string.
-		/// </summary>
-		/// <param name="col">The column index (1-based).</param>
-		/// <param name="format">The format string to apply to the column.</param>
-		/// <returns>The current <see cref="IExcelWorker"/> instance for method chaining.</returns>
-		IExcelWorker SetStyle(int col, string format);
+	/// <summary>
+	/// Sets the style of a column using a custom format string.
+	/// </summary>
+	/// <param name="col">The column index (1-based).</param>
+	/// <param name="format">The format string to apply to the column.</param>
+	/// <returns>The current <see cref="IExcelWorker"/> instance for method chaining.</returns>
+	IExcelWorker SetStyle(int col, string format);
 
-		/// <summary>
-		/// Sets conditional formatting for a column based on a condition.
-		/// </summary>
-		/// <param name="col">The column index (1-based).</param>
-		/// <param name="op">The <see cref="ComparisonOperator"/> to use for the condition.</param>
-		/// <param name="condition">The condition value as a string.</param>
-		/// <param name="bgColor">The background color to apply if the condition is met (e.g., hex code or name).</param>
-		/// <param name="fgColor">The foreground (text) color to apply if the condition is met (e.g., hex code or name).</param>
-		/// <returns>The current <see cref="IExcelWorker"/> instance for method chaining.</returns>
-		IExcelWorker SetConditionalFormatting(int col, ComparisonOperator op, string condition, string bgColor, string fgColor);
+	/// <summary>
+	/// Sets conditional formatting for a column based on a condition.
+	/// </summary>
+	/// <param name="col">The column index (1-based).</param>
+	/// <param name="op">The <see cref="ComparisonOperator"/> to use for the condition.</param>
+	/// <param name="condition">The condition value as a string.</param>
+	/// <param name="bgColor">The background color to apply if the condition is met (e.g., hex code or name).</param>
+	/// <param name="fgColor">The foreground (text) color to apply if the condition is met (e.g., hex code or name).</param>
+	/// <returns>The current <see cref="IExcelWorker"/> instance for method chaining.</returns>
+	IExcelWorker SetConditionalFormatting(int col, ComparisonOperator op, string condition, string bgColor, string fgColor);
 
-		/// <summary>
-		/// Renames the current sheet to the specified name.
-		/// </summary>
-		/// <param name="name">The new name for the sheet.</param>
-		/// <returns>The current <see cref="IExcelWorker"/> instance for method chaining.</returns>
-		IExcelWorker RenameSheet(string name);
+	/// <summary>
+	/// Renames the current sheet to the specified name.
+	/// </summary>
+	/// <param name="name">The new name for the sheet.</param>
+	/// <returns>The current <see cref="IExcelWorker"/> instance for method chaining.</returns>
+	IExcelWorker RenameSheet(string name);
 
-		/// <summary>
-		/// Adds a new sheet to the workbook.
-		/// </summary>
-		/// <returns>The current <see cref="IExcelWorker"/> instance for method chaining.</returns>
-		IExcelWorker AddSheet();
+	/// <summary>
+	/// Adds a new sheet to the workbook.
+	/// </summary>
+	/// <returns>The current <see cref="IExcelWorker"/> instance for method chaining.</returns>
+	IExcelWorker AddSheet();
 
-		/// <summary>
-		/// Checks if a sheet with the specified name exists in the workbook.
-		/// </summary>
-		/// <param name="name">The name of the sheet to check.</param>
-		/// <returns><c>true</c> if the sheet exists; otherwise, <c>false</c>.</returns>
-		bool ContainsSheet(string name);
+	/// <summary>
+	/// Checks if a sheet with the specified name exists in the workbook.
+	/// </summary>
+	/// <param name="name">The name of the sheet to check.</param>
+	/// <returns><c>true</c> if the sheet exists; otherwise, <c>false</c>.</returns>
+	bool ContainsSheet(string name);
 
-		/// <summary>
-		/// Switches the active sheet to the one with the specified name.
-		/// </summary>
-		/// <param name="name">The name of the sheet to switch to.</param>
-		/// <returns>The current <see cref="IExcelWorker"/> instance for method chaining.</returns>
-		IExcelWorker SwitchSheet(string name);
+	/// <summary>
+	/// Switches the active sheet to the one with the specified name.
+	/// </summary>
+	/// <param name="name">The name of the sheet to switch to.</param>
+	/// <returns>The current <see cref="IExcelWorker"/> instance for method chaining.</returns>
+	IExcelWorker SwitchSheet(string name);
 
-		/// <summary>
-		/// Gets the total number of columns in the current sheet.
-		/// </summary>
-		/// <returns>The number of columns.</returns>
-		int GetColumnsCount();
+	/// <summary>
+	/// Gets the total number of columns in the current sheet.
+	/// </summary>
+	/// <returns>The number of columns.</returns>
+	int GetColumnsCount();
 
-		/// <summary>
-		/// Gets the total number of rows in the current sheet.
-		/// </summary>
-		/// <returns>The number of rows.</returns>
-		int GetRowsCount();
-	}
+	/// <summary>
+	/// Gets the total number of rows in the current sheet.
+	/// </summary>
+	/// <returns>The number of rows.</returns>
+	int GetRowsCount();
+}
 
+/// <summary>
+/// Defines a contract for creating and opening Excel worker instances from streams.
+/// </summary>
+public interface IExcelWorkerProvider
+{
 	/// <summary>
-	/// Defines a contract for creating and opening Excel worker instances from streams.
+	/// Creates a new Excel workbook and returns an <see cref="IExcelWorker"/> instance to interact with it.
 	/// </summary>
-	public interface IExcelWorkerProvider
-	{
-		/// <summary>
-		/// Creates a new Excel workbook and returns an <see cref="IExcelWorker"/> instance to interact with it.
-		/// </summary>
-		/// <param name="stream">The stream to write the new workbook to.</param>
-		/// <param name="readOnly">If <c>true</c>, the workbook is opened in read-only mode; otherwise, it is writable.</param>
-		/// <returns>An <see cref="IExcelWorker"/> instance for the new workbook.</returns>
-		IExcelWorker CreateNew(Stream stream, bool readOnly = false);
+	/// <param name="stream">The stream to write the new workbook to.</param>
+	/// <param name="readOnly">If <c>true</c>, the workbook is opened in read-only mode; otherwise, it is writable.</param>
+	/// <returns>An <see cref="IExcelWorker"/> instance for the new workbook.</returns>
+	IExcelWorker CreateNew(Stream stream, bool readOnly = false);
 
-		/// <summary>
-		/// Opens an existing Excel workbook from a stream and returns an <see cref="IExcelWorker"/> instance to interact with it.
-		/// </summary>
-		/// <param name="stream">The stream containing the existing workbook data.</param>
-		/// <returns>An <see cref="IExcelWorker"/> instance for the opened workbook.</returns>
-		IExcelWorker OpenExist(Stream stream);
-	}
+	/// <summary>
+	/// Opens an existing Excel workbook from a stream and returns an <see cref="IExcelWorker"/> instance to interact with it.
+	/// </summary>
+	/// <param name="stream">The stream containing the existing workbook data.</param>
+	/// <returns>An <see cref="IExcelWorker"/> instance for the opened workbook.</returns>
+	IExcelWorker OpenExist(Stream stream);
 }
\ No newline at end of file
diff --git a/Interop/Marshaler.cs b/Interop/Marshaler.cs
index a7f61017..28eb4987 100644
--- a/Interop/Marshaler.cs
+++ b/Interop/Marshaler.cs
@@ -1,468 +1,467 @@
-namespace Ecng.Interop
-{
-	using System;
-	using System.ComponentModel;
-	using System.Text;
-	using System.Runtime.InteropServices;
+namespace Ecng.Interop;
+
+using System;
+using System.ComponentModel;
+using System.Text;
+using System.Runtime.InteropServices;
 
-	using Ecng.Common;
+using Ecng.Common;
 
 #if NETCOREAPP
-	using CoreNativeLib = System.Runtime.InteropServices.NativeLibrary;
+using CoreNativeLib = System.Runtime.InteropServices.NativeLibrary;
 #endif
 
+/// <summary>
+/// Provides a collection of extended methods that manipulate and extend the functionality of the <see cref="Marshal"/> class for interoperating with unmanaged memory and libraries.
+/// </summary>
+public static class Marshaler
+{
 	/// <summary>
-	/// Provides a collection of extended methods that manipulate and extend the functionality of the <see cref="Marshal"/> class for interoperating with unmanaged memory and libraries.
+	/// Marshals data from an unmanaged block of memory to a newly allocated managed object of the specified type.
 	/// </summary>
-	public static class Marshaler
+	/// <typeparam name="T">The type of the structure to marshal. Must be a value type.</typeparam>
+	/// <param name="ptr">The pointer to the unmanaged block of memory.</param>
+	/// <returns>A managed object of type <typeparamref name="T"/> containing the data from the unmanaged memory.</returns>
+	public static T ToStruct<T>(this IntPtr ptr)
+		where T : struct
 	{
-		/// <summary>
-		/// Marshals data from an unmanaged block of memory to a newly allocated managed object of the specified type.
-		/// </summary>
-		/// <typeparam name="T">The type of the structure to marshal. Must be a value type.</typeparam>
-		/// <param name="ptr">The pointer to the unmanaged block of memory.</param>
-		/// <returns>A managed object of type <typeparamref name="T"/> containing the data from the unmanaged memory.</returns>
-		public static T ToStruct<T>(this IntPtr ptr)
-			where T : struct
-		{
-			return (T)Marshal.PtrToStructure(ptr, typeof(T));
-		}
+		return (T)Marshal.PtrToStructure(ptr, typeof(T));
+	}
 
-		/// <summary>
-		/// Marshals data from a managed object to an unmanaged block of memory and returns the pointer.
-		/// </summary>
-		/// <typeparam name="T">The type of the structure to marshal. Must be a value type.</typeparam>
-		/// <param name="structure">The managed object to marshal.</param>
-		/// <param name="size">The optional size of the unmanaged memory block. If null, the size of <typeparamref name="T"/> is used.</param>
-		/// <returns>A pointer to the allocated unmanaged memory containing the marshaled data.</returns>
-		public static IntPtr StructToPtr<T>(this T structure, int? size = default)
-			where T : struct
-			=> structure.StructToPtrEx(size).ptr;
-
-		/// <summary>
-		/// Marshals data from a managed object to an unmanaged block of memory and returns the pointer along with the size.
-		/// </summary>
-		/// <typeparam name="T">The type of the structure to marshal. Must be a value type.</typeparam>
-		/// <param name="structure">The managed object to marshal.</param>
-		/// <param name="size">The optional size of the unmanaged memory block. If null, the size of <typeparamref name="T"/> is used.</param>
-		/// <returns>A tuple containing the pointer to the unmanaged memory and its size in bytes.</returns>
-		public static (IntPtr ptr, int size) StructToPtrEx<T>(this T structure, int? size = default)
-			where T : struct
-		{
-			size ??= typeof(T).SizeOf();
-			var ptr = Marshal.AllocHGlobal(size.Value);
-			Marshal.StructureToPtr(structure, ptr, false);
-			return (ptr, size.Value);
-		}
+	/// <summary>
+	/// Marshals data from a managed object to an unmanaged block of memory and returns the pointer.
+	/// </summary>
+	/// <typeparam name="T">The type of the structure to marshal. Must be a value type.</typeparam>
+	/// <param name="structure">The managed object to marshal.</param>
+	/// <param name="size">The optional size of the unmanaged memory block. If null, the size of <typeparamref name="T"/> is used.</param>
+	/// <returns>A pointer to the allocated unmanaged memory containing the marshaled data.</returns>
+	public static IntPtr StructToPtr<T>(this T structure, int? size = default)
+		where T : struct
+		=> structure.StructToPtrEx(size).ptr;
 
-		/// <summary>
-		/// Writes a value to the specified unmanaged memory location.
-		/// </summary>
-		/// <typeparam name="T">The type of the value to write. Must be a supported primitive type (e.g., byte, short, int, long, IntPtr).</typeparam>
-		/// <param name="ptr">The address in unmanaged memory to write to.</param>
-		/// <param name="value">The value to write.</param>
-		/// <exception cref="ArgumentException">Thrown when <typeparamref name="T"/> is not a supported type.</exception>
-		public static void Write<T>(this IntPtr ptr, T value)
-			where T : struct
-		{
-			if (typeof(T) == typeof(byte) || typeof(T) == typeof(sbyte))
-				Marshal.WriteByte(ptr, value.To<byte>());
-			else if (typeof(T) == typeof(short) || typeof(T) == typeof(ushort))
-				Marshal.WriteInt16(ptr, value.To<short>());
-			else if (typeof(T) == typeof(int) || typeof(T) == typeof(uint))
-				Marshal.WriteInt32(ptr, value.To<int>());
-			else if (typeof(T) == typeof(long) || typeof(T) == typeof(ulong))
-				Marshal.WriteInt64(ptr, value.To<long>());
-			else if (typeof(T) == typeof(IntPtr) || typeof(T) == typeof(UIntPtr))
-				Marshal.WriteIntPtr(ptr, value.To<IntPtr>());
-			else
-				throw new ArgumentException(typeof(T).Name, nameof(value));
-		}
+	/// <summary>
+	/// Marshals data from a managed object to an unmanaged block of memory and returns the pointer along with the size.
+	/// </summary>
+	/// <typeparam name="T">The type of the structure to marshal. Must be a value type.</typeparam>
+	/// <param name="structure">The managed object to marshal.</param>
+	/// <param name="size">The optional size of the unmanaged memory block. If null, the size of <typeparamref name="T"/> is used.</param>
+	/// <returns>A tuple containing the pointer to the unmanaged memory and its size in bytes.</returns>
+	public static (IntPtr ptr, int size) StructToPtrEx<T>(this T structure, int? size = default)
+		where T : struct
+	{
+		size ??= typeof(T).SizeOf();
+		var ptr = Marshal.AllocHGlobal(size.Value);
+		Marshal.StructureToPtr(structure, ptr, false);
+		return (ptr, size.Value);
+	}
 
-		/// <summary>
-		/// Reads a value from the specified unmanaged memory location.
-		/// </summary>
-		/// <typeparam name="T">The type of the value to read. Must be a supported primitive type (e.g., byte, short, int, long, IntPtr).</typeparam>
-		/// <param name="ptr">The address in unmanaged memory to read from.</param>
-		/// <returns>The value read from the unmanaged memory, cast to type <typeparamref name="T"/>.</returns>
-		/// <exception cref="ArgumentException">Thrown when <typeparamref name="T"/> is not a supported type.</exception>
-		public static T Read<T>(this IntPtr ptr)
-			where T : struct
-		{
-			object retVal;
-
-			if (typeof(T) == typeof(byte) || typeof(T) == typeof(sbyte))
-				retVal = Marshal.ReadByte(ptr);
-			else if (typeof(T) == typeof(short) || typeof(T) == typeof(ushort))
-				retVal = Marshal.ReadInt16(ptr);
-			else if (typeof(T) == typeof(int) || typeof(T) == typeof(uint))
-				retVal = Marshal.ReadInt32(ptr);
-			else if (typeof(T) == typeof(long) || typeof(T) == typeof(ulong))
-				retVal = Marshal.ReadInt64(ptr);
-			else if (typeof(T) == typeof(IntPtr) || typeof(T) == typeof(UIntPtr))
-				retVal = Marshal.ReadIntPtr(ptr);
-			else
-				throw new ArgumentException(typeof(T).Name, nameof(ptr));
-
-			return retVal.To<T>();
-		}
+	/// <summary>
+	/// Writes a value to the specified unmanaged memory location.
+	/// </summary>
+	/// <typeparam name="T">The type of the value to write. Must be a supported primitive type (e.g., byte, short, int, long, IntPtr).</typeparam>
+	/// <param name="ptr">The address in unmanaged memory to write to.</param>
+	/// <param name="value">The value to write.</param>
+	/// <exception cref="ArgumentException">Thrown when <typeparamref name="T"/> is not a supported type.</exception>
+	public static void Write<T>(this IntPtr ptr, T value)
+		where T : struct
+	{
+		if (typeof(T) == typeof(byte) || typeof(T) == typeof(sbyte))
+			Marshal.WriteByte(ptr, value.To<byte>());
+		else if (typeof(T) == typeof(short) || typeof(T) == typeof(ushort))
+			Marshal.WriteInt16(ptr, value.To<short>());
+		else if (typeof(T) == typeof(int) || typeof(T) == typeof(uint))
+			Marshal.WriteInt32(ptr, value.To<int>());
+		else if (typeof(T) == typeof(long) || typeof(T) == typeof(ulong))
+			Marshal.WriteInt64(ptr, value.To<long>());
+		else if (typeof(T) == typeof(IntPtr) || typeof(T) == typeof(UIntPtr))
+			Marshal.WriteIntPtr(ptr, value.To<IntPtr>());
+		else
+			throw new ArgumentException(typeof(T).Name, nameof(value));
+	}
 
-		/// <summary>
-		/// Converts an unmanaged function pointer to a delegate of the specified type.
-		/// </summary>
-		/// <typeparam name="T">The type of the delegate to create.</typeparam>
-		/// <param name="ptr">The unmanaged function pointer to convert.</param>
-		/// <returns>A delegate of type <typeparamref name="T"/> that wraps the unmanaged function.</returns>
-		public static T GetDelegateForFunctionPointer<T>(this IntPtr ptr)
-		{
-			return Marshal.GetDelegateForFunctionPointer(ptr, typeof(T)).To<T>();
-		}
+	/// <summary>
+	/// Reads a value from the specified unmanaged memory location.
+	/// </summary>
+	/// <typeparam name="T">The type of the value to read. Must be a supported primitive type (e.g., byte, short, int, long, IntPtr).</typeparam>
+	/// <param name="ptr">The address in unmanaged memory to read from.</param>
+	/// <returns>The value read from the unmanaged memory, cast to type <typeparamref name="T"/>.</returns>
+	/// <exception cref="ArgumentException">Thrown when <typeparamref name="T"/> is not a supported type.</exception>
+	public static T Read<T>(this IntPtr ptr)
+		where T : struct
+	{
+		object retVal;
+
+		if (typeof(T) == typeof(byte) || typeof(T) == typeof(sbyte))
+			retVal = Marshal.ReadByte(ptr);
+		else if (typeof(T) == typeof(short) || typeof(T) == typeof(ushort))
+			retVal = Marshal.ReadInt16(ptr);
+		else if (typeof(T) == typeof(int) || typeof(T) == typeof(uint))
+			retVal = Marshal.ReadInt32(ptr);
+		else if (typeof(T) == typeof(long) || typeof(T) == typeof(ulong))
+			retVal = Marshal.ReadInt64(ptr);
+		else if (typeof(T) == typeof(IntPtr) || typeof(T) == typeof(UIntPtr))
+			retVal = Marshal.ReadIntPtr(ptr);
+		else
+			throw new ArgumentException(typeof(T).Name, nameof(ptr));
+
+		return retVal.To<T>();
+	}
 
-		/// <summary>
-		/// Converts an unmanaged ANSI string pointer to a managed string.
-		/// </summary>
-		/// <param name="ptr">The pointer to the ANSI string in unmanaged memory.</param>
-		/// <returns>The managed string representation of the ANSI string.</returns>
-		public static string ToAnsi(this IntPtr ptr) => Marshal.PtrToStringAnsi(ptr);
-
-		/// <summary>
-		/// Converts an unmanaged ANSI string pointer to a managed string with a specified length.
-		/// </summary>
-		/// <param name="ptr">The pointer to the ANSI string in unmanaged memory.</param>
-		/// <param name="len">The length of the string to read.</param>
-		/// <returns>The managed string representation of the ANSI string.</returns>
-		public static string ToAnsi(this IntPtr ptr, int len) => Marshal.PtrToStringAnsi(ptr, len);
-
-		/// <summary>
-		/// Converts a managed string to an unmanaged ANSI string and returns a pointer to it.
-		/// </summary>
-		/// <param name="str">The managed string to convert.</param>
-		/// <returns>A pointer to the unmanaged ANSI string.</returns>
-		public static IntPtr FromAnsi(this string str) => Marshal.StringToHGlobalAnsi(str);
-
-		/// <summary>
-		/// Converts an unmanaged string pointer (platform-dependent encoding) to a managed string.
-		/// </summary>
-		/// <param name="ptr">The pointer to the string in unmanaged memory.</param>
-		/// <returns>The managed string representation.</returns>
-		public static string ToAuto(this IntPtr ptr) => Marshal.PtrToStringAuto(ptr);
-
-		/// <summary>
-		/// Converts an unmanaged string pointer (platform-dependent encoding) to a managed string with a specified length.
-		/// </summary>
-		/// <param name="ptr">The pointer to the string in unmanaged memory.</param>
-		/// <param name="len">The length of the string to read.</param>
-		/// <returns>The managed string representation.</returns>
-		public static string ToAuto(this IntPtr ptr, int len) => Marshal.PtrToStringAuto(ptr, len);
-
-		/// <summary>
-		/// Converts a managed string to an unmanaged string (platform-dependent encoding) and returns a pointer to it.
-		/// </summary>
-		/// <param name="str">The managed string to convert.</param>
-		/// <returns>A pointer to the unmanaged string.</returns>
-		public static IntPtr FromAuto(this string str) => Marshal.StringToHGlobalAuto(str);
-
-		/// <summary>
-		/// Converts an unmanaged BSTR pointer to a managed string.
-		/// </summary>
-		/// <param name="ptr">The pointer to the BSTR in unmanaged memory.</param>
-		/// <returns>The managed string representation of the BSTR.</returns>
-		public static string ToBSTR(this IntPtr ptr) => Marshal.PtrToStringBSTR(ptr);
-
-		/// <summary>
-		/// Converts a managed string to an unmanaged BSTR and returns a pointer to it.
-		/// </summary>
-		/// <param name="str">The managed string to convert.</param>
-		/// <returns>A pointer to the unmanaged BSTR.</returns>
-		public static IntPtr FromBSTR(this string str) => Marshal.StringToBSTR(str);
-
-		/// <summary>
-		/// Converts an unmanaged Unicode string pointer to a managed string.
-		/// </summary>
-		/// <param name="ptr">The pointer to the Unicode string in unmanaged memory.</param>
-		/// <returns>The managed string representation of the Unicode string.</returns>
-		public static string ToUnicode(this IntPtr ptr) => Marshal.PtrToStringUni(ptr);
-
-		/// <summary>
-		/// Converts an unmanaged Unicode string pointer to a managed string with a specified length.
-		/// </summary>
-		/// <param name="ptr">The pointer to the Unicode string in unmanaged memory.</param>
-		/// <param name="len">The length of the string to read.</param>
-		/// <returns>The managed string representation of the Unicode string.</returns>
-		public static string ToUnicode(this IntPtr ptr, int len) => Marshal.PtrToStringUni(ptr, len);
-
-		/// <summary>
-		/// Converts a managed string to an unmanaged Unicode string and returns a pointer to it.
-		/// </summary>
-		/// <param name="str">The managed string to convert.</param>
-		/// <returns>A pointer to the unmanaged Unicode string.</returns>
-		public static IntPtr FromUnicode(this string str) => Marshal.StringToHGlobalUni(str);
-
-		/// <summary>
-		/// Allocates unmanaged memory of the specified size and wraps it in a safe handle.
-		/// </summary>
-		/// <param name="ptr">The size of the memory to allocate, interpreted as an integer.</param>
-		/// <returns>A <see cref="HGlobalSafeHandle"/> wrapping the allocated unmanaged memory.</returns>
-		public static HGlobalSafeHandle ToHGlobal(this int ptr)
-		{
-			return ((IntPtr)ptr).ToHGlobal();
-		}
+	/// <summary>
+	/// Converts an unmanaged function pointer to a delegate of the specified type.
+	/// </summary>
+	/// <typeparam name="T">The type of the delegate to create.</typeparam>
+	/// <param name="ptr">The unmanaged function pointer to convert.</param>
+	/// <returns>A delegate of type <typeparamref name="T"/> that wraps the unmanaged function.</returns>
+	public static T GetDelegateForFunctionPointer<T>(this IntPtr ptr)
+	{
+		return Marshal.GetDelegateForFunctionPointer(ptr, typeof(T)).To<T>();
+	}
 
-		/// <summary>
-		/// Allocates unmanaged memory of the specified size and wraps it in a safe handle.
-		/// </summary>
-		/// <param name="ptr">The size of the memory to allocate, as an <see cref="IntPtr"/>.</param>
-		/// <returns>A <see cref="HGlobalSafeHandle"/> wrapping the allocated unmanaged memory.</returns>
-		public static HGlobalSafeHandle ToHGlobal(this IntPtr ptr)
-		{
-			return new HGlobalSafeHandle(Marshal.AllocHGlobal(ptr));
-		}
+	/// <summary>
+	/// Converts an unmanaged ANSI string pointer to a managed string.
+	/// </summary>
+	/// <param name="ptr">The pointer to the ANSI string in unmanaged memory.</param>
+	/// <returns>The managed string representation of the ANSI string.</returns>
+	public static string ToAnsi(this IntPtr ptr) => Marshal.PtrToStringAnsi(ptr);
 
-		/// <summary>
-		/// Encodes a string using the specified encoding, allocates unmanaged memory for it, and returns a safe handle.
-		/// </summary>
-		/// <param name="encoding">The encoding to use for the string.</param>
-		/// <param name="data">The string to encode and allocate.</param>
-		/// <returns>A <see cref="HGlobalSafeHandle"/> wrapping the allocated unmanaged memory containing the encoded string.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="encoding"/> is null.</exception>
-		public static HGlobalSafeHandle ToHGlobal(this Encoding encoding, string data)
-		{
-			if (encoding is null)
-				throw new ArgumentNullException(nameof(encoding));
+	/// <summary>
+	/// Converts an unmanaged ANSI string pointer to a managed string with a specified length.
+	/// </summary>
+	/// <param name="ptr">The pointer to the ANSI string in unmanaged memory.</param>
+	/// <param name="len">The length of the string to read.</param>
+	/// <returns>The managed string representation of the ANSI string.</returns>
+	public static string ToAnsi(this IntPtr ptr, int len) => Marshal.PtrToStringAnsi(ptr, len);
 
-			var dataEncoded = encoding.GetBytes(data);
-			var size = typeof(byte).SizeOf() * dataEncoded.Length;
-			var pData = size.ToHGlobal();
+	/// <summary>
+	/// Converts a managed string to an unmanaged ANSI string and returns a pointer to it.
+	/// </summary>
+	/// <param name="str">The managed string to convert.</param>
+	/// <returns>A pointer to the unmanaged ANSI string.</returns>
+	public static IntPtr FromAnsi(this string str) => Marshal.StringToHGlobalAnsi(str);
 
-			Marshal.Copy(dataEncoded, 0, pData.DangerousGetHandle(), dataEncoded.Length);
+	/// <summary>
+	/// Converts an unmanaged string pointer (platform-dependent encoding) to a managed string.
+	/// </summary>
+	/// <param name="ptr">The pointer to the string in unmanaged memory.</param>
+	/// <returns>The managed string representation.</returns>
+	public static string ToAuto(this IntPtr ptr) => Marshal.PtrToStringAuto(ptr);
 
-			return pData;
-		}
+	/// <summary>
+	/// Converts an unmanaged string pointer (platform-dependent encoding) to a managed string with a specified length.
+	/// </summary>
+	/// <param name="ptr">The pointer to the string in unmanaged memory.</param>
+	/// <param name="len">The length of the string to read.</param>
+	/// <returns>The managed string representation.</returns>
+	public static string ToAuto(this IntPtr ptr, int len) => Marshal.PtrToStringAuto(ptr, len);
 
-		/// <summary>
-		/// Decodes an unmanaged ANSI string from a pointer into a managed string using the specified encoding.
-		/// </summary>
-		/// <param name="encoding">The encoding to use for decoding the string.</param>
-		/// <param name="pData">The pointer to the ANSI string in unmanaged memory.</param>
-		/// <returns>The decoded managed string.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="encoding"/> is null.</exception>
-		public static string ToString(this Encoding encoding, IntPtr pData)
-		{
-			if (encoding is null)
-				throw new ArgumentNullException(nameof(encoding));
+	/// <summary>
+	/// Converts a managed string to an unmanaged string (platform-dependent encoding) and returns a pointer to it.
+	/// </summary>
+	/// <param name="str">The managed string to convert.</param>
+	/// <returns>A pointer to the unmanaged string.</returns>
+	public static IntPtr FromAuto(this string str) => Marshal.StringToHGlobalAuto(str);
 
-			var errStr = pData.ToAnsi();
-			var length = errStr.Length;
+	/// <summary>
+	/// Converts an unmanaged BSTR pointer to a managed string.
+	/// </summary>
+	/// <param name="ptr">The pointer to the BSTR in unmanaged memory.</param>
+	/// <returns>The managed string representation of the BSTR.</returns>
+	public static string ToBSTR(this IntPtr ptr) => Marshal.PtrToStringBSTR(ptr);
 
-			var data = new byte[length];
-			Marshal.Copy(pData, data, 0, length);
+	/// <summary>
+	/// Converts a managed string to an unmanaged BSTR and returns a pointer to it.
+	/// </summary>
+	/// <param name="str">The managed string to convert.</param>
+	/// <returns>A pointer to the unmanaged BSTR.</returns>
+	public static IntPtr FromBSTR(this string str) => Marshal.StringToBSTR(str);
 
-			return encoding.GetString(data);
-		}
+	/// <summary>
+	/// Converts an unmanaged Unicode string pointer to a managed string.
+	/// </summary>
+	/// <param name="ptr">The pointer to the Unicode string in unmanaged memory.</param>
+	/// <returns>The managed string representation of the Unicode string.</returns>
+	public static string ToUnicode(this IntPtr ptr) => Marshal.PtrToStringUni(ptr);
 
-		/// <summary>
-		/// Retrieves a delegate for a named procedure from an unmanaged library.
-		/// </summary>
-		/// <typeparam name="T">The type of the delegate to retrieve.</typeparam>
-		/// <param name="library">The handle to the loaded unmanaged library.</param>
-		/// <param name="procName">The name of the procedure to retrieve.</param>
-		/// <returns>A delegate of type <typeparamref name="T"/> for the specified procedure.</returns>
-		/// <exception cref="ArgumentException">Thrown when the procedure cannot be found in the library.</exception>
-		public static T GetHandler<T>(this IntPtr library, string procName)
-			=> GetDelegateForFunctionPointer<T>(GetProcAddress(library, procName));
-
-		/// <summary>
-		/// Attempts to retrieve a delegate for a named procedure from an unmanaged library.
-		/// </summary>
-		/// <typeparam name="T">The type of the delegate to retrieve. Must inherit from <see cref="Delegate"/>.</typeparam>
-		/// <param name="library">The handle to the loaded unmanaged library.</param>
-		/// <param name="procName">The name of the procedure to retrieve.</param>
-		/// <returns>A delegate of type <typeparamref name="T"/> if found; otherwise, <c>null</c>.</returns>
-		public static T TryGetHandler<T>(this IntPtr library, string procName)
-			where T : Delegate
-		{
-			if (TryGetProcAddress(library, procName, out var address))
-				return GetDelegateForFunctionPointer<T>(address);
+	/// <summary>
+	/// Converts an unmanaged Unicode string pointer to a managed string with a specified length.
+	/// </summary>
+	/// <param name="ptr">The pointer to the Unicode string in unmanaged memory.</param>
+	/// <param name="len">The length of the string to read.</param>
+	/// <returns>The managed string representation of the Unicode string.</returns>
+	public static string ToUnicode(this IntPtr ptr, int len) => Marshal.PtrToStringUni(ptr, len);
 
-			return null;
-		}
+	/// <summary>
+	/// Converts a managed string to an unmanaged Unicode string and returns a pointer to it.
+	/// </summary>
+	/// <param name="str">The managed string to convert.</param>
+	/// <returns>A pointer to the unmanaged Unicode string.</returns>
+	public static IntPtr FromUnicode(this string str) => Marshal.StringToHGlobalUni(str);
+
+	/// <summary>
+	/// Allocates unmanaged memory of the specified size and wraps it in a safe handle.
+	/// </summary>
+	/// <param name="ptr">The size of the memory to allocate, interpreted as an integer.</param>
+	/// <returns>A <see cref="HGlobalSafeHandle"/> wrapping the allocated unmanaged memory.</returns>
+	public static HGlobalSafeHandle ToHGlobal(this int ptr)
+	{
+		return ((IntPtr)ptr).ToHGlobal();
+	}
+
+	/// <summary>
+	/// Allocates unmanaged memory of the specified size and wraps it in a safe handle.
+	/// </summary>
+	/// <param name="ptr">The size of the memory to allocate, as an <see cref="IntPtr"/>.</param>
+	/// <returns>A <see cref="HGlobalSafeHandle"/> wrapping the allocated unmanaged memory.</returns>
+	public static HGlobalSafeHandle ToHGlobal(this IntPtr ptr)
+	{
+		return new HGlobalSafeHandle(Marshal.AllocHGlobal(ptr));
+	}
+
+	/// <summary>
+	/// Encodes a string using the specified encoding, allocates unmanaged memory for it, and returns a safe handle.
+	/// </summary>
+	/// <param name="encoding">The encoding to use for the string.</param>
+	/// <param name="data">The string to encode and allocate.</param>
+	/// <returns>A <see cref="HGlobalSafeHandle"/> wrapping the allocated unmanaged memory containing the encoded string.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="encoding"/> is null.</exception>
+	public static HGlobalSafeHandle ToHGlobal(this Encoding encoding, string data)
+	{
+		if (encoding is null)
+			throw new ArgumentNullException(nameof(encoding));
+
+		var dataEncoded = encoding.GetBytes(data);
+		var size = typeof(byte).SizeOf() * dataEncoded.Length;
+		var pData = size.ToHGlobal();
+
+		Marshal.Copy(dataEncoded, 0, pData.DangerousGetHandle(), dataEncoded.Length);
+
+		return pData;
+	}
+
+	/// <summary>
+	/// Decodes an unmanaged ANSI string from a pointer into a managed string using the specified encoding.
+	/// </summary>
+	/// <param name="encoding">The encoding to use for decoding the string.</param>
+	/// <param name="pData">The pointer to the ANSI string in unmanaged memory.</param>
+	/// <returns>The decoded managed string.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="encoding"/> is null.</exception>
+	public static string ToString(this Encoding encoding, IntPtr pData)
+	{
+		if (encoding is null)
+			throw new ArgumentNullException(nameof(encoding));
+
+		var errStr = pData.ToAnsi();
+		var length = errStr.Length;
+
+		var data = new byte[length];
+		Marshal.Copy(pData, data, 0, length);
+
+		return encoding.GetString(data);
+	}
+
+	/// <summary>
+	/// Retrieves a delegate for a named procedure from an unmanaged library.
+	/// </summary>
+	/// <typeparam name="T">The type of the delegate to retrieve.</typeparam>
+	/// <param name="library">The handle to the loaded unmanaged library.</param>
+	/// <param name="procName">The name of the procedure to retrieve.</param>
+	/// <returns>A delegate of type <typeparamref name="T"/> for the specified procedure.</returns>
+	/// <exception cref="ArgumentException">Thrown when the procedure cannot be found in the library.</exception>
+	public static T GetHandler<T>(this IntPtr library, string procName)
+		=> GetDelegateForFunctionPointer<T>(GetProcAddress(library, procName));
+
+	/// <summary>
+	/// Attempts to retrieve a delegate for a named procedure from an unmanaged library.
+	/// </summary>
+	/// <typeparam name="T">The type of the delegate to retrieve. Must inherit from <see cref="Delegate"/>.</typeparam>
+	/// <param name="library">The handle to the loaded unmanaged library.</param>
+	/// <param name="procName">The name of the procedure to retrieve.</param>
+	/// <returns>A delegate of type <typeparamref name="T"/> if found; otherwise, <c>null</c>.</returns>
+	public static T TryGetHandler<T>(this IntPtr library, string procName)
+		where T : Delegate
+	{
+		if (TryGetProcAddress(library, procName, out var address))
+			return GetDelegateForFunctionPointer<T>(address);
+
+		return null;
+	}
 
 #if !NETCOREAPP
-		[DllImport("kernel32", SetLastError = true, CallingConvention = CallingConvention.StdCall, EntryPoint = "LoadLibrary")]
-		private static extern IntPtr Kernel32LoadLibrary([In] string dllname);
+	[DllImport("kernel32", SetLastError = true, CallingConvention = CallingConvention.StdCall, EntryPoint = "LoadLibrary")]
+	private static extern IntPtr Kernel32LoadLibrary([In] string dllname);
 
-		[DllImport("kernel32", SetLastError = true, CallingConvention = CallingConvention.StdCall, EntryPoint = "FreeLibrary")]
-		private static extern bool Kernel32FreeLibrary([In] IntPtr hModule);
+	[DllImport("kernel32", SetLastError = true, CallingConvention = CallingConvention.StdCall, EntryPoint = "FreeLibrary")]
+	private static extern bool Kernel32FreeLibrary([In] IntPtr hModule);
 
-		[DllImport("kernel32", SetLastError = true, CallingConvention = CallingConvention.StdCall, EntryPoint = "GetProcAddress")]
-		private static extern IntPtr Kernel32GetProcAddress([In] IntPtr hModule, [In] string procName);
+	[DllImport("kernel32", SetLastError = true, CallingConvention = CallingConvention.StdCall, EntryPoint = "GetProcAddress")]
+	private static extern IntPtr Kernel32GetProcAddress([In] IntPtr hModule, [In] string procName);
 #endif
 
-		/// <summary>
-		/// Loads an unmanaged library from the specified path.
-		/// </summary>
-		/// <param name="dllPath">The file path to the unmanaged library (DLL).</param>
-		/// <returns>A handle to the loaded library.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="dllPath"/> is null or empty.</exception>
-		/// <exception cref="ArgumentException">Thrown when the library cannot be loaded.</exception>
-		public static IntPtr LoadLibrary(string dllPath)
-		{
-			if (dllPath.IsEmpty())
-				throw new ArgumentNullException(nameof(dllPath));
+	/// <summary>
+	/// Loads an unmanaged library from the specified path.
+	/// </summary>
+	/// <param name="dllPath">The file path to the unmanaged library (DLL).</param>
+	/// <returns>A handle to the loaded library.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="dllPath"/> is null or empty.</exception>
+	/// <exception cref="ArgumentException">Thrown when the library cannot be loaded.</exception>
+	public static IntPtr LoadLibrary(string dllPath)
+	{
+		if (dllPath.IsEmpty())
+			throw new ArgumentNullException(nameof(dllPath));
 
 #if NETCOREAPP
-			var handler = CoreNativeLib.Load(dllPath);
+		var handler = CoreNativeLib.Load(dllPath);
 #else
-			var handler = Kernel32LoadLibrary(dllPath);
+		var handler = Kernel32LoadLibrary(dllPath);
 #endif
 
-			if (handler == IntPtr.Zero)
-				throw new ArgumentException($"Error load library '{dllPath}'.", nameof(dllPath), new Win32Exception());
+		if (handler == IntPtr.Zero)
+			throw new ArgumentException($"Error load library '{dllPath}'.", nameof(dllPath), new Win32Exception());
 
-			return handler;
-		}
+		return handler;
+	}
 
-		/// <summary>
-		/// Frees a previously loaded unmanaged library.
-		/// </summary>
-		/// <param name="hModule">The handle to the library to free.</param>
-		/// <returns><c>true</c> if the library was successfully freed; otherwise, <c>false</c>.</returns>
-		public static bool FreeLibrary(this IntPtr hModule)
-		{
+	/// <summary>
+	/// Frees a previously loaded unmanaged library.
+	/// </summary>
+	/// <param name="hModule">The handle to the library to free.</param>
+	/// <returns><c>true</c> if the library was successfully freed; otherwise, <c>false</c>.</returns>
+	public static bool FreeLibrary(this IntPtr hModule)
+	{
 #if NETCOREAPP
-			CoreNativeLib.Free(hModule);
-			return true;
+		CoreNativeLib.Free(hModule);
+		return true;
 #else
-			return Kernel32FreeLibrary(hModule);
+		return Kernel32FreeLibrary(hModule);
 #endif
-		}
+	}
 
-		/// <summary>
-		/// Retrieves the address of a named procedure from an unmanaged library.
-		/// </summary>
-		/// <param name="hModule">The handle to the loaded unmanaged library.</param>
-		/// <param name="procName">The name of the procedure to retrieve.</param>
-		/// <returns>The address of the procedure in unmanaged memory.</returns>
-		/// <exception cref="ArgumentException">Thrown when the procedure cannot be found in the library.</exception>
-		public static IntPtr GetProcAddress(this IntPtr hModule, string procName)
-		{
-			if (TryGetProcAddress(hModule, procName, out var addr))
-				return addr;
+	/// <summary>
+	/// Retrieves the address of a named procedure from an unmanaged library.
+	/// </summary>
+	/// <param name="hModule">The handle to the loaded unmanaged library.</param>
+	/// <param name="procName">The name of the procedure to retrieve.</param>
+	/// <returns>The address of the procedure in unmanaged memory.</returns>
+	/// <exception cref="ArgumentException">Thrown when the procedure cannot be found in the library.</exception>
+	public static IntPtr GetProcAddress(this IntPtr hModule, string procName)
+	{
+		if (TryGetProcAddress(hModule, procName, out var addr))
+			return addr;
 
-			throw new ArgumentException($"Error load procedure {procName}.", nameof(procName), new Win32Exception());
-		}
+		throw new ArgumentException($"Error load procedure {procName}.", nameof(procName), new Win32Exception());
+	}
 
-		/// <summary>
-		/// Attempts to retrieve the address of a named procedure from an unmanaged library.
-		/// </summary>
-		/// <param name="hModule">The handle to the loaded unmanaged library.</param>
-		/// <param name="procName">The name of the procedure to retrieve.</param>
-		/// <param name="address">When this method returns, contains the address of the procedure if found; otherwise, <see cref="IntPtr.Zero"/>.</param>
-		/// <returns><c>true</c> if the procedure address was found; otherwise, <c>false</c>.</returns>
-		public static bool TryGetProcAddress(this IntPtr hModule, string procName, out IntPtr address)
-		{
+	/// <summary>
+	/// Attempts to retrieve the address of a named procedure from an unmanaged library.
+	/// </summary>
+	/// <param name="hModule">The handle to the loaded unmanaged library.</param>
+	/// <param name="procName">The name of the procedure to retrieve.</param>
+	/// <param name="address">When this method returns, contains the address of the procedure if found; otherwise, <see cref="IntPtr.Zero"/>.</param>
+	/// <returns><c>true</c> if the procedure address was found; otherwise, <c>false</c>.</returns>
+	public static bool TryGetProcAddress(this IntPtr hModule, string procName, out IntPtr address)
+	{
 #if NETCOREAPP
-			return CoreNativeLib.TryGetExport(hModule, procName, out address);
+		return CoreNativeLib.TryGetExport(hModule, procName, out address);
 #else
-			address = Kernel32GetProcAddress(hModule, procName);
-			return address != IntPtr.Zero;
+		address = Kernel32GetProcAddress(hModule, procName);
+		return address != IntPtr.Zero;
 #endif
-		}
-
-		/// <summary>
-		/// Converts an unmanaged byte reference to a managed string using the specified encoding, with a maximum byte length.
-		/// </summary>
-		/// <param name="encoding">The encoding to use for decoding the string.</param>
-		/// <param name="srcChar">A reference to the starting byte in unmanaged memory.</param>
-		/// <param name="maxBytes">The maximum number of bytes to read.</param>
-		/// <returns>The decoded managed string, or <c>null</c> if the source is zero.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="encoding"/> is null.</exception>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="maxBytes"/> is negative.</exception>
-		public static unsafe string GetUnsafeString(this Encoding encoding, ref byte srcChar, int maxBytes)
-		{
-			if (encoding is null)
-				throw new ArgumentNullException(nameof(encoding));
+	}
 
-			if (maxBytes < 0)
-				throw new ArgumentOutOfRangeException(nameof(maxBytes));
+	/// <summary>
+	/// Converts an unmanaged byte reference to a managed string using the specified encoding, with a maximum byte length.
+	/// </summary>
+	/// <param name="encoding">The encoding to use for decoding the string.</param>
+	/// <param name="srcChar">A reference to the starting byte in unmanaged memory.</param>
+	/// <param name="maxBytes">The maximum number of bytes to read.</param>
+	/// <returns>The decoded managed string, or <c>null</c> if the source is zero.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="encoding"/> is null.</exception>
+	/// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="maxBytes"/> is negative.</exception>
+	public static unsafe string GetUnsafeString(this Encoding encoding, ref byte srcChar, int maxBytes)
+	{
+		if (encoding is null)
+			throw new ArgumentNullException(nameof(encoding));
 
-			if (srcChar == 0)
-				return null;
+		if (maxBytes < 0)
+			throw new ArgumentOutOfRangeException(nameof(maxBytes));
 
-			var charBuffer = stackalloc char[maxBytes];
+		if (srcChar == 0)
+			return null;
 
-			fixed (byte* ptr8 = &srcChar)
-			{
-				encoding.GetChars(ptr8, maxBytes, charBuffer, maxBytes);
-				return new string(charBuffer);
-			}
-		}
+		var charBuffer = stackalloc char[maxBytes];
 
-		/// <summary>
-		/// Writes a managed string to an unmanaged byte reference using the specified encoding, with a maximum byte length.
-		/// </summary>
-		/// <param name="encoding">The encoding to use for encoding the string.</param>
-		/// <param name="tgtChar">A reference to the target byte in unmanaged memory.</param>
-		/// <param name="maxBytes">The maximum number of bytes to write.</param>
-		/// <param name="value">The string to write.</param>
-		/// <exception cref="ArgumentNullException">Thrown when <paramref name="encoding"/> is null.</exception>
-		/// <exception cref="ArgumentOutOfRangeException">
-		/// Thrown when <paramref name="maxBytes"/> is negative or the string length exceeds <paramref name="maxBytes"/>.
-		/// </exception>
-		public static unsafe void SetUnsafeString(this Encoding encoding, ref byte tgtChar, int maxBytes, string value)
+		fixed (byte* ptr8 = &srcChar)
 		{
-			if (encoding is null)
-				throw new ArgumentNullException(nameof(encoding));
+			encoding.GetChars(ptr8, maxBytes, charBuffer, maxBytes);
+			return new string(charBuffer);
+		}
+	}
 
-			if (maxBytes < 0)
-				throw new ArgumentOutOfRangeException(nameof(maxBytes));
+	/// <summary>
+	/// Writes a managed string to an unmanaged byte reference using the specified encoding, with a maximum byte length.
+	/// </summary>
+	/// <param name="encoding">The encoding to use for encoding the string.</param>
+	/// <param name="tgtChar">A reference to the target byte in unmanaged memory.</param>
+	/// <param name="maxBytes">The maximum number of bytes to write.</param>
+	/// <param name="value">The string to write.</param>
+	/// <exception cref="ArgumentNullException">Thrown when <paramref name="encoding"/> is null.</exception>
+	/// <exception cref="ArgumentOutOfRangeException">
+	/// Thrown when <paramref name="maxBytes"/> is negative or the string length exceeds <paramref name="maxBytes"/>.
+	/// </exception>
+	public static unsafe void SetUnsafeString(this Encoding encoding, ref byte tgtChar, int maxBytes, string value)
+	{
+		if (encoding is null)
+			throw new ArgumentNullException(nameof(encoding));
 
-			if (value.IsEmpty())
-				return;
+		if (maxBytes < 0)
+			throw new ArgumentOutOfRangeException(nameof(maxBytes));
 
-			if (value.Length >= maxBytes)
-				throw new ArgumentOutOfRangeException(nameof(maxBytes), maxBytes, "Invalid value.");
+		if (value.IsEmpty())
+			return;
 
-			var charBuffer = stackalloc char[maxBytes];
+		if (value.Length >= maxBytes)
+			throw new ArgumentOutOfRangeException(nameof(maxBytes), maxBytes, "Invalid value.");
 
-			fixed (byte* ptr8 = &tgtChar)
-			{
-				for (var b = 0; b < maxBytes; b++)
-					ptr8[b] = 0;
+		var charBuffer = stackalloc char[maxBytes];
 
-				for (var c = 0; c < value.Length; c++)
-					charBuffer[c] = value[c];
+		fixed (byte* ptr8 = &tgtChar)
+		{
+			for (var b = 0; b < maxBytes; b++)
+				ptr8[b] = 0;
 
-				encoding.GetBytes(charBuffer, value.Length, ptr8, maxBytes);
-			}
-		}
+			for (var c = 0; c < value.Length; c++)
+				charBuffer[c] = value[c];
 
-		/// <summary>
-		/// Copies data from an unmanaged pointer to a byte array.
-		/// </summary>
-		/// <param name="ptr">The pointer to the unmanaged memory to copy from.</param>
-		/// <param name="buffer">The byte array to copy the data into.</param>
-		public static void CopyTo(this IntPtr ptr, byte[] buffer)
-		{
-			ptr.CopyTo(buffer, 0, buffer.Length);
+			encoding.GetBytes(charBuffer, value.Length, ptr8, maxBytes);
 		}
+	}
 
-		/// <summary>
-		/// Copies a specified amount of data from an unmanaged pointer to a byte array.
-		/// </summary>
-		/// <param name="ptr">The pointer to the unmanaged memory to copy from.</param>
-		/// <param name="buffer">The byte array to copy the data into.</param>
-		/// <param name="offset">The starting index in the buffer where data should be copied.</param>
-		/// <param name="length">The number of bytes to copy.</param>
-		public static void CopyTo(this IntPtr ptr, byte[] buffer, int offset, int length)
-		{
-			Marshal.Copy(ptr, buffer, offset, length);
-		}
+	/// <summary>
+	/// Copies data from an unmanaged pointer to a byte array.
+	/// </summary>
+	/// <param name="ptr">The pointer to the unmanaged memory to copy from.</param>
+	/// <param name="buffer">The byte array to copy the data into.</param>
+	public static void CopyTo(this IntPtr ptr, byte[] buffer)
+	{
+		ptr.CopyTo(buffer, 0, buffer.Length);
+	}
 
-		/// <summary>
-		/// Frees an unmanaged memory block previously allocated with <see cref="Marshal.AllocHGlobal(IntPtr)"/>.
-		/// </summary>
-		/// <param name="ptr">The pointer to the unmanaged memory to free.</param>
-		public static void FreeHGlobal(this IntPtr ptr) => Marshal.FreeHGlobal(ptr);
+	/// <summary>
+	/// Copies a specified amount of data from an unmanaged pointer to a byte array.
+	/// </summary>
+	/// <param name="ptr">The pointer to the unmanaged memory to copy from.</param>
+	/// <param name="buffer">The byte array to copy the data into.</param>
+	/// <param name="offset">The starting index in the buffer where data should be copied.</param>
+	/// <param name="length">The number of bytes to copy.</param>
+	public static void CopyTo(this IntPtr ptr, byte[] buffer, int offset, int length)
+	{
+		Marshal.Copy(ptr, buffer, offset, length);
 	}
+
+	/// <summary>
+	/// Frees an unmanaged memory block previously allocated with <see cref="Marshal.AllocHGlobal(IntPtr)"/>.
+	/// </summary>
+	/// <param name="ptr">The pointer to the unmanaged memory to free.</param>
+	public static void FreeHGlobal(this IntPtr ptr) => Marshal.FreeHGlobal(ptr);
 }
\ No newline at end of file
diff --git a/Interop/PtrReader.cs b/Interop/PtrReader.cs
index aa71c96c..8a471a48 100644
--- a/Interop/PtrReader.cs
+++ b/Interop/PtrReader.cs
@@ -1,125 +1,124 @@
-namespace Ecng.Interop
-{
-	using System;
-	using System.Runtime.InteropServices;
+namespace Ecng.Interop;
+
+using System;
+using System.Runtime.InteropServices;
 
+/// <summary>
+/// Provides methods to read data from an unmanaged memory pointer.
+/// </summary>
+public class PtrReader
+{
 	/// <summary>
-	/// Provides methods to read data from an unmanaged memory pointer.
+	/// Initializes a new instance of the <see cref="PtrReader"/> class with the specified pointer.
 	/// </summary>
-	public class PtrReader
+	/// <param name="ptr">The unmanaged memory pointer to read from.</param>
+	/// <exception cref="ArgumentNullException">Thrown if <paramref name="ptr"/> is <see cref="IntPtr.Zero"/>.</exception>
+	public PtrReader(IntPtr ptr)
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="PtrReader"/> class with the specified pointer.
-		/// </summary>
-		/// <param name="ptr">The unmanaged memory pointer to read from.</param>
-		/// <exception cref="ArgumentNullException">Thrown if <paramref name="ptr"/> is <see cref="IntPtr.Zero"/>.</exception>
-		public PtrReader(IntPtr ptr)
-		{
-			Ptr = ptr;
-		}
+		Ptr = ptr;
+	}
 
-		private IntPtr _ptr;
+	private IntPtr _ptr;
 
-		/// <summary>
-		/// Gets or sets the unmanaged memory pointer.
-		/// </summary>
-		/// <exception cref="ArgumentNullException">Thrown if the value is <see cref="IntPtr.Zero"/>.</exception>
-		public IntPtr Ptr
+	/// <summary>
+	/// Gets or sets the unmanaged memory pointer.
+	/// </summary>
+	/// <exception cref="ArgumentNullException">Thrown if the value is <see cref="IntPtr.Zero"/>.</exception>
+	public IntPtr Ptr
+	{
+		get { return _ptr; }
+		set
 		{
-			get { return _ptr; }
-			set
-			{
-				if (value == IntPtr.Zero)
-					throw new ArgumentNullException(nameof(value));
-
-				_ptr = value;
-			}
+			if (value == IntPtr.Zero)
+				throw new ArgumentNullException(nameof(value));
+
+			_ptr = value;
 		}
+	}
 
-		/// <summary>
-		/// Reads a byte from the current pointer and advances the pointer by the size of a byte.
-		/// </summary>
-		/// <returns>The byte read from the pointer.</returns>
-		public byte GetByte()
-		{
-			var ret = Marshal.ReadByte(_ptr);
-			_ptr += sizeof(byte);
+	/// <summary>
+	/// Reads a byte from the current pointer and advances the pointer by the size of a byte.
+	/// </summary>
+	/// <returns>The byte read from the pointer.</returns>
+	public byte GetByte()
+	{
+		var ret = Marshal.ReadByte(_ptr);
+		_ptr += sizeof(byte);
 
-			return ret;
-		}
+		return ret;
+	}
 
-		/// <summary>
-		/// Reads a 32-bit integer from the current pointer and advances the pointer by the size of an integer.
-		/// </summary>
-		/// <returns>The 32-bit integer read from the pointer.</returns>
-		public int GetInt()
-		{
-			var ret = Marshal.ReadInt32(_ptr);
-			_ptr += sizeof(int);
+	/// <summary>
+	/// Reads a 32-bit integer from the current pointer and advances the pointer by the size of an integer.
+	/// </summary>
+	/// <returns>The 32-bit integer read from the pointer.</returns>
+	public int GetInt()
+	{
+		var ret = Marshal.ReadInt32(_ptr);
+		_ptr += sizeof(int);
 
-			return ret;
-		}
+		return ret;
+	}
 
-		/// <summary>
-		/// Reads a 64-bit integer from the current pointer and advances the pointer by the size of a long.
-		/// </summary>
-		/// <returns>The 64-bit integer read from the pointer.</returns>
-		public long GetLong()
-		{
-			var ret = Marshal.ReadInt64(_ptr);
-			_ptr += sizeof(long);
+	/// <summary>
+	/// Reads a 64-bit integer from the current pointer and advances the pointer by the size of a long.
+	/// </summary>
+	/// <returns>The 64-bit integer read from the pointer.</returns>
+	public long GetLong()
+	{
+		var ret = Marshal.ReadInt64(_ptr);
+		_ptr += sizeof(long);
 
-			return ret;
-		}
+		return ret;
+	}
 
-		/// <summary>
-		/// Reads a 16-bit integer from the current pointer and advances the pointer by the size of a short.
-		/// </summary>
-		/// <returns>The 16-bit integer read from the pointer.</returns>
-		public short GetShort()
-		{
-			var ret = Marshal.ReadInt16(_ptr);
-			_ptr += sizeof(short);
+	/// <summary>
+	/// Reads a 16-bit integer from the current pointer and advances the pointer by the size of a short.
+	/// </summary>
+	/// <returns>The 16-bit integer read from the pointer.</returns>
+	public short GetShort()
+	{
+		var ret = Marshal.ReadInt16(_ptr);
+		_ptr += sizeof(short);
 
-			return ret;
-		}
+		return ret;
+	}
 
-		/// <summary>
-		/// Reads an <see cref="IntPtr"/> from the current pointer and advances the pointer by the size of an <see cref="IntPtr"/>.
-		/// </summary>
-		/// <returns>The <see cref="IntPtr"/> read from the pointer.</returns>
-		public IntPtr GetIntPtr()
-		{
-			var ret = Marshal.ReadIntPtr(_ptr);
-			_ptr += IntPtr.Size;
+	/// <summary>
+	/// Reads an <see cref="IntPtr"/> from the current pointer and advances the pointer by the size of an <see cref="IntPtr"/>.
+	/// </summary>
+	/// <returns>The <see cref="IntPtr"/> read from the pointer.</returns>
+	public IntPtr GetIntPtr()
+	{
+		var ret = Marshal.ReadIntPtr(_ptr);
+		_ptr += IntPtr.Size;
 
-			return ret;
-		}
+		return ret;
+	}
 
-		/// <summary>
-		/// Reads a null-terminated ANSI string from the current pointer and advances the pointer by the size of an <see cref="IntPtr"/>.
-		/// </summary>
-		/// <returns>The ANSI string read from the pointer. If the string is null, an empty string is returned.</returns>
-		public string GetString()
-		{
-			var str = _ptr.ToAnsi();
-			_ptr += IntPtr.Size;
+	/// <summary>
+	/// Reads a null-terminated ANSI string from the current pointer and advances the pointer by the size of an <see cref="IntPtr"/>.
+	/// </summary>
+	/// <returns>The ANSI string read from the pointer. If the string is null, an empty string is returned.</returns>
+	public string GetString()
+	{
+		var str = _ptr.ToAnsi();
+		_ptr += IntPtr.Size;
 
-			return str is null ? string.Empty : str.Trim();
-		}
+		return str is null ? string.Empty : str.Trim();
+	}
 
-		/// <summary>
-		/// Reads an ANSI string of the specified length from the current pointer and advances the pointer by the specified length.
-		/// </summary>
-		/// <param name="length">The length of the string to read.</param>
-		/// <returns>The ANSI string read from the pointer. If the string is null, an empty string is returned.</returns>
-		public string GetString(int length)
-		{
-			var str = _ptr.ToAnsi(length);
+	/// <summary>
+	/// Reads an ANSI string of the specified length from the current pointer and advances the pointer by the specified length.
+	/// </summary>
+	/// <param name="length">The length of the string to read.</param>
+	/// <returns>The ANSI string read from the pointer. If the string is null, an empty string is returned.</returns>
+	public string GetString(int length)
+	{
+		var str = _ptr.ToAnsi(length);
 
-			_ptr += length;
+		_ptr += length;
 
-			return str is null ? string.Empty : str.Trim();
-		}
+		return str is null ? string.Empty : str.Trim();
 	}
 }
\ No newline at end of file
diff --git a/Interop/SafePointer.cs b/Interop/SafePointer.cs
index aa5a21a3..d56dc9f6 100644
--- a/Interop/SafePointer.cs
+++ b/Interop/SafePointer.cs
@@ -1,166 +1,165 @@
-namespace Ecng.Interop
+namespace Ecng.Interop;
+
+using System;
+
+using Ecng.Common;
+
+/// <summary>
+/// Represents a safe wrapper around an unmanaged memory pointer with bounds checking and shifting capabilities.
+/// </summary>
+public struct SafePointer
 {
-	using System;
+	private IntPtr _pointer;
+	private readonly int? _size;
+	private int _origin;
+
+	/// <summary>
+	/// Initializes a new instance of the <see cref="SafePointer"/> struct with a specified pointer and optional size.
+	/// </summary>
+	/// <param name="pointer">The unmanaged memory pointer to wrap. Must not be <see cref="IntPtr.Zero"/>.</param>
+	/// <param name="size">The optional size of the memory block in bytes. If specified, must be non-negative.</param>
+	/// <exception cref="ArgumentOutOfRangeException">
+	/// Thrown when <paramref name="pointer"/> is <see cref="IntPtr.Zero"/> or <paramref name="size"/> is negative.
+	/// </exception>
+	public SafePointer(IntPtr pointer, int? size)
+	{
+		if (pointer == default)
+			throw new ArgumentOutOfRangeException(nameof(pointer));
+
+		if (size < 0)
+			throw new ArgumentOutOfRangeException(nameof(size));
+
+		_pointer = pointer;
+		_size = size;
+		_origin = 0;
+	}
+
+	/// <summary>
+	/// Gets the current unmanaged memory pointer.
+	/// </summary>
+	public IntPtr Pointer => _pointer;
+
+	private void CheckBorder<TStruct>()
+		where TStruct : struct
+	{
+		CheckBorder(typeof(TStruct).SizeOf());
+	}
+
+	private void CheckBorder(int offset)
+	{
+		if (_size != null && (_origin + offset) > _size.Value)
+			throw new ArgumentOutOfRangeException(nameof(offset));
+	}
+
+	/// <summary>
+	/// Reads a structure of type <typeparamref name="TStruct"/> from the current pointer position.
+	/// </summary>
+	/// <typeparam name="TStruct">The type of the structure to read. Must be a value type.</typeparam>
+	/// <param name="autoShift">If <c>true</c>, shifts the pointer by the size of <typeparamref name="TStruct"/> after reading.</param>
+	/// <returns>The structure read from the pointer.</returns>
+	/// <exception cref="ArgumentOutOfRangeException">
+	/// Thrown when the operation exceeds the defined size boundary.
+	/// </exception>
+	public TStruct ToStruct<TStruct>(bool autoShift = false)
+		where TStruct : struct
+	{
+		CheckBorder<TStruct>();
+
+		var value = _pointer.ToStruct<TStruct>();
+		
+		if (autoShift)
+			Shift<TStruct>();
+
+		return value;
+	}
+
+	/// <summary>
+	/// Shifts the pointer forward by the size of the specified structure type.
+	/// </summary>
+	/// <typeparam name="TStruct">The type of the structure whose size determines the shift. Must be a value type.</typeparam>
+	/// <exception cref="ArgumentOutOfRangeException">
+	/// Thrown when the shift exceeds the defined size boundary.
+	/// </exception>
+	public void Shift<TStruct>()
+		where TStruct : struct
+	{
+		Shift(typeof(TStruct).SizeOf());
+	}
+
+	/// <summary>
+	/// Shifts the pointer forward by the specified offset in bytes.
+	/// </summary>
+	/// <param name="offset">The number of bytes to shift the pointer.</param>
+	/// <exception cref="ArgumentOutOfRangeException">
+	/// Thrown when the shift exceeds the defined size boundary.
+	/// </exception>
+	public void Shift(int offset)
+	{
+		CheckBorder(offset);
 
-	using Ecng.Common;
+		_origin += offset;
+		_pointer += offset;
+	}
 
 	/// <summary>
-	/// Represents a safe wrapper around an unmanaged memory pointer with bounds checking and shifting capabilities.
+	/// Copies data from the current pointer position to a byte array.
 	/// </summary>
-	public struct SafePointer
+	/// <param name="buffer">The target byte array to copy data into.</param>
+	/// <param name="autoShift">If <c>true</c>, shifts the pointer by the length of the copied data after copying.</param>
+	/// <exception cref="ArgumentOutOfRangeException">
+	/// Thrown when the operation exceeds the defined size boundary.
+	/// </exception>
+	public void CopyTo(byte[] buffer, bool autoShift = false)
 	{
-		private IntPtr _pointer;
-		private readonly int? _size;
-		private int _origin;
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="SafePointer"/> struct with a specified pointer and optional size.
-		/// </summary>
-		/// <param name="pointer">The unmanaged memory pointer to wrap. Must not be <see cref="IntPtr.Zero"/>.</param>
-		/// <param name="size">The optional size of the memory block in bytes. If specified, must be non-negative.</param>
-		/// <exception cref="ArgumentOutOfRangeException">
-		/// Thrown when <paramref name="pointer"/> is <see cref="IntPtr.Zero"/> or <paramref name="size"/> is negative.
-		/// </exception>
-		public SafePointer(IntPtr pointer, int? size)
-		{
-			if (pointer == default)
-				throw new ArgumentOutOfRangeException(nameof(pointer));
-
-			if (size < 0)
-				throw new ArgumentOutOfRangeException(nameof(size));
-
-			_pointer = pointer;
-			_size = size;
-			_origin = 0;
-		}
-
-		/// <summary>
-		/// Gets the current unmanaged memory pointer.
-		/// </summary>
-		public IntPtr Pointer => _pointer;
-
-		private void CheckBorder<TStruct>()
-			where TStruct : struct
-		{
-			CheckBorder(typeof(TStruct).SizeOf());
-		}
-
-		private void CheckBorder(int offset)
-		{
-			if (_size != null && (_origin + offset) > _size.Value)
-				throw new ArgumentOutOfRangeException(nameof(offset));
-		}
-
-		/// <summary>
-		/// Reads a structure of type <typeparamref name="TStruct"/> from the current pointer position.
-		/// </summary>
-		/// <typeparam name="TStruct">The type of the structure to read. Must be a value type.</typeparam>
-		/// <param name="autoShift">If <c>true</c>, shifts the pointer by the size of <typeparamref name="TStruct"/> after reading.</param>
-		/// <returns>The structure read from the pointer.</returns>
-		/// <exception cref="ArgumentOutOfRangeException">
-		/// Thrown when the operation exceeds the defined size boundary.
-		/// </exception>
-		public TStruct ToStruct<TStruct>(bool autoShift = false)
-			where TStruct : struct
-		{
-			CheckBorder<TStruct>();
-
-			var value = _pointer.ToStruct<TStruct>();
-			
-			if (autoShift)
-				Shift<TStruct>();
-
-			return value;
-		}
-
-		/// <summary>
-		/// Shifts the pointer forward by the size of the specified structure type.
-		/// </summary>
-		/// <typeparam name="TStruct">The type of the structure whose size determines the shift. Must be a value type.</typeparam>
-		/// <exception cref="ArgumentOutOfRangeException">
-		/// Thrown when the shift exceeds the defined size boundary.
-		/// </exception>
-		public void Shift<TStruct>()
-			where TStruct : struct
-		{
-			Shift(typeof(TStruct).SizeOf());
-		}
-
-		/// <summary>
-		/// Shifts the pointer forward by the specified offset in bytes.
-		/// </summary>
-		/// <param name="offset">The number of bytes to shift the pointer.</param>
-		/// <exception cref="ArgumentOutOfRangeException">
-		/// Thrown when the shift exceeds the defined size boundary.
-		/// </exception>
-		public void Shift(int offset)
-		{
-			CheckBorder(offset);
-
-			_origin += offset;
-			_pointer += offset;
-		}
-
-		/// <summary>
-		/// Copies data from the current pointer position to a byte array.
-		/// </summary>
-		/// <param name="buffer">The target byte array to copy data into.</param>
-		/// <param name="autoShift">If <c>true</c>, shifts the pointer by the length of the copied data after copying.</param>
-		/// <exception cref="ArgumentOutOfRangeException">
-		/// Thrown when the operation exceeds the defined size boundary.
-		/// </exception>
-		public void CopyTo(byte[] buffer, bool autoShift = false)
-		{
-			CopyTo(buffer, 0, buffer.Length, autoShift);
-		}
-
-		/// <summary>
-		/// Copies a specified amount of data from the current pointer position to a byte array.
-		/// </summary>
-		/// <param name="buffer">The target byte array to copy data into.</param>
-		/// <param name="offset">The starting index in the buffer where data should be copied.</param>
-		/// <param name="length">The number of bytes to copy.</param>
-		/// <param name="autoShift">If <c>true</c>, shifts the pointer by <paramref name="length"/> after copying.</param>
-		/// <exception cref="ArgumentOutOfRangeException">
-		/// Thrown when the operation exceeds the defined size boundary.
-		/// </exception>
-		public void CopyTo(byte[] buffer, int offset, int length, bool autoShift = false)
-		{
-			CheckBorder(length);
-
-			Pointer.CopyTo(buffer, offset, length);
-
-			if (autoShift)
-				Shift(length);
-		}
-
-		/// <summary>
-		/// Reads a value of type <typeparamref name="TValue"/> from the current pointer position.
-		/// </summary>
-		/// <typeparam name="TValue">The type of the value to read. Must be a value type.</typeparam>
-		/// <param name="autoShift">If <c>true</c>, shifts the pointer by the size of <typeparamref name="TValue"/> after reading.</param>
-		/// <returns>The value read from the pointer.</returns>
-		/// <exception cref="ArgumentOutOfRangeException">
-		/// Thrown when the operation exceeds the defined size boundary.
-		/// </exception>
-		public TValue Read<TValue>(bool autoShift = false)
-			where TValue : struct
-		{
-			CheckBorder<TValue>();
-
-			var value = Pointer.Read<TValue>();
-
-			if (autoShift)
-				Shift<TValue>();
-
-			return value;
-		}
-
-		/// <summary>
-		/// Implicitly converts a <see cref="SafePointer"/> to an <see cref="IntPtr"/>.
-		/// </summary>
-		/// <param name="pointer">The <see cref="SafePointer"/> instance to convert.</param>
-		/// <returns>The underlying <see cref="IntPtr"/> value.</returns>
-		public static implicit operator IntPtr(SafePointer pointer) => pointer.Pointer;
+		CopyTo(buffer, 0, buffer.Length, autoShift);
 	}
+
+	/// <summary>
+	/// Copies a specified amount of data from the current pointer position to a byte array.
+	/// </summary>
+	/// <param name="buffer">The target byte array to copy data into.</param>
+	/// <param name="offset">The starting index in the buffer where data should be copied.</param>
+	/// <param name="length">The number of bytes to copy.</param>
+	/// <param name="autoShift">If <c>true</c>, shifts the pointer by <paramref name="length"/> after copying.</param>
+	/// <exception cref="ArgumentOutOfRangeException">
+	/// Thrown when the operation exceeds the defined size boundary.
+	/// </exception>
+	public void CopyTo(byte[] buffer, int offset, int length, bool autoShift = false)
+	{
+		CheckBorder(length);
+
+		Pointer.CopyTo(buffer, offset, length);
+
+		if (autoShift)
+			Shift(length);
+	}
+
+	/// <summary>
+	/// Reads a value of type <typeparamref name="TValue"/> from the current pointer position.
+	/// </summary>
+	/// <typeparam name="TValue">The type of the value to read. Must be a value type.</typeparam>
+	/// <param name="autoShift">If <c>true</c>, shifts the pointer by the size of <typeparamref name="TValue"/> after reading.</param>
+	/// <returns>The value read from the pointer.</returns>
+	/// <exception cref="ArgumentOutOfRangeException">
+	/// Thrown when the operation exceeds the defined size boundary.
+	/// </exception>
+	public TValue Read<TValue>(bool autoShift = false)
+		where TValue : struct
+	{
+		CheckBorder<TValue>();
+
+		var value = Pointer.Read<TValue>();
+
+		if (autoShift)
+			Shift<TValue>();
+
+		return value;
+	}
+
+	/// <summary>
+	/// Implicitly converts a <see cref="SafePointer"/> to an <see cref="IntPtr"/>.
+	/// </summary>
+	/// <param name="pointer">The <see cref="SafePointer"/> instance to convert.</param>
+	/// <returns>The underlying <see cref="IntPtr"/> value.</returns>
+	public static implicit operator IntPtr(SafePointer pointer) => pointer.Pointer;
 }
\ No newline at end of file
diff --git a/Linq/ExpressionExtensions.cs b/Linq/ExpressionExtensions.cs
index a1597b4e..94d3b5e3 100644
--- a/Linq/ExpressionExtensions.cs
+++ b/Linq/ExpressionExtensions.cs
@@ -1,145 +1,144 @@
-namespace Ecng.Linq
-{
-	using System;
-	using System.Linq;
-	using System.Linq.Expressions;
-	using System.Reflection;
+namespace Ecng.Linq;
+
+using System;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Reflection;
+
+using Ecng.Common;
 
-	using Ecng.Common;
+/// <summary>
+/// The extensions for <see cref="Expression"/>.
+/// </summary>
+public static class ExpressionExtensions
+{
+	/// <summary>
+	/// Gets the constant value from the expression.
+	/// </summary>
+	/// <typeparam name="T">The type of the constant value.</typeparam>
+	/// <param name="e">The expression.</param>
+	/// <returns>The constant value.</returns>
+	public static T GetConstant<T>(this Expression e)
+		=> ((ConstantExpression)e).Value.To<T>();
 
 	/// <summary>
-	/// The extensions for <see cref="Expression"/>.
+	/// Evaluates the expression and returns its value.
 	/// </summary>
-	public static class ExpressionExtensions
+	/// <param name="e">The expression to evaluate.</param>
+	/// <returns>The evaluated value.</returns>
+	public static object Evaluate(this Expression e)
 	{
-		/// <summary>
-		/// Gets the constant value from the expression.
-		/// </summary>
-		/// <typeparam name="T">The type of the constant value.</typeparam>
-		/// <param name="e">The expression.</param>
-		/// <returns>The constant value.</returns>
-		public static T GetConstant<T>(this Expression e)
-			=> ((ConstantExpression)e).Value.To<T>();
-
-		/// <summary>
-		/// Evaluates the expression and returns its value.
-		/// </summary>
-		/// <param name="e">The expression to evaluate.</param>
-		/// <returns>The evaluated value.</returns>
-		public static object Evaluate(this Expression e)
-		{
-			//A little optimization for constant expressions
-			if (e.NodeType == ExpressionType.Constant)
-				return e.GetConstant<object>();
+		//A little optimization for constant expressions
+		if (e.NodeType == ExpressionType.Constant)
+			return e.GetConstant<object>();
 
-			return Expression.Lambda(e).Compile().DynamicInvoke();
-		}
+		return Expression.Lambda(e).Compile().DynamicInvoke();
+	}
 
-		/// <summary>
-		/// Replaces the source provider in the expression with the specified query provider.
-		/// </summary>
-		/// <param name="expression">The expression to modify.</param>
-		/// <param name="provider">The query provider to set.</param>
-		/// <exception cref="ArgumentNullException">Thrown when expression or provider is null.</exception>
-		public static void ReplaceSource(this Expression expression, IQueryProvider provider)
-		{
-			if (expression is null)
-				throw new ArgumentNullException(nameof(expression));
+	/// <summary>
+	/// Replaces the source provider in the expression with the specified query provider.
+	/// </summary>
+	/// <param name="expression">The expression to modify.</param>
+	/// <param name="provider">The query provider to set.</param>
+	/// <exception cref="ArgumentNullException">Thrown when expression or provider is null.</exception>
+	public static void ReplaceSource(this Expression expression, IQueryProvider provider)
+	{
+		if (expression is null)
+			throw new ArgumentNullException(nameof(expression));
 
-			if (provider is null)
-				throw new ArgumentNullException(nameof(provider));
+		if (provider is null)
+			throw new ArgumentNullException(nameof(provider));
 
-			while (expression is MethodCallExpression mce)
-				expression = mce.Arguments[0];
+		while (expression is MethodCallExpression mce)
+			expression = mce.Arguments[0];
 
-			var field = expression.GetType().GetFields(BindingFlags.Instance | BindingFlags.NonPublic).First();
-			field.SetValue(expression, provider);
-		}
+		var field = expression.GetType().GetFields(BindingFlags.Instance | BindingFlags.NonPublic).First();
+		field.SetValue(expression, provider);
+	}
 
-		/// <summary>
-		/// Removes quote expressions from the given expression.
-		/// </summary>
-		/// <param name="e">The expression to process.</param>
-		/// <returns>The unquoted expression.</returns>
-		public static Expression StripQuotes(this Expression e)
+	/// <summary>
+	/// Removes quote expressions from the given expression.
+	/// </summary>
+	/// <param name="e">The expression to process.</param>
+	/// <returns>The unquoted expression.</returns>
+	public static Expression StripQuotes(this Expression e)
+	{
+		while (e.NodeType == ExpressionType.Quote)
 		{
-			while (e.NodeType == ExpressionType.Quote)
-			{
-				e = ((UnaryExpression)e).Operand;
-			}
-
-			return e;
+			e = ((UnaryExpression)e).Operand;
 		}
 
-		/// <summary>
-		/// Gets the value of the specified member from the given instance.
-		/// </summary>
-		/// <param name="member">The member whose value to retrieve.</param>
-		/// <param name="instance">The object instance from which to retrieve the value.</param>
-		/// <returns>The value of the member.</returns>
-		/// <exception cref="NotSupportedException">Thrown when the member type is not supported.</exception>
-		public static object GetMemberValue(this MemberInfo member, object instance)
-		{
-			if (member is PropertyInfo pi)
-				return pi.GetValue(instance);
-			else if (member is FieldInfo fi)
-				return fi.GetValue(instance);
-			else
-				throw new NotSupportedException();
-		}
+		return e;
+	}
 
-		/// <summary>
-		/// Retrieves the innermost member in a nested member expression.
-		/// </summary>
-		/// <param name="exp">The member expression to process.</param>
-		/// <returns>The innermost member expression.</returns>
-		public static MemberExpression GetInnerMember(this MemberExpression exp)
-		{
-			if (exp.Expression is MemberExpression d)
-				return GetInnerMember(d);
+	/// <summary>
+	/// Gets the value of the specified member from the given instance.
+	/// </summary>
+	/// <param name="member">The member whose value to retrieve.</param>
+	/// <param name="instance">The object instance from which to retrieve the value.</param>
+	/// <returns>The value of the member.</returns>
+	/// <exception cref="NotSupportedException">Thrown when the member type is not supported.</exception>
+	public static object GetMemberValue(this MemberInfo member, object instance)
+	{
+		if (member is PropertyInfo pi)
+			return pi.GetValue(instance);
+		else if (member is FieldInfo fi)
+			return fi.GetValue(instance);
+		else
+			throw new NotSupportedException();
+	}
 
-			return exp;
-		}
+	/// <summary>
+	/// Retrieves the innermost member in a nested member expression.
+	/// </summary>
+	/// <param name="exp">The member expression to process.</param>
+	/// <returns>The innermost member expression.</returns>
+	public static MemberExpression GetInnerMember(this MemberExpression exp)
+	{
+		if (exp.Expression is MemberExpression d)
+			return GetInnerMember(d);
 
-		/// <summary>
-		/// Evaluates the expression and returns its value as the specified type.
-		/// </summary>
-		/// <typeparam name="TValue">The type to convert the evaluated value to.</typeparam>
-		/// <param name="exp">The expression to evaluate.</param>
-		/// <returns>The evaluated value converted to the specified type.</returns>
-		/// <exception cref="ArgumentNullException">Thrown when the expression is null.</exception>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown when the expression type is not supported.</exception>
-		public static TValue GetValue<TValue>(this Expression exp)
-		{
-			if (exp is null)
-				throw new ArgumentNullException(nameof(exp));
+		return exp;
+	}
 
-			if (exp is ConstantExpression c)
-				return c.Value.To<TValue>();
-			else if (exp is MemberExpression me)
-				return me.Member.GetMemberValue(me.Expression is null ? null : GetValue<object>(me.Expression)).To<TValue>();
+	/// <summary>
+	/// Evaluates the expression and returns its value as the specified type.
+	/// </summary>
+	/// <typeparam name="TValue">The type to convert the evaluated value to.</typeparam>
+	/// <param name="exp">The expression to evaluate.</param>
+	/// <returns>The evaluated value converted to the specified type.</returns>
+	/// <exception cref="ArgumentNullException">Thrown when the expression is null.</exception>
+	/// <exception cref="ArgumentOutOfRangeException">Thrown when the expression type is not supported.</exception>
+	public static TValue GetValue<TValue>(this Expression exp)
+	{
+		if (exp is null)
+			throw new ArgumentNullException(nameof(exp));
 
-			throw new ArgumentOutOfRangeException(exp.NodeType.ToString());
-		}
+		if (exp is ConstantExpression c)
+			return c.Value.To<TValue>();
+		else if (exp is MemberExpression me)
+			return me.Member.GetMemberValue(me.Expression is null ? null : GetValue<object>(me.Expression)).To<TValue>();
+
+		throw new ArgumentOutOfRangeException(exp.NodeType.ToString());
+	}
 
-		/// <summary>
-		/// Converts the given expression type to its equivalent <see cref="ComparisonOperator"/>.
-		/// </summary>
-		/// <param name="type">The expression type.</param>
-		/// <returns>The corresponding <see cref="ComparisonOperator"/>.</returns>
-		/// <exception cref="ArgumentOutOfRangeException">Thrown when the expression type has no corresponding operator.</exception>
-		public static ComparisonOperator ToOperator(this ExpressionType type)
+	/// <summary>
+	/// Converts the given expression type to its equivalent <see cref="ComparisonOperator"/>.
+	/// </summary>
+	/// <param name="type">The expression type.</param>
+	/// <returns>The corresponding <see cref="ComparisonOperator"/>.</returns>
+	/// <exception cref="ArgumentOutOfRangeException">Thrown when the expression type has no corresponding operator.</exception>
+	public static ComparisonOperator ToOperator(this ExpressionType type)
+	{
+		return type switch
 		{
-			return type switch
-			{
-				ExpressionType.GreaterThan => ComparisonOperator.Greater,
-				ExpressionType.GreaterThanOrEqual => ComparisonOperator.GreaterOrEqual,
-				ExpressionType.LessThan => ComparisonOperator.Less,
-				ExpressionType.LessThanOrEqual => ComparisonOperator.LessOrEqual,
-				ExpressionType.Equal => ComparisonOperator.Equal,
-				ExpressionType.NotEqual => ComparisonOperator.NotEqual,
-				_ => throw new ArgumentOutOfRangeException(type.To<string>()),
-			};
-		}
+			ExpressionType.GreaterThan => ComparisonOperator.Greater,
+			ExpressionType.GreaterThanOrEqual => ComparisonOperator.GreaterOrEqual,
+			ExpressionType.LessThan => ComparisonOperator.Less,
+			ExpressionType.LessThanOrEqual => ComparisonOperator.LessOrEqual,
+			ExpressionType.Equal => ComparisonOperator.Equal,
+			ExpressionType.NotEqual => ComparisonOperator.NotEqual,
+			_ => throw new ArgumentOutOfRangeException(type.To<string>()),
+		};
 	}
 }
\ No newline at end of file
diff --git a/Linq/QueryableExtensions.cs b/Linq/QueryableExtensions.cs
index 88f11013..511a784d 100644
--- a/Linq/QueryableExtensions.cs
+++ b/Linq/QueryableExtensions.cs
@@ -1,360 +1,359 @@
-namespace Ecng.Linq
+namespace Ecng.Linq;
+
+using System;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Reflection;
+
+using Ecng.Common;
+
+/// <summary>
+/// Provides extension methods for <see cref="IQueryable{T}"/> to support asynchronous operations and dynamic ordering.
+/// </summary>
+/// <remarks>
+/// This class includes methods to perform operations such as SkipLong, AnyAsync, FirstOrDefaultAsync, CountAsync, and ToArrayAsync.
+/// Furthermore, it provides dynamic ordering methods to order the results by property names.
+/// </remarks>
+public static class QueryableExtensions
 {
-	using System;
-	using System.Linq;
-	using System.Linq.Expressions;
-	using System.Threading;
-	using System.Threading.Tasks;
-	using System.Reflection;
+	/// <summary>
+	/// Skips the specified number of elements in the source sequence.
+	/// </summary>
+	/// <typeparam name="T">The type of the elements.</typeparam>
+	/// <param name="source">The source queryable sequence.</param>
+	/// <param name="count">The number of elements to skip.</param>
+	/// <returns>An <see cref="IQueryable{T}"/> that contains the elements that occur after the specified number of elements.</returns>
+	public static IQueryable<T> SkipLong<T>(this IQueryable<T> source, long count)
+	{
+		if (source is null)
+			throw new ArgumentNullException(nameof(source));
+
+		return source.Provider.CreateQuery<T>(
+			Expression.Call(
+				null,
+				GetMethodInfo(SkipLong, source, count),
+				[source.Expression, Expression.Constant(count)]
+				));
+	}
+
+	/// <summary>
+	/// Asynchronously determines whether a sequence contains any elements.
+	/// </summary>
+	/// <typeparam name="T">The type of the elements.</typeparam>
+	/// <param name="source">The source queryable sequence.</param>
+	/// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
+	/// <returns>A <see cref="ValueTask{Boolean}"/> representing the asynchronous operation. The task result contains true if the sequence contains any elements; otherwise, false.</returns>
+	public static async ValueTask<bool> AnyAsync<T>(this IQueryable<T> source, CancellationToken cancellationToken)
+		=> await source.FirstOrDefaultAsync(cancellationToken) is not null;
+
+	/// <summary>
+	/// Asynchronously returns the first element of a sequence, or a default value if the sequence contains no elements.
+	/// </summary>
+	/// <typeparam name="T">The type of the elements.</typeparam>
+	/// <param name="source">The source queryable sequence.</param>
+	/// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
+	/// <returns>A <see cref="ValueTask{T}"/> representing the asynchronous operation. The task result contains the first element in the sequence or a default value if no element is found.</returns>
+	public static ValueTask<T> FirstOrDefaultAsync<T>(this IQueryable<T> source, CancellationToken cancellationToken)
+		=> source.Provider.Execute<ValueTask<T>>(
+				Expression.Call(
+					null,
+					GetMethodInfo(FirstOrDefaultAsync, source, cancellationToken),
+					[
+						source.Expression,
+						Expression.Constant(cancellationToken),
+					]
+			)
+		);
 
-	using Ecng.Common;
+	/// <summary>
+	/// Dynamically orders the elements of a sequence in ascending order based on a property name.
+	/// </summary>
+	/// <typeparam name="T">The type of the elements.</typeparam>
+	/// <param name="source">The source queryable sequence.</param>
+	/// <param name="propertyName">The property name to order by.</param>
+	/// <param name="ignoreCase">If set to true, ignores case during property name comparison.</param>
+	/// <returns>An <see cref="IOrderedQueryable{T}"/> whose elements are sorted according to the specified property.</returns>
+	public static IOrderedQueryable<T> OrderBy<T>(this IQueryable<T> source, string propertyName, bool ignoreCase)
+		=> ApplyOrder(source, propertyName, ignoreCase, nameof(OrderBy));
 
 	/// <summary>
-	/// Provides extension methods for <see cref="IQueryable{T}"/> to support asynchronous operations and dynamic ordering.
+	/// Dynamically orders the elements of a sequence in descending order based on a property name.
 	/// </summary>
-	/// <remarks>
-	/// This class includes methods to perform operations such as SkipLong, AnyAsync, FirstOrDefaultAsync, CountAsync, and ToArrayAsync.
-	/// Furthermore, it provides dynamic ordering methods to order the results by property names.
-	/// </remarks>
-	public static class QueryableExtensions
+	/// <typeparam name="T">The type of the elements.</typeparam>
+	/// <param name="source">The source queryable sequence.</param>
+	/// <param name="propertyName">The property name to order by.</param>
+	/// <param name="ignoreCase">If set to true, ignores case during property name comparison.</param>
+	/// <returns>An <see cref="IOrderedQueryable{T}"/> whose elements are sorted in descending order according to the specified property.</returns>
+	public static IOrderedQueryable<T> OrderByDescending<T>(this IQueryable<T> source, string propertyName, bool ignoreCase)
+		=> ApplyOrder(source, propertyName, ignoreCase, nameof(OrderByDescending));
+
+	/// <summary>
+	/// Dynamically performs a subsequent ordering of the elements of a sequence in ascending order based on a property name.
+	/// </summary>
+	/// <typeparam name="T">The type of the elements.</typeparam>
+	/// <param name="source">An ordered queryable sequence.</param>
+	/// <param name="propertyName">The property name to order by.</param>
+	/// <param name="ignoreCase">If set to true, ignores case during property name comparison.</param>
+	/// <returns>An <see cref="IOrderedQueryable{T}"/> whose elements are further sorted according to the specified property.</returns>
+	public static IOrderedQueryable<T> ThenBy<T>(this IOrderedQueryable<T> source, string propertyName, bool ignoreCase)
+		=> ApplyOrder(source, propertyName, ignoreCase, nameof(ThenBy));
+
+	/// <summary>
+	/// Dynamically performs a subsequent ordering of the elements of a sequence in descending order based on a property name.
+	/// </summary>
+	/// <typeparam name="T">The type of the elements.</typeparam>
+	/// <param name="source">An ordered queryable sequence.</param>
+	/// <param name="propertyName">The property name to order by.</param>
+	/// <param name="ignoreCase">If set to true, ignores case during property name comparison.</param>
+	/// <returns>An <see cref="IOrderedQueryable{T}"/> whose elements are further sorted in descending order according to the specified property.</returns>
+	public static IOrderedQueryable<T> ThenByDescending<T>(this IOrderedQueryable<T> source, string propertyName, bool ignoreCase)
+		=> ApplyOrder(source, propertyName, ignoreCase, nameof(ThenByDescending));
+
+	// https://stackoverflow.com/a/233505
+	private static IOrderedQueryable<T> ApplyOrder<T>(this IQueryable<T> source, string propertyName, bool ignoreCase, string methodName)
 	{
-		/// <summary>
-		/// Skips the specified number of elements in the source sequence.
-		/// </summary>
-		/// <typeparam name="T">The type of the elements.</typeparam>
-		/// <param name="source">The source queryable sequence.</param>
-		/// <param name="count">The number of elements to skip.</param>
-		/// <returns>An <see cref="IQueryable{T}"/> that contains the elements that occur after the specified number of elements.</returns>
-		public static IQueryable<T> SkipLong<T>(this IQueryable<T> source, long count)
+		var type = typeof(T);
+		var arg = Expression.Parameter(type, "x");
+
+		var flags = BindingFlags.Public | BindingFlags.Instance;
+
+		if (ignoreCase)
+			flags |= BindingFlags.IgnoreCase;
+
+		Expression expr = arg;
+
+		foreach (var prop in propertyName.Split('.'))
 		{
-			if (source is null)
-				throw new ArgumentNullException(nameof(source));
+			var pi = type.GetProperty(prop, flags);
 
-			return source.Provider.CreateQuery<T>(
-				Expression.Call(
-					null,
-					GetMethodInfo(SkipLong, source, count),
-					[source.Expression, Expression.Constant(count)]
-					));
+			if (pi is null)
+				throw new InvalidOperationException($"Type '{type}' doesn't contains {prop} property.");
+
+			expr = Expression.Property(expr, pi);
+			type = pi.PropertyType;
 		}
 
-		/// <summary>
-		/// Asynchronously determines whether a sequence contains any elements.
-		/// </summary>
-		/// <typeparam name="T">The type of the elements.</typeparam>
-		/// <param name="source">The source queryable sequence.</param>
-		/// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
-		/// <returns>A <see cref="ValueTask{Boolean}"/> representing the asynchronous operation. The task result contains true if the sequence contains any elements; otherwise, false.</returns>
-		public static async ValueTask<bool> AnyAsync<T>(this IQueryable<T> source, CancellationToken cancellationToken)
-			=> await source.FirstOrDefaultAsync(cancellationToken) is not null;
-
-		/// <summary>
-		/// Asynchronously returns the first element of a sequence, or a default value if the sequence contains no elements.
-		/// </summary>
-		/// <typeparam name="T">The type of the elements.</typeparam>
-		/// <param name="source">The source queryable sequence.</param>
-		/// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
-		/// <returns>A <see cref="ValueTask{T}"/> representing the asynchronous operation. The task result contains the first element in the sequence or a default value if no element is found.</returns>
-		public static ValueTask<T> FirstOrDefaultAsync<T>(this IQueryable<T> source, CancellationToken cancellationToken)
-			=> source.Provider.Execute<ValueTask<T>>(
-					Expression.Call(
-						null,
-						GetMethodInfo(FirstOrDefaultAsync, source, cancellationToken),
-						[
-							source.Expression,
-							Expression.Constant(cancellationToken),
-						]
-				)
-			);
-
-		/// <summary>
-		/// Dynamically orders the elements of a sequence in ascending order based on a property name.
-		/// </summary>
-		/// <typeparam name="T">The type of the elements.</typeparam>
-		/// <param name="source">The source queryable sequence.</param>
-		/// <param name="propertyName">The property name to order by.</param>
-		/// <param name="ignoreCase">If set to true, ignores case during property name comparison.</param>
-		/// <returns>An <see cref="IOrderedQueryable{T}"/> whose elements are sorted according to the specified property.</returns>
-		public static IOrderedQueryable<T> OrderBy<T>(this IQueryable<T> source, string propertyName, bool ignoreCase)
-			=> ApplyOrder(source, propertyName, ignoreCase, nameof(OrderBy));
-
-		/// <summary>
-		/// Dynamically orders the elements of a sequence in descending order based on a property name.
-		/// </summary>
-		/// <typeparam name="T">The type of the elements.</typeparam>
-		/// <param name="source">The source queryable sequence.</param>
-		/// <param name="propertyName">The property name to order by.</param>
-		/// <param name="ignoreCase">If set to true, ignores case during property name comparison.</param>
-		/// <returns>An <see cref="IOrderedQueryable{T}"/> whose elements are sorted in descending order according to the specified property.</returns>
-		public static IOrderedQueryable<T> OrderByDescending<T>(this IQueryable<T> source, string propertyName, bool ignoreCase)
-			=> ApplyOrder(source, propertyName, ignoreCase, nameof(OrderByDescending));
-
-		/// <summary>
-		/// Dynamically performs a subsequent ordering of the elements of a sequence in ascending order based on a property name.
-		/// </summary>
-		/// <typeparam name="T">The type of the elements.</typeparam>
-		/// <param name="source">An ordered queryable sequence.</param>
-		/// <param name="propertyName">The property name to order by.</param>
-		/// <param name="ignoreCase">If set to true, ignores case during property name comparison.</param>
-		/// <returns>An <see cref="IOrderedQueryable{T}"/> whose elements are further sorted according to the specified property.</returns>
-		public static IOrderedQueryable<T> ThenBy<T>(this IOrderedQueryable<T> source, string propertyName, bool ignoreCase)
-			=> ApplyOrder(source, propertyName, ignoreCase, nameof(ThenBy));
-
-		/// <summary>
-		/// Dynamically performs a subsequent ordering of the elements of a sequence in descending order based on a property name.
-		/// </summary>
-		/// <typeparam name="T">The type of the elements.</typeparam>
-		/// <param name="source">An ordered queryable sequence.</param>
-		/// <param name="propertyName">The property name to order by.</param>
-		/// <param name="ignoreCase">If set to true, ignores case during property name comparison.</param>
-		/// <returns>An <see cref="IOrderedQueryable{T}"/> whose elements are further sorted in descending order according to the specified property.</returns>
-		public static IOrderedQueryable<T> ThenByDescending<T>(this IOrderedQueryable<T> source, string propertyName, bool ignoreCase)
-			=> ApplyOrder(source, propertyName, ignoreCase, nameof(ThenByDescending));
-
-		// https://stackoverflow.com/a/233505
-		private static IOrderedQueryable<T> ApplyOrder<T>(this IQueryable<T> source, string propertyName, bool ignoreCase, string methodName)
-		{
-			var type = typeof(T);
-			var arg = Expression.Parameter(type, "x");
+		var delegateType = typeof(Func<,>).Make(typeof(T), type);
+		var lambda = Expression.Lambda(delegateType, expr, arg);
+
+		object result = typeof(Queryable).GetMethods().Single(
+				method => method.Name == methodName
+						&& method.IsGenericMethodDefinition
+						&& method.GetGenericArguments().Length == 2
+						&& method.GetParameters().Length == 2)
+				.MakeGenericMethod(typeof(T), type)
+				.Invoke(null, [source, lambda]);
+
+		return (IOrderedQueryable<T>)result;
+	}
+
+	/// <summary>
+	/// Asynchronously counts the number of elements in a sequence.
+	/// </summary>
+	/// <typeparam name="T">The type of the elements.</typeparam>
+	/// <param name="source">The source queryable sequence.</param>
+	/// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
+	/// <returns>A <see cref="ValueTask{Long}"/> representing the asynchronous operation. The task result contains the count of elements.</returns>
+	public static ValueTask<long> CountAsync<T>(this IQueryable<T> source, CancellationToken cancellationToken)
+	{
+		if (source is null)
+			throw new ArgumentNullException(nameof(source));
+
+		return source.Provider.Execute<ValueTask<long>>(
+			Expression.Call(
+				null,
+				GetMethodInfo(CountAsync, source, cancellationToken),
+				[source.Expression, Expression.Constant(cancellationToken)]
+				));
+	}
 
-			var flags = BindingFlags.Public | BindingFlags.Instance;
+	/// <summary>
+	/// Asynchronously creates an array from a sequence.
+	/// </summary>
+	/// <typeparam name="T">The type of the elements.</typeparam>
+	/// <param name="source">The source queryable sequence.</param>
+	/// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
+	/// <returns>A <see cref="ValueTask{T}"/> representing the asynchronous operation. The task result contains an array that holds the elements from the sequence.</returns>
+	public static ValueTask<T[]> ToArrayAsync<T>(this IQueryable<T> source, CancellationToken cancellationToken)
+	{
+		if (source is null)
+			throw new ArgumentNullException(nameof(source));
+
+		return source.Provider.Execute<ValueTask<T[]>>(Expression.Call(null, GetMethodInfo(ToArrayAsync, source, cancellationToken),
+		[
+			source.Expression,
+			Expression.Constant(cancellationToken)
+		]));
+	}
 
-			if (ignoreCase)
-				flags |= BindingFlags.IgnoreCase;
+	#region Helper methods to obtain MethodInfo in a safe way
 
-			Expression expr = arg;
+	/// <summary>
+	/// Retrieves the <see cref="MethodInfo"/> for the specified delegate.
+	/// </summary>
+	/// <typeparam name="T1">The type of the delegate parameter.</typeparam>
+	/// <typeparam name="T2">The return type of the delegate.</typeparam>
+	/// <param name="f">The delegate to obtain the method information from.</param>
+	/// <param name="unused1">A parameter used only for type inference.</param>
+	/// <returns>The <see cref="MethodInfo"/> of the delegate.</returns>
+	public static MethodInfo GetMethodInfo<T1, T2>(Func<T1, T2> f, T1 unused1)
+		=> f.Method;
 
-			foreach (var prop in propertyName.Split('.'))
-			{
-				var pi = type.GetProperty(prop, flags);
+	/// <summary>
+	/// Retrieves the <see cref="MethodInfo"/> for the specified delegate.
+	/// </summary>
+	/// <typeparam name="T1">The type of the first delegate parameter.</typeparam>
+	/// <typeparam name="T2">The type of the second delegate parameter.</typeparam>
+	/// <typeparam name="T3">The return type of the delegate.</typeparam>
+	/// <param name="f">The delegate to obtain the method information from.</param>
+	/// <param name="unused1">A parameter used only for type inference.</param>
+	/// <param name="unused2">A parameter used only for type inference.</param>
+	/// <returns>The <see cref="MethodInfo"/> of the delegate.</returns>
+	public static MethodInfo GetMethodInfo<T1, T2, T3>(Func<T1, T2, T3> f, T1 unused1, T2 unused2)
+		=> f.Method;
 
-				if (pi is null)
-					throw new InvalidOperationException($"Type '{type}' doesn't contains {prop} property.");
+	/// <summary>
+	/// Retrieves the <see cref="MethodInfo"/> for the specified delegate.
+	/// </summary>
+	/// <typeparam name="T1">The type of the first delegate parameter.</typeparam>
+	/// <typeparam name="T2">The type of the second delegate parameter.</typeparam>
+	/// <typeparam name="T3">The type of the third delegate parameter.</typeparam>
+	/// <typeparam name="T4">The return type of the delegate.</typeparam>
+	/// <param name="f">The delegate to obtain the method information from.</param>
+	/// <param name="unused1">A parameter used only for type inference.</param>
+	/// <param name="unused2">A parameter used only for type inference.</param>
+	/// <param name="unused3">A parameter used only for type inference.</param>
+	/// <returns>The <see cref="MethodInfo"/> of the delegate.</returns>
+	public static MethodInfo GetMethodInfo<T1, T2, T3, T4>(Func<T1, T2, T3, T4> f, T1 unused1, T2 unused2, T3 unused3)
+		=> f.Method;
 
-				expr = Expression.Property(expr, pi);
-				type = pi.PropertyType;
-			}
+	/// <summary>
+	/// Retrieves the <see cref="MethodInfo"/> for the specified delegate.
+	/// </summary>
+	/// <typeparam name="T1">The type of the first delegate parameter.</typeparam>
+	/// <typeparam name="T2">The type of the second delegate parameter.</typeparam>
+	/// <typeparam name="T3">The type of the third delegate parameter.</typeparam>
+	/// <typeparam name="T4">The type of the fourth delegate parameter.</typeparam>
+	/// <typeparam name="T5">The return type of the delegate.</typeparam>
+	/// <param name="f">The delegate to obtain the method information from.</param>
+	/// <param name="unused1">A parameter used only for type inference.</param>
+	/// <param name="unused2">A parameter used only for type inference.</param>
+	/// <param name="unused3">A parameter used only for type inference.</param>
+	/// <param name="unused4">A parameter used only for type inference.</param>
+	/// <returns>The <see cref="MethodInfo"/> of the delegate.</returns>
+	public static MethodInfo GetMethodInfo<T1, T2, T3, T4, T5>(Func<T1, T2, T3, T4, T5> f, T1 unused1, T2 unused2, T3 unused3, T4 unused4)
+		=> f.Method;
 
-			var delegateType = typeof(Func<,>).Make(typeof(T), type);
-			var lambda = Expression.Lambda(delegateType, expr, arg);
+	/// <summary>
+	/// Retrieves the <see cref="MethodInfo"/> for the specified delegate.
+	/// </summary>
+	/// <typeparam name="T1">The type of the first delegate parameter.</typeparam>
+	/// <typeparam name="T2">The type of the second delegate parameter.</typeparam>
+	/// <typeparam name="T3">The type of the third delegate parameter.</typeparam>
+	/// <typeparam name="T4">The type of the fourth delegate parameter.</typeparam>
+	/// <typeparam name="T5">The type of the fifth delegate parameter.</typeparam>
+	/// <typeparam name="T6">The return type of the delegate.</typeparam>
+	/// <param name="f">The delegate to obtain the method information from.</param>
+	/// <param name="unused1">A parameter used only for type inference.</param>
+	/// <param name="unused2">A parameter used only for type inference.</param>
+	/// <param name="unused3">A parameter used only for type inference.</param>
+	/// <param name="unused4">A parameter used only for type inference.</param>
+	/// <param name="unused5">A parameter used only for type inference.</param>
+	/// <returns>The <see cref="MethodInfo"/> of the delegate.</returns>
+	public static MethodInfo GetMethodInfo<T1, T2, T3, T4, T5, T6>(Func<T1, T2, T3, T4, T5, T6> f, T1 unused1, T2 unused2, T3 unused3, T4 unused4, T5 unused5)
+		=> f.Method;
 
-			object result = typeof(Queryable).GetMethods().Single(
-					method => method.Name == methodName
-							&& method.IsGenericMethodDefinition
-							&& method.GetGenericArguments().Length == 2
-							&& method.GetParameters().Length == 2)
-					.MakeGenericMethod(typeof(T), type)
-					.Invoke(null, [source, lambda]);
+	/// <summary>
+	/// Retrieves the <see cref="MethodInfo"/> for the specified delegate.
+	/// </summary>
+	/// <typeparam name="T1">The type of the delegate parameter.</typeparam>
+	/// <param name="f">The delegate to obtain the method information from.</param>
+	/// <returns>The <see cref="MethodInfo"/> of the delegate.</returns>
+	public static MethodInfo GetMethodInfo<T1>(Action<T1> f)
+		=> f.Method;
 
-			return (IOrderedQueryable<T>)result;
-		}
+	/// <summary>
+	/// Retrieves the <see cref="MethodInfo"/> for the specified delegate.
+	/// </summary>
+	/// <typeparam name="T1">The type of the first delegate parameter.</typeparam>
+	/// <typeparam name="T2">The type of the second delegate parameter.</typeparam>
+	/// <param name="f">The delegate to obtain the method information from.</param>
+	/// <param name="unused1">A parameter used only for type inference.</param>
+	/// <param name="unused2">A parameter used only for type inference.</param>
+	/// <returns>The <see cref="MethodInfo"/> of the delegate.</returns>
+	public static MethodInfo GetMethodInfo<T1, T2>(Action<T1, T2> f, T1 unused1, T2 unused2)
+		=> f.Method;
 
-		/// <summary>
-		/// Asynchronously counts the number of elements in a sequence.
-		/// </summary>
-		/// <typeparam name="T">The type of the elements.</typeparam>
-		/// <param name="source">The source queryable sequence.</param>
-		/// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
-		/// <returns>A <see cref="ValueTask{Long}"/> representing the asynchronous operation. The task result contains the count of elements.</returns>
-		public static ValueTask<long> CountAsync<T>(this IQueryable<T> source, CancellationToken cancellationToken)
-		{
-			if (source is null)
-				throw new ArgumentNullException(nameof(source));
+	/// <summary>
+	/// Retrieves the <see cref="MethodInfo"/> for the specified delegate.
+	/// </summary>
+	/// <typeparam name="T1">The type of the first delegate parameter.</typeparam>
+	/// <typeparam name="T2">The type of the second delegate parameter.</typeparam>
+	/// <typeparam name="T3">The type of the third delegate parameter.</typeparam>
+	/// <param name="f">The delegate to obtain the method information from.</param>
+	/// <param name="unused1">A parameter used only for type inference.</param>
+	/// <param name="unused2">A parameter used only for type inference.</param>
+	/// <param name="unused3">A parameter used only for type inference.</param>
+	/// <returns>The <see cref="MethodInfo"/> of the delegate.</returns>
+	public static MethodInfo GetMethodInfo<T1, T2, T3>(Action<T1, T2, T3> f, T1 unused1, T2 unused2, T3 unused3)
+		=> f.Method;
 
-			return source.Provider.Execute<ValueTask<long>>(
-				Expression.Call(
-					null,
-					GetMethodInfo(CountAsync, source, cancellationToken),
-					[source.Expression, Expression.Constant(cancellationToken)]
-					));
-		}
+	/// <summary>
+	/// Retrieves the <see cref="MethodInfo"/> for the specified delegate.
+	/// </summary>
+	/// <typeparam name="T1">The type of the first delegate parameter.</typeparam>
+	/// <typeparam name="T2">The type of the second delegate parameter.</typeparam>
+	/// <typeparam name="T3">The type of the third delegate parameter.</typeparam>
+	/// <typeparam name="T4">The type of the fourth delegate parameter.</typeparam>
+	/// <param name="f">The delegate to obtain the method information from.</param>
+	/// <param name="unused1">A parameter used only for type inference.</param>
+	/// <param name="unused2">A parameter used only for type inference.</param>
+	/// <param name="unused3">A parameter used only for type inference.</param>
+	/// <param name="unused4">A parameter used only for type inference.</param>
+	/// <returns>The <see cref="MethodInfo"/> of the delegate.</returns>
+	public static MethodInfo GetMethodInfo<T1, T2, T3, T4>(Action<T1, T2, T3, T4> f, T1 unused1, T2 unused2, T3 unused3, T4 unused4)
+		=> f.Method;
 
-		/// <summary>
-		/// Asynchronously creates an array from a sequence.
-		/// </summary>
-		/// <typeparam name="T">The type of the elements.</typeparam>
-		/// <param name="source">The source queryable sequence.</param>
-		/// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
-		/// <returns>A <see cref="ValueTask{T}"/> representing the asynchronous operation. The task result contains an array that holds the elements from the sequence.</returns>
-		public static ValueTask<T[]> ToArrayAsync<T>(this IQueryable<T> source, CancellationToken cancellationToken)
-		{
-			if (source is null)
-				throw new ArgumentNullException(nameof(source));
-
-			return source.Provider.Execute<ValueTask<T[]>>(Expression.Call(null, GetMethodInfo(ToArrayAsync, source, cancellationToken),
-			[
-				source.Expression,
-				Expression.Constant(cancellationToken)
-			]));
-		}
+	/// <summary>
+	/// Retrieves the <see cref="MethodInfo"/> for the specified delegate.
+	/// </summary>
+	/// <typeparam name="T1">The type of the first delegate parameter.</typeparam>
+	/// <typeparam name="T2">The type of the second delegate parameter.</typeparam>
+	/// <typeparam name="T3">The type of the third delegate parameter.</typeparam>
+	/// <typeparam name="T4">The type of the fourth delegate parameter.</typeparam>
+	/// <typeparam name="T5">The type of the fifth delegate parameter.</typeparam>
+	/// <param name="f">The delegate to obtain the method information from.</param>
+	/// <param name="unused1">A parameter used only for type inference.</param>
+	/// <param name="unused2">A parameter used only for type inference.</param>
+	/// <param name="unused3">A parameter used only for type inference.</param>
+	/// <param name="unused4">A parameter used only for type inference.</param>
+	/// <param name="unused5">A parameter used only for type inference.</param>
+	/// <returns>The <see cref="MethodInfo"/> of the delegate.</returns>
+	public static MethodInfo GetMethodInfo<T1, T2, T3, T4, T5>(Action<T1, T2, T3, T4, T5> f, T1 unused1, T2 unused2, T3 unused3, T4 unused4, T5 unused5)
+		=> f.Method;
 
-		#region Helper methods to obtain MethodInfo in a safe way
-
-		/// <summary>
-		/// Retrieves the <see cref="MethodInfo"/> for the specified delegate.
-		/// </summary>
-		/// <typeparam name="T1">The type of the delegate parameter.</typeparam>
-		/// <typeparam name="T2">The return type of the delegate.</typeparam>
-		/// <param name="f">The delegate to obtain the method information from.</param>
-		/// <param name="unused1">A parameter used only for type inference.</param>
-		/// <returns>The <see cref="MethodInfo"/> of the delegate.</returns>
-		public static MethodInfo GetMethodInfo<T1, T2>(Func<T1, T2> f, T1 unused1)
-			=> f.Method;
-
-		/// <summary>
-		/// Retrieves the <see cref="MethodInfo"/> for the specified delegate.
-		/// </summary>
-		/// <typeparam name="T1">The type of the first delegate parameter.</typeparam>
-		/// <typeparam name="T2">The type of the second delegate parameter.</typeparam>
-		/// <typeparam name="T3">The return type of the delegate.</typeparam>
-		/// <param name="f">The delegate to obtain the method information from.</param>
-		/// <param name="unused1">A parameter used only for type inference.</param>
-		/// <param name="unused2">A parameter used only for type inference.</param>
-		/// <returns>The <see cref="MethodInfo"/> of the delegate.</returns>
-		public static MethodInfo GetMethodInfo<T1, T2, T3>(Func<T1, T2, T3> f, T1 unused1, T2 unused2)
-			=> f.Method;
-
-		/// <summary>
-		/// Retrieves the <see cref="MethodInfo"/> for the specified delegate.
-		/// </summary>
-		/// <typeparam name="T1">The type of the first delegate parameter.</typeparam>
-		/// <typeparam name="T2">The type of the second delegate parameter.</typeparam>
-		/// <typeparam name="T3">The type of the third delegate parameter.</typeparam>
-		/// <typeparam name="T4">The return type of the delegate.</typeparam>
-		/// <param name="f">The delegate to obtain the method information from.</param>
-		/// <param name="unused1">A parameter used only for type inference.</param>
-		/// <param name="unused2">A parameter used only for type inference.</param>
-		/// <param name="unused3">A parameter used only for type inference.</param>
-		/// <returns>The <see cref="MethodInfo"/> of the delegate.</returns>
-		public static MethodInfo GetMethodInfo<T1, T2, T3, T4>(Func<T1, T2, T3, T4> f, T1 unused1, T2 unused2, T3 unused3)
-			=> f.Method;
-
-		/// <summary>
-		/// Retrieves the <see cref="MethodInfo"/> for the specified delegate.
-		/// </summary>
-		/// <typeparam name="T1">The type of the first delegate parameter.</typeparam>
-		/// <typeparam name="T2">The type of the second delegate parameter.</typeparam>
-		/// <typeparam name="T3">The type of the third delegate parameter.</typeparam>
-		/// <typeparam name="T4">The type of the fourth delegate parameter.</typeparam>
-		/// <typeparam name="T5">The return type of the delegate.</typeparam>
-		/// <param name="f">The delegate to obtain the method information from.</param>
-		/// <param name="unused1">A parameter used only for type inference.</param>
-		/// <param name="unused2">A parameter used only for type inference.</param>
-		/// <param name="unused3">A parameter used only for type inference.</param>
-		/// <param name="unused4">A parameter used only for type inference.</param>
-		/// <returns>The <see cref="MethodInfo"/> of the delegate.</returns>
-		public static MethodInfo GetMethodInfo<T1, T2, T3, T4, T5>(Func<T1, T2, T3, T4, T5> f, T1 unused1, T2 unused2, T3 unused3, T4 unused4)
-			=> f.Method;
-
-		/// <summary>
-		/// Retrieves the <see cref="MethodInfo"/> for the specified delegate.
-		/// </summary>
-		/// <typeparam name="T1">The type of the first delegate parameter.</typeparam>
-		/// <typeparam name="T2">The type of the second delegate parameter.</typeparam>
-		/// <typeparam name="T3">The type of the third delegate parameter.</typeparam>
-		/// <typeparam name="T4">The type of the fourth delegate parameter.</typeparam>
-		/// <typeparam name="T5">The type of the fifth delegate parameter.</typeparam>
-		/// <typeparam name="T6">The return type of the delegate.</typeparam>
-		/// <param name="f">The delegate to obtain the method information from.</param>
-		/// <param name="unused1">A parameter used only for type inference.</param>
-		/// <param name="unused2">A parameter used only for type inference.</param>
-		/// <param name="unused3">A parameter used only for type inference.</param>
-		/// <param name="unused4">A parameter used only for type inference.</param>
-		/// <param name="unused5">A parameter used only for type inference.</param>
-		/// <returns>The <see cref="MethodInfo"/> of the delegate.</returns>
-		public static MethodInfo GetMethodInfo<T1, T2, T3, T4, T5, T6>(Func<T1, T2, T3, T4, T5, T6> f, T1 unused1, T2 unused2, T3 unused3, T4 unused4, T5 unused5)
-			=> f.Method;
-
-		/// <summary>
-		/// Retrieves the <see cref="MethodInfo"/> for the specified delegate.
-		/// </summary>
-		/// <typeparam name="T1">The type of the delegate parameter.</typeparam>
-		/// <param name="f">The delegate to obtain the method information from.</param>
-		/// <returns>The <see cref="MethodInfo"/> of the delegate.</returns>
-		public static MethodInfo GetMethodInfo<T1>(Action<T1> f)
-			=> f.Method;
-
-		/// <summary>
-		/// Retrieves the <see cref="MethodInfo"/> for the specified delegate.
-		/// </summary>
-		/// <typeparam name="T1">The type of the first delegate parameter.</typeparam>
-		/// <typeparam name="T2">The type of the second delegate parameter.</typeparam>
-		/// <param name="f">The delegate to obtain the method information from.</param>
-		/// <param name="unused1">A parameter used only for type inference.</param>
-		/// <param name="unused2">A parameter used only for type inference.</param>
-		/// <returns>The <see cref="MethodInfo"/> of the delegate.</returns>
-		public static MethodInfo GetMethodInfo<T1, T2>(Action<T1, T2> f, T1 unused1, T2 unused2)
-			=> f.Method;
-
-		/// <summary>
-		/// Retrieves the <see cref="MethodInfo"/> for the specified delegate.
-		/// </summary>
-		/// <typeparam name="T1">The type of the first delegate parameter.</typeparam>
-		/// <typeparam name="T2">The type of the second delegate parameter.</typeparam>
-		/// <typeparam name="T3">The type of the third delegate parameter.</typeparam>
-		/// <param name="f">The delegate to obtain the method information from.</param>
-		/// <param name="unused1">A parameter used only for type inference.</param>
-		/// <param name="unused2">A parameter used only for type inference.</param>
-		/// <param name="unused3">A parameter used only for type inference.</param>
-		/// <returns>The <see cref="MethodInfo"/> of the delegate.</returns>
-		public static MethodInfo GetMethodInfo<T1, T2, T3>(Action<T1, T2, T3> f, T1 unused1, T2 unused2, T3 unused3)
-			=> f.Method;
-
-		/// <summary>
-		/// Retrieves the <see cref="MethodInfo"/> for the specified delegate.
-		/// </summary>
-		/// <typeparam name="T1">The type of the first delegate parameter.</typeparam>
-		/// <typeparam name="T2">The type of the second delegate parameter.</typeparam>
-		/// <typeparam name="T3">The type of the third delegate parameter.</typeparam>
-		/// <typeparam name="T4">The type of the fourth delegate parameter.</typeparam>
-		/// <param name="f">The delegate to obtain the method information from.</param>
-		/// <param name="unused1">A parameter used only for type inference.</param>
-		/// <param name="unused2">A parameter used only for type inference.</param>
-		/// <param name="unused3">A parameter used only for type inference.</param>
-		/// <param name="unused4">A parameter used only for type inference.</param>
-		/// <returns>The <see cref="MethodInfo"/> of the delegate.</returns>
-		public static MethodInfo GetMethodInfo<T1, T2, T3, T4>(Action<T1, T2, T3, T4> f, T1 unused1, T2 unused2, T3 unused3, T4 unused4)
-			=> f.Method;
-
-		/// <summary>
-		/// Retrieves the <see cref="MethodInfo"/> for the specified delegate.
-		/// </summary>
-		/// <typeparam name="T1">The type of the first delegate parameter.</typeparam>
-		/// <typeparam name="T2">The type of the second delegate parameter.</typeparam>
-		/// <typeparam name="T3">The type of the third delegate parameter.</typeparam>
-		/// <typeparam name="T4">The type of the fourth delegate parameter.</typeparam>
-		/// <typeparam name="T5">The type of the fifth delegate parameter.</typeparam>
-		/// <param name="f">The delegate to obtain the method information from.</param>
-		/// <param name="unused1">A parameter used only for type inference.</param>
-		/// <param name="unused2">A parameter used only for type inference.</param>
-		/// <param name="unused3">A parameter used only for type inference.</param>
-		/// <param name="unused4">A parameter used only for type inference.</param>
-		/// <param name="unused5">A parameter used only for type inference.</param>
-		/// <returns>The <see cref="MethodInfo"/> of the delegate.</returns>
-		public static MethodInfo GetMethodInfo<T1, T2, T3, T4, T5>(Action<T1, T2, T3, T4, T5> f, T1 unused1, T2 unused2, T3 unused3, T4 unused4, T5 unused5)
-			=> f.Method;
-
-		/// <summary>
-		/// Retrieves the <see cref="MethodInfo"/> for the specified delegate.
-		/// </summary>
-		/// <typeparam name="T1">The type of the first delegate parameter.</typeparam>
-		/// <typeparam name="T2">The type of the second delegate parameter.</typeparam>
-		/// <typeparam name="T3">The type of the third delegate parameter.</typeparam>
-		/// <typeparam name="T4">The type of the fourth delegate parameter.</typeparam>
-		/// <typeparam name="T5">The type of the fifth delegate parameter.</typeparam>
-		/// <typeparam name="T6">The type of the sixth delegate parameter.</typeparam>
-		/// <param name="f">The delegate to obtain the method information from.</param>
-		/// <param name="unused1">A parameter used only for type inference.</param>
-		/// <param name="unused2">A parameter used only for type inference.</param>
-		/// <param name="unused3">A parameter used only for type inference.</param>
-		/// <param name="unused4">A parameter used only for type inference.</param>
-		/// <param name="unused5">A parameter used only for type inference.</param>
-		/// <param name="unused6">A parameter used only for type inference.</param>
-		/// <returns>The <see cref="MethodInfo"/> of the delegate.</returns>
-		public static MethodInfo GetMethodInfo<T1, T2, T3, T4, T5, T6>(Action<T1, T2, T3, T4, T5, T6> f, T1 unused1, T2 unused2, T3 unused3, T4 unused4, T5 unused5, T6 unused6)
-			=> f.Method;
+	/// <summary>
+	/// Retrieves the <see cref="MethodInfo"/> for the specified delegate.
+	/// </summary>
+	/// <typeparam name="T1">The type of the first delegate parameter.</typeparam>
+	/// <typeparam name="T2">The type of the second delegate parameter.</typeparam>
+	/// <typeparam name="T3">The type of the third delegate parameter.</typeparam>
+	/// <typeparam name="T4">The type of the fourth delegate parameter.</typeparam>
+	/// <typeparam name="T5">The type of the fifth delegate parameter.</typeparam>
+	/// <typeparam name="T6">The type of the sixth delegate parameter.</typeparam>
+	/// <param name="f">The delegate to obtain the method information from.</param>
+	/// <param name="unused1">A parameter used only for type inference.</param>
+	/// <param name="unused2">A parameter used only for type inference.</param>
+	/// <param name="unused3">A parameter used only for type inference.</param>
+	/// <param name="unused4">A parameter used only for type inference.</param>
+	/// <param name="unused5">A parameter used only for type inference.</param>
+	/// <param name="unused6">A parameter used only for type inference.</param>
+	/// <returns>The <see cref="MethodInfo"/> of the delegate.</returns>
+	public static MethodInfo GetMethodInfo<T1, T2, T3, T4, T5, T6>(Action<T1, T2, T3, T4, T5, T6> f, T1 unused1, T2 unused2, T3 unused3, T4 unused4, T5 unused5, T6 unused6)
+		=> f.Method;
 #pragma warning restore IDE0051 // Remove unused private members
 
-		#endregion
-	}
+	#endregion
 }
\ No newline at end of file
diff --git a/Reflection/DefaultConstructorInfo.cs b/Reflection/DefaultConstructorInfo.cs
index 80de9a9d..fee920bd 100644
--- a/Reflection/DefaultConstructorInfo.cs
+++ b/Reflection/DefaultConstructorInfo.cs
@@ -1,187 +1,186 @@
-namespace Ecng.Reflection
+namespace Ecng.Reflection;
+
+#region Using Directives
+
+using System;
+using System.Globalization;
+using System.Reflection;
+
+using Ecng.Common;
+
+#endregion
+
+/// <summary>
+/// Initializes a new instance of the <see cref="T:Ecng.Reflection.DefaultConstructorInfo"/> class.
+/// </summary>
+/// <param name="type">The type.</param>
+public class DefaultConstructorInfo(Type type) : ConstructorInfo
 {
-	#region Using Directives
+	#region Private Fields
+
+	private readonly Type _type = type;
 
-	using System;
-	using System.Globalization;
-	using System.Reflection;
+	#endregion
 
-	using Ecng.Common;
+	#region DefaultConstructorInfo.ctor()
 
 	#endregion
 
+	#region ConstructorInfo Member
+
+	/// <summary>
+	/// Gets the attributes associated with this method.
+	/// </summary>
+	/// <value></value>
+	/// <returns>One of the <see cref="T:System.Reflection.MethodAttributes"></see> values.</returns>
+	public override MethodAttributes Attributes => MethodAttributes.Public;
+
+	/// <summary>
+	/// Gets the class that declares this member.
+	/// </summary>
+	/// <value></value>
+	/// <returns>The Type object for the class that declares this member.</returns>
+	public override Type DeclaringType => _type;
+
+	/// <summary>
+	/// Gets the name of the current member.
+	/// </summary>
+	/// <value></value>
+	/// <returns>A <see cref="T:System.String"></see> containing the name of this member.</returns>
+	public override string Name => ConstructorInfo.ConstructorName;
+
+	/// <summary>
+	/// Gets a handle to the internal metadata representation of a method.
+	/// </summary>
+	/// <value></value>
+	/// <returns>A <see cref="T:System.RuntimeMethodHandle"></see> object.</returns>
+	public override RuntimeMethodHandle MethodHandle => throw new NotSupportedException();
+
+	/// <summary>
+	/// Gets the class object that was used to obtain this instance of <see cref="MemberInfo"/>.
+	/// </summary>
+	/// <value></value>
+	/// <returns>The Type object through which this <see cref="MemberInfo"/> object was obtained.</returns>
+	public override Type ReflectedType => _type;
+
+	/// <summary>
+	/// When implemented in a derived class, invokes the constructor reflected by this <see cref="ConstructorInfo"/> with the specified arguments, under the constraints of the specified Binder.
+	/// </summary>
+	/// <param name="invokeAttr">One of the <see cref="BindingFlags"/> values that specifies the type of binding.</param>
+	/// <param name="binder">A Binder that defines a set of properties and enables the binding, coercion of argument types, and invocation of members using reflection. If binder is null, then Binder.DefaultBinding is used.</param>
+	/// <param name="parameters">An array of type Object used to match the number, order and type of the parameters for this constructor, under the constraints of binder. If this constructor does not require parameters, pass an array with zero elements, as in Object[] parameters = new Object[0]. Any object in this array that is not explicitly initialized with a value will contain the default value for that object type. For reference-type elements, this value is null. For value-type elements, this value is 0, 0.0, or false, depending on the specific element type.</param>
+	/// <param name="culture">A <see cref="T:System.Globalization.CultureInfo"></see> used to govern the coercion of types. If this is null, the <see cref="T:System.Globalization.CultureInfo"></see> for the current thread is used.</param>
+	/// <returns>
+	/// An instance of the class associated with the constructor.
+	/// </returns>
+	/// <exception cref="T:System.Reflection.TargetInvocationException">The invoked constructor throws an exception. </exception>
+	/// <exception cref="T:System.Reflection.TargetParameterCountException">An incorrect number of parameters was passed. </exception>
+	/// <exception cref="T:System.NotSupportedException">Creation of <see cref="T:System.TypedReference"></see>, <see cref="T:System.ArgIterator"></see>, and <see cref="T:System.RuntimeArgumentHandle"></see> types is not supported.</exception>
+	/// <exception cref="T:System.MethodAccessException">The constructor is private or protected, and the caller lacks <see cref="F:System.Security.Permissions.ReflectionPermissionFlag.MemberAccess"></see>. </exception>
+	/// <exception cref="T:System.MemberAccessException">The class is abstract.-or- The constructor is a class initializer. </exception>
+	/// <exception cref="T:System.ArgumentException">The parameters array does not contain values that match the types accepted by this constructor, under the constraints of the binder. </exception>
+	/// <exception cref="T:System.Security.SecurityException">The caller does not have the necessary code access permissions.</exception>
+	public override object Invoke(BindingFlags invokeAttr, Binder binder, object[] parameters, CultureInfo culture)
+	{
+		return _type.CreateInstance();
+	}
+
 	/// <summary>
-	/// Initializes a new instance of the <see cref="T:Ecng.Reflection.DefaultConstructorInfo"/> class.
+	/// When overridden in a derived class, invokes the reflected method or constructor with the given parameters.
 	/// </summary>
-	/// <param name="type">The type.</param>
-	public class DefaultConstructorInfo(Type type) : ConstructorInfo
+	/// <param name="obj">The object on which to invoke the method or constructor. If a method is static, this argument is ignored. If a constructor is static, this argument must be null or an instance of the class that defines the constructor.</param>
+	/// <param name="invokeAttr">A bit mask that is a combination of 0 or more bit flags from <see cref="T:System.Reflection.BindingFlags"></see>. If binder is null, this parameter is assigned the value <see cref="F:System.Reflection.BindingFlags.Default"></see>; thus, whatever you pass in is ignored.</param>
+	/// <param name="binder">An object that enables the binding, coercion of argument types, invocation of members, and retrieval of <see cref="MemberInfo"/> objects via reflection. If binder is null, the default binder is used.</param>
+	/// <param name="parameters">An argument list for the invoked method or constructor. This is an array of objects with the same number, order, and type as the parameters of the method or constructor to be invoked. If there are no parameters, this should be null.If the method or constructor represented by this instance takes a ByRef parameter, there is no special attribute required for that parameter in order to invoke the method or constructor using this function. Any object in this array that is not explicitly initialized with a value will contain the default value for that object type. For reference-type elements, this value is null. For value-type elements, this value is 0, 0.0, or false, depending on the specific element type.</param>
+	/// <param name="culture">An instance of <see cref="CultureInfo"/> used to govern the coercion of types. If this is null, the <see cref="CultureInfo"/> for the current thread is used. (This is necessary to convert a String that represents 1000 to a Double value, for example, since 1000 is represented differently by different cultures.)</param>
+	/// <returns>
+	/// An Object containing the return value of the invoked method, or null in the case of a constructor, or null if the method's return type is void. Before calling the method or constructor, Invoke checks to see if the user has access permission and verify that the parameters are valid.
+	/// </returns>
+	/// <exception cref="T:System.MethodAccessException">The caller does not have permission to execute the constructor. </exception>
+	/// <exception cref="T:System.InvalidOperationException">The type that declares the method is an open generic type. That is, the <see cref="P:System.Type.ContainsGenericParameters"></see> property returns true for the declaring type.</exception>
+	/// <exception cref="T:System.Reflection.TargetInvocationException">The invoked method or constructor throws an exception. </exception>
+	/// <exception cref="T:System.Reflection.TargetParameterCountException">The parameters array does not have the correct number of arguments. </exception>
+	/// <exception cref="T:System.ArgumentException">The type of the parameters parameter does not match the signature of the method or constructor reflected by this instance. </exception>
+	/// <exception cref="T:System.Reflection.TargetException">The obj parameter is null and the method is not static.-or- The method is not declared or inherited by the class of obj. -or-A static constructor is invoked, and obj is neither null nor an instance of the class that declared the constructor.</exception>
+	public override object Invoke(object obj, BindingFlags invokeAttr, Binder binder, object[] parameters, CultureInfo culture)
 	{
-		#region Private Fields
-
-		private readonly Type _type = type;
-
-		#endregion
-
-		#region DefaultConstructorInfo.ctor()
-
-		#endregion
-
-		#region ConstructorInfo Member
-
-		/// <summary>
-		/// Gets the attributes associated with this method.
-		/// </summary>
-		/// <value></value>
-		/// <returns>One of the <see cref="T:System.Reflection.MethodAttributes"></see> values.</returns>
-		public override MethodAttributes Attributes => MethodAttributes.Public;
-
-		/// <summary>
-		/// Gets the class that declares this member.
-		/// </summary>
-		/// <value></value>
-		/// <returns>The Type object for the class that declares this member.</returns>
-		public override Type DeclaringType => _type;
-
-		/// <summary>
-		/// Gets the name of the current member.
-		/// </summary>
-		/// <value></value>
-		/// <returns>A <see cref="T:System.String"></see> containing the name of this member.</returns>
-		public override string Name => ConstructorInfo.ConstructorName;
-
-		/// <summary>
-		/// Gets a handle to the internal metadata representation of a method.
-		/// </summary>
-		/// <value></value>
-		/// <returns>A <see cref="T:System.RuntimeMethodHandle"></see> object.</returns>
-		public override RuntimeMethodHandle MethodHandle => throw new NotSupportedException();
-
-		/// <summary>
-		/// Gets the class object that was used to obtain this instance of <see cref="MemberInfo"/>.
-		/// </summary>
-		/// <value></value>
-		/// <returns>The Type object through which this <see cref="MemberInfo"/> object was obtained.</returns>
-		public override Type ReflectedType => _type;
-
-		/// <summary>
-		/// When implemented in a derived class, invokes the constructor reflected by this <see cref="ConstructorInfo"/> with the specified arguments, under the constraints of the specified Binder.
-		/// </summary>
-		/// <param name="invokeAttr">One of the <see cref="BindingFlags"/> values that specifies the type of binding.</param>
-		/// <param name="binder">A Binder that defines a set of properties and enables the binding, coercion of argument types, and invocation of members using reflection. If binder is null, then Binder.DefaultBinding is used.</param>
-		/// <param name="parameters">An array of type Object used to match the number, order and type of the parameters for this constructor, under the constraints of binder. If this constructor does not require parameters, pass an array with zero elements, as in Object[] parameters = new Object[0]. Any object in this array that is not explicitly initialized with a value will contain the default value for that object type. For reference-type elements, this value is null. For value-type elements, this value is 0, 0.0, or false, depending on the specific element type.</param>
-		/// <param name="culture">A <see cref="T:System.Globalization.CultureInfo"></see> used to govern the coercion of types. If this is null, the <see cref="T:System.Globalization.CultureInfo"></see> for the current thread is used.</param>
-		/// <returns>
-		/// An instance of the class associated with the constructor.
-		/// </returns>
-		/// <exception cref="T:System.Reflection.TargetInvocationException">The invoked constructor throws an exception. </exception>
-		/// <exception cref="T:System.Reflection.TargetParameterCountException">An incorrect number of parameters was passed. </exception>
-		/// <exception cref="T:System.NotSupportedException">Creation of <see cref="T:System.TypedReference"></see>, <see cref="T:System.ArgIterator"></see>, and <see cref="T:System.RuntimeArgumentHandle"></see> types is not supported.</exception>
-		/// <exception cref="T:System.MethodAccessException">The constructor is private or protected, and the caller lacks <see cref="F:System.Security.Permissions.ReflectionPermissionFlag.MemberAccess"></see>. </exception>
-		/// <exception cref="T:System.MemberAccessException">The class is abstract.-or- The constructor is a class initializer. </exception>
-		/// <exception cref="T:System.ArgumentException">The parameters array does not contain values that match the types accepted by this constructor, under the constraints of the binder. </exception>
-		/// <exception cref="T:System.Security.SecurityException">The caller does not have the necessary code access permissions.</exception>
-		public override object Invoke(BindingFlags invokeAttr, Binder binder, object[] parameters, CultureInfo culture)
-		{
-			return _type.CreateInstance();
-		}
-
-		/// <summary>
-		/// When overridden in a derived class, invokes the reflected method or constructor with the given parameters.
-		/// </summary>
-		/// <param name="obj">The object on which to invoke the method or constructor. If a method is static, this argument is ignored. If a constructor is static, this argument must be null or an instance of the class that defines the constructor.</param>
-		/// <param name="invokeAttr">A bit mask that is a combination of 0 or more bit flags from <see cref="T:System.Reflection.BindingFlags"></see>. If binder is null, this parameter is assigned the value <see cref="F:System.Reflection.BindingFlags.Default"></see>; thus, whatever you pass in is ignored.</param>
-		/// <param name="binder">An object that enables the binding, coercion of argument types, invocation of members, and retrieval of <see cref="MemberInfo"/> objects via reflection. If binder is null, the default binder is used.</param>
-		/// <param name="parameters">An argument list for the invoked method or constructor. This is an array of objects with the same number, order, and type as the parameters of the method or constructor to be invoked. If there are no parameters, this should be null.If the method or constructor represented by this instance takes a ByRef parameter, there is no special attribute required for that parameter in order to invoke the method or constructor using this function. Any object in this array that is not explicitly initialized with a value will contain the default value for that object type. For reference-type elements, this value is null. For value-type elements, this value is 0, 0.0, or false, depending on the specific element type.</param>
-		/// <param name="culture">An instance of <see cref="CultureInfo"/> used to govern the coercion of types. If this is null, the <see cref="CultureInfo"/> for the current thread is used. (This is necessary to convert a String that represents 1000 to a Double value, for example, since 1000 is represented differently by different cultures.)</param>
-		/// <returns>
-		/// An Object containing the return value of the invoked method, or null in the case of a constructor, or null if the method's return type is void. Before calling the method or constructor, Invoke checks to see if the user has access permission and verify that the parameters are valid.
-		/// </returns>
-		/// <exception cref="T:System.MethodAccessException">The caller does not have permission to execute the constructor. </exception>
-		/// <exception cref="T:System.InvalidOperationException">The type that declares the method is an open generic type. That is, the <see cref="P:System.Type.ContainsGenericParameters"></see> property returns true for the declaring type.</exception>
-		/// <exception cref="T:System.Reflection.TargetInvocationException">The invoked method or constructor throws an exception. </exception>
-		/// <exception cref="T:System.Reflection.TargetParameterCountException">The parameters array does not have the correct number of arguments. </exception>
-		/// <exception cref="T:System.ArgumentException">The type of the parameters parameter does not match the signature of the method or constructor reflected by this instance. </exception>
-		/// <exception cref="T:System.Reflection.TargetException">The obj parameter is null and the method is not static.-or- The method is not declared or inherited by the class of obj. -or-A static constructor is invoked, and obj is neither null nor an instance of the class that declared the constructor.</exception>
-		public override object Invoke(object obj, BindingFlags invokeAttr, Binder binder, object[] parameters, CultureInfo culture)
-		{
-			return _type.CreateInstance();
-		}
-
-		/// <summary>
-		/// When overridden in a derived class, returns the <see cref="T:System.Reflection.MethodImplAttributes"></see> flags.
-		/// </summary>
-		/// <returns>The <see cref="MethodImplAttributes"/> flags.</returns>
-		public override MethodImplAttributes GetMethodImplementationFlags()
-		{
-			return MethodImplAttributes.Runtime;
-		}
-
-		/// <summary>
-		/// When overridden in a derived class, gets the parameters of the specified method or constructor.
-		/// </summary>
-		/// <returns>
-		/// An array of type <see cref="ParameterInfo"/> containing information that matches the signature of the method (or constructor) reflected by this <see cref="MethodBase"/> instance.
-		/// </returns>
-		public override ParameterInfo[] GetParameters()
-		{
-			return [];
-		}
-
-		/// <summary>
-		/// When overridden in a derived class, returns an array of custom attributes identified by <see cref="T:System.Type"></see>.
-		/// </summary>
-		/// <param name="attributeType">The type of attribute to search for. Only attributes that are assignable to this type are returned.</param>
-		/// <param name="inherit">Specifies whether to search this member's inheritance chain to find the attributes.</param>
-		/// <returns>
-		/// An array of custom attributes applied to this member, or an array with zero (0) elements if no attributes have been applied.
-		/// </returns>
-		/// <exception cref="T:System.ArgumentNullException">If <paramref name="attributeType"/> is null.</exception>
-		/// <exception cref="T:System.TypeLoadException">The custom attribute type cannot be loaded. </exception>
-		public override object[] GetCustomAttributes(Type attributeType, bool inherit)
-		{
-			return [];
-		}
-
-		/// <summary>
-		/// When overridden in a derived class, returns an array containing all the custom attributes.
-		/// </summary>
-		/// <param name="inherit">Specifies whether to search this member's inheritance chain to find the attributes.</param>
-		/// <returns>
-		/// An array that contains all the custom attributes, or an array with zero elements if no attributes are defined.
-		/// </returns>
-		public override object[] GetCustomAttributes(bool inherit)
-		{
-			return [];
-		}
-
-		/// <summary>
-		/// When overridden in a derived class, indicates whether one or more instance of <paramref name="attributeType"/> is applied to this member.
-		/// </summary>
-		/// <param name="attributeType">The Type object to which the custom attributes are applied.</param>
-		/// <param name="inherit">Specifies whether to search this member's inheritance chain to find the attributes.</param>
-		/// <returns>
-		/// true if one or more instance of <paramref name="attributeType"/> is applied to this member; otherwise false.
-		/// </returns>
-		public override bool IsDefined(Type attributeType, bool inherit)
-		{
-			return false;
-		}
-
-		#endregion
-
-		#region Object Members
-
-		/// <summary>
-		/// Returns a <see cref="T:System.String"></see> that represents the current <see cref="T:System.Object"></see>.
-		/// </summary>
-		/// <returns>
-		/// A <see cref="T:System.String"></see> that represents the current <see cref="T:System.Object"></see>.
-		/// </returns>
-		public override string ToString()
-		{
-			return typeof(void).Name + " " + Name + "()";
-		}
-
-		#endregion
+		return _type.CreateInstance();
 	}
+
+	/// <summary>
+	/// When overridden in a derived class, returns the <see cref="T:System.Reflection.MethodImplAttributes"></see> flags.
+	/// </summary>
+	/// <returns>The <see cref="MethodImplAttributes"/> flags.</returns>
+	public override MethodImplAttributes GetMethodImplementationFlags()
+	{
+		return MethodImplAttributes.Runtime;
+	}
+
+	/// <summary>
+	/// When overridden in a derived class, gets the parameters of the specified method or constructor.
+	/// </summary>
+	/// <returns>
+	/// An array of type <see cref="ParameterInfo"/> containing information that matches the signature of the method (or constructor) reflected by this <see cref="MethodBase"/> instance.
+	/// </returns>
+	public override ParameterInfo[] GetParameters()
+	{
+		return [];
+	}
+
+	/// <summary>
+	/// When overridden in a derived class, returns an array of custom attributes identified by <see cref="T:System.Type"></see>.
+	/// </summary>
+	/// <param name="attributeType">The type of attribute to search for. Only attributes that are assignable to this type are returned.</param>
+	/// <param name="inherit">Specifies whether to search this member's inheritance chain to find the attributes.</param>
+	/// <returns>
+	/// An array of custom attributes applied to this member, or an array with zero (0) elements if no attributes have been applied.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentNullException">If <paramref name="attributeType"/> is null.</exception>
+	/// <exception cref="T:System.TypeLoadException">The custom attribute type cannot be loaded. </exception>
+	public override object[] GetCustomAttributes(Type attributeType, bool inherit)
+	{
+		return [];
+	}
+
+	/// <summary>
+	/// When overridden in a derived class, returns an array containing all the custom attributes.
+	/// </summary>
+	/// <param name="inherit">Specifies whether to search this member's inheritance chain to find the attributes.</param>
+	/// <returns>
+	/// An array that contains all the custom attributes, or an array with zero elements if no attributes are defined.
+	/// </returns>
+	public override object[] GetCustomAttributes(bool inherit)
+	{
+		return [];
+	}
+
+	/// <summary>
+	/// When overridden in a derived class, indicates whether one or more instance of <paramref name="attributeType"/> is applied to this member.
+	/// </summary>
+	/// <param name="attributeType">The Type object to which the custom attributes are applied.</param>
+	/// <param name="inherit">Specifies whether to search this member's inheritance chain to find the attributes.</param>
+	/// <returns>
+	/// true if one or more instance of <paramref name="attributeType"/> is applied to this member; otherwise false.
+	/// </returns>
+	public override bool IsDefined(Type attributeType, bool inherit)
+	{
+		return false;
+	}
+
+	#endregion
+
+	#region Object Members
+
+	/// <summary>
+	/// Returns a <see cref="T:System.String"></see> that represents the current <see cref="T:System.Object"></see>.
+	/// </summary>
+	/// <returns>
+	/// A <see cref="T:System.String"></see> that represents the current <see cref="T:System.Object"></see>.
+	/// </returns>
+	public override string ToString()
+	{
+		return typeof(void).Name + " " + Name + "()";
+	}
+
+	#endregion
 }
\ No newline at end of file
diff --git a/Reflection/LazyHelper.cs b/Reflection/LazyHelper.cs
index c34f22d2..930248cb 100644
--- a/Reflection/LazyHelper.cs
+++ b/Reflection/LazyHelper.cs
@@ -1,120 +1,119 @@
-namespace Ecng.Reflection
-{
-	using System;
-	using System.Reflection;
+namespace Ecng.Reflection;
 
-	using Ecng.Common;
-	using Ecng.Collections;
+using System;
+using System.Reflection;
 
-	/// <summary>
-	/// Lazy helper.
-	/// </summary>
-	public static class LazyHelper
+using Ecng.Common;
+using Ecng.Collections;
+
+/// <summary>
+/// Lazy helper.
+/// </summary>
+public static class LazyHelper
+{
+	private static readonly SynchronizedDictionary<object, Delegate> _factories = [];
+	private static readonly SynchronizedDictionary<object, object> _states = [];
+
+	private class Holder<T>
 	{
-		private static readonly SynchronizedDictionary<object, Delegate> _factories = [];
-		private static readonly SynchronizedDictionary<object, object> _states = [];
+		private static readonly FieldInfo _valueFactory;
+		private static readonly FieldInfo _boxed;
+		private static readonly FieldInfo _state;
+		private static readonly FieldInfo _factory;
+		private static readonly FieldInfo _value;
 
-		private class Holder<T>
+		static Holder()
 		{
-			private static readonly FieldInfo _valueFactory;
-			private static readonly FieldInfo _boxed;
-			private static readonly FieldInfo _state;
-			private static readonly FieldInfo _factory;
-			private static readonly FieldInfo _value;
+			static FieldInfo GetField(string name)
+				=> typeof(Lazy<T>).GetField(name, ReflectionHelper.AllInstanceMembers);
 
-			static Holder()
+			if (OperatingSystemEx.IsFramework)
 			{
-				static FieldInfo GetField(string name)
-					=> typeof(Lazy<T>).GetField(name, ReflectionHelper.AllInstanceMembers);
-
-				if (OperatingSystemEx.IsFramework)
-				{
-					_valueFactory = GetField("m_valueFactory");
-					_boxed = GetField("m_boxed");
-				}
-				else
-				{
-					_state = GetField("_state");
-					_factory = GetField("_factory");
-					_value = GetField("_value");
-				}
+				_valueFactory = GetField("m_valueFactory");
+				_boxed = GetField("m_boxed");
 			}
-
-			public static Lazy<T> Track(Lazy<T> lazy)
+			else
 			{
-				if (lazy is null)
-					throw new ArgumentNullException(nameof(lazy));
-
-				if (lazy.IsValueCreated)
-					throw new ArgumentException(nameof(lazy));
+				_state = GetField("_state");
+				_factory = GetField("_factory");
+				_value = GetField("_value");
+			}
+		}
 
-				if (_valueFactory is not null)
-					_factories.Add(lazy, (Delegate)_valueFactory.GetValue(lazy));
-				else
-				{
-					_states.Add(lazy, _state.GetValue(lazy));
-					_factories.Add(lazy, (Delegate)_factory.GetValue(lazy));
-				}
+		public static Lazy<T> Track(Lazy<T> lazy)
+		{
+			if (lazy is null)
+				throw new ArgumentNullException(nameof(lazy));
 
-				return lazy;
-			}
+			if (lazy.IsValueCreated)
+				throw new ArgumentException(nameof(lazy));
 
-			public static void Reset(Lazy<T> lazy)
+			if (_valueFactory is not null)
+				_factories.Add(lazy, (Delegate)_valueFactory.GetValue(lazy));
+			else
 			{
-				if (lazy is null)
-					throw new ArgumentNullException(nameof(lazy));
-
-				var factory = _factories[lazy];
-
-				if (_valueFactory is not null)
-				{
-					_boxed.SetValue(lazy, null);
-					_valueFactory.SetValue(lazy, factory);
-				}
-				else
-				{
-					_state.SetValue(lazy, _states[lazy]);
-					_factory.SetValue(lazy, factory);
-				}
+				_states.Add(lazy, _state.GetValue(lazy));
+				_factories.Add(lazy, (Delegate)_factory.GetValue(lazy));
 			}
 
-			public static void SetValue(Lazy<T> lazy, T value)
-			{
-				if (lazy is null)
-					throw new ArgumentNullException(nameof(lazy));
+			return lazy;
+		}
+
+		public static void Reset(Lazy<T> lazy)
+		{
+			if (lazy is null)
+				throw new ArgumentNullException(nameof(lazy));
 
-				if (_value is null)
-					throw new PlatformNotSupportedException();
+			var factory = _factories[lazy];
 
-				_state.SetValue(lazy, null);
-				_value.SetValue(lazy, value);
+			if (_valueFactory is not null)
+			{
+				_boxed.SetValue(lazy, null);
+				_valueFactory.SetValue(lazy, factory);
+			}
+			else
+			{
+				_state.SetValue(lazy, _states[lazy]);
+				_factory.SetValue(lazy, factory);
 			}
 		}
 
-		/// <summary>
-		/// Tracks the lazy.
-		/// </summary>
-		/// <typeparam name="T">The type of the lazy.</typeparam>
-		/// <param name="lazy">The lazy.</param>
-		/// <returns>The lazy.</returns>
-		public static Lazy<T> Track<T>(this Lazy<T> lazy)
-			=> Holder<T>.Track(lazy);
-
-		/// <summary>
-		/// Resets the lazy.
-		/// </summary>
-		/// <typeparam name="T">The type of the lazy.</typeparam>
-		/// <param name="lazy">The lazy.</param>
-		public static void Reset<T>(this Lazy<T> lazy)
-			=> Holder<T>.Reset(lazy);
-
-		/// <summary>
-		/// Sets the value.
-		/// </summary>
-		/// <typeparam name="T">The type of the lazy.</typeparam>
-		/// <param name="lazy">The lazy.</param>
-		/// <param name="value">Value.</param>
-		public static void SetValue<T>(this Lazy<T> lazy, T value)
-			=> Holder<T>.SetValue(lazy, value);
+		public static void SetValue(Lazy<T> lazy, T value)
+		{
+			if (lazy is null)
+				throw new ArgumentNullException(nameof(lazy));
+
+			if (_value is null)
+				throw new PlatformNotSupportedException();
+
+			_state.SetValue(lazy, null);
+			_value.SetValue(lazy, value);
+		}
 	}
+
+	/// <summary>
+	/// Tracks the lazy.
+	/// </summary>
+	/// <typeparam name="T">The type of the lazy.</typeparam>
+	/// <param name="lazy">The lazy.</param>
+	/// <returns>The lazy.</returns>
+	public static Lazy<T> Track<T>(this Lazy<T> lazy)
+		=> Holder<T>.Track(lazy);
+
+	/// <summary>
+	/// Resets the lazy.
+	/// </summary>
+	/// <typeparam name="T">The type of the lazy.</typeparam>
+	/// <param name="lazy">The lazy.</param>
+	public static void Reset<T>(this Lazy<T> lazy)
+		=> Holder<T>.Reset(lazy);
+
+	/// <summary>
+	/// Sets the value.
+	/// </summary>
+	/// <typeparam name="T">The type of the lazy.</typeparam>
+	/// <param name="lazy">The lazy.</param>
+	/// <param name="value">Value.</param>
+	public static void SetValue<T>(this Lazy<T> lazy, T value)
+		=> Holder<T>.SetValue(lazy, value);
 }
\ No newline at end of file
diff --git a/Reflection/MemberSignature.cs b/Reflection/MemberSignature.cs
index f548f0dc..3a584b06 100644
--- a/Reflection/MemberSignature.cs
+++ b/Reflection/MemberSignature.cs
@@ -1,78 +1,77 @@
-namespace Ecng.Reflection
+namespace Ecng.Reflection;
+
+#region Using Directives
+
+using System;
+using System.Reflection;
+using System.Linq;
+
+using Ecng.Collections;
+using Ecng.Common;
+
+#endregion
+
+/// <summary>
+/// Member signature.
+/// </summary>
+[Serializable]
+public class MemberSignature : Equatable<MemberSignature>
 {
-	#region Using Directives
+	#region MemberSignature.ctor()
 
-	using System;
-	using System.Reflection;
-	using System.Linq;
+	/// <summary>
+	/// Initializes a new instance of the <see cref="T:Ecng.Reflection.MemberSignature"/> class.
+	/// </summary>
+	/// <param name="member">The member.</param>
+	public MemberSignature(MemberInfo member)
+	{
+		Member = member ?? throw new ArgumentNullException(nameof(member));
 
-	using Ecng.Collections;
-	using Ecng.Common;
+		ReturnType = member is ConstructorInfo ? typeof(void) : member.GetMemberType();
+
+		if (member is MethodBase mb)
+			ParamTypes = [.. mb.GetParameterTypes().Select(t => t.type)];
+		else if (member.IsIndexer())
+			ParamTypes = [.. ((PropertyInfo)member).GetIndexerTypes()];
+		else
+			ParamTypes = [];
+	}
 
 	#endregion
 
 	/// <summary>
-	/// Member signature.
+	/// Gets the member.
 	/// </summary>
-	[Serializable]
-	public class MemberSignature : Equatable<MemberSignature>
+	public MemberInfo Member { get; }
+
+	/// <summary>
+	/// Gets or sets the type of the return.
+	/// </summary>
+	/// <value>The type of the return.</value>
+	public Type ReturnType { get; }
+
+	/// <summary>
+	/// Gets or sets the param types.
+	/// </summary>
+	/// <value>The param types.</value>
+	public Type[] ParamTypes { get; }
+
+	/// <inheritdoc />
+	protected override bool OnEquals(MemberSignature other)
 	{
-		#region MemberSignature.ctor()
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="T:Ecng.Reflection.MemberSignature"/> class.
-		/// </summary>
-		/// <param name="member">The member.</param>
-		public MemberSignature(MemberInfo member)
-		{
-			Member = member ?? throw new ArgumentNullException(nameof(member));
-
-			ReturnType = member is ConstructorInfo ? typeof(void) : member.GetMemberType();
-
-			if (member is MethodBase mb)
-				ParamTypes = [.. mb.GetParameterTypes().Select(t => t.type)];
-			else if (member.IsIndexer())
-				ParamTypes = [.. ((PropertyInfo)member).GetIndexerTypes()];
-			else
-				ParamTypes = [];
-		}
-
-		#endregion
-
-		/// <summary>
-		/// Gets the member.
-		/// </summary>
-		public MemberInfo Member { get; }
-
-		/// <summary>
-		/// Gets or sets the type of the return.
-		/// </summary>
-		/// <value>The type of the return.</value>
-		public Type ReturnType { get; }
-
-		/// <summary>
-		/// Gets or sets the param types.
-		/// </summary>
-		/// <value>The param types.</value>
-		public Type[] ParamTypes { get; }
-
-		/// <inheritdoc />
-		protected override bool OnEquals(MemberSignature other)
-		{
-			if (ReturnType != other.ReturnType)
-				return false;
-
-			return ParamTypes.SequenceEqual(other.ParamTypes);
-		}
-
-		/// <inheritdoc />
-		public override int GetHashCode()
-			=> ReturnType.GetHashCode() ^ ParamTypes.GetHashCodeEx();
-
-		/// <inheritdoc />
-		public override MemberSignature Clone()	=> new(Member);
-
-		/// <inheritdoc />
-		public override string ToString() => Member.ToString();
+		if (ReturnType != other.ReturnType)
+			return false;
+
+		return ParamTypes.SequenceEqual(other.ParamTypes);
 	}
+
+	/// <inheritdoc />
+	public override int GetHashCode()
+		=> ReturnType.GetHashCode() ^ ParamTypes.GetHashCodeEx();
+
+	/// <inheritdoc />
+	public override MemberSignature Clone()	=> new(Member);
+
+	/// <inheritdoc />
+	public override string ToString() => Member.ToString();
 }
\ No newline at end of file
diff --git a/Reflection/ReflectionHelper.cs b/Reflection/ReflectionHelper.cs
index 5533c22b..b6c5ba86 100644
--- a/Reflection/ReflectionHelper.cs
+++ b/Reflection/ReflectionHelper.cs
@@ -1,1213 +1,1212 @@
-namespace Ecng.Reflection
+namespace Ecng.Reflection;
+
+using System;
+using System.ComponentModel;
+using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Linq;
+using System.IO;
+using System.Runtime.CompilerServices;
+
+using Ecng.Collections;
+using Ecng.Common;
+
+/// <summary>
+/// Provides helper methods for reflection.
+/// </summary>
+public static class ReflectionHelper
 {
-	using System;
-	using System.ComponentModel;
-	using System.Collections;
-	using System.Collections.Generic;
-	using System.Reflection;
-	using System.Linq;
-	using System.IO;
-	using System.Runtime.CompilerServices;
-
-	using Ecng.Collections;
-	using Ecng.Common;
+	/// <summary>
+	/// Attribute targets for fields and properties.
+	/// </summary>
+	public const AttributeTargets Members = AttributeTargets.Field | AttributeTargets.Property;
 
 	/// <summary>
-	/// Provides helper methods for reflection.
+	/// Attribute targets for classes, structs, and interfaces.
 	/// </summary>
-	public static class ReflectionHelper
-	{
-		/// <summary>
-		/// Attribute targets for fields and properties.
-		/// </summary>
-		public const AttributeTargets Members = AttributeTargets.Field | AttributeTargets.Property;
-
-		/// <summary>
-		/// Attribute targets for classes, structs, and interfaces.
-		/// </summary>
-		public const AttributeTargets Types = AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Interface;
-
-		/// <summary>
-		/// Binding flags for all static members.
-		/// </summary>
-		public const BindingFlags AllStaticMembers = BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic;
-
-		/// <summary>
-		/// Binding flags for all instance members.
-		/// </summary>
-		public const BindingFlags AllInstanceMembers = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
-
-		/// <summary>
-		/// Binding flags for all members.
-		/// </summary>
-		public const BindingFlags AllMembers = AllStaticMembers | AllInstanceMembers;
-
-		#region Public Methods
-
-		/// <summary>
-		/// Gets the invoke method from the specified delegate type.
-		/// </summary>
-		/// <param name="delegType">The delegate type.</param>
-		/// <returns>The MethodInfo representing the Invoke method.</returns>
-		public static MethodInfo GetInvokeMethod(this Type delegType)
-			=> delegType.GetMethod("Invoke");
-
-		#endregion
-
-		#region ProxyTypes
-
-		private static readonly Dictionary<Type, Type> _proxyTypes = [];
-
-		/// <summary>
-		/// Gets the proxy types.
-		/// </summary>
-		public static IDictionary<Type, Type> ProxyTypes => _proxyTypes;
-
-		#endregion
-
-		/// <summary>
-		/// Determines whether the specified parameter is a params array.
-		/// </summary>
-		/// <param name="pi">The parameter info.</param>
-		/// <returns>True if the parameter is marked as params; otherwise, false.</returns>
-		public static bool IsParams(this ParameterInfo pi)
-			=> pi.GetAttribute<ParamArrayAttribute>() != null;
-
-		#region GetParameterTypes
-
-		/// <summary>
-		/// Gets the parameter types for the specified method.
-		/// </summary>
-		/// <param name="method">The method base.</param>
-		/// <returns>An array of tuples with parameter info and its type.</returns>
-		public static (ParameterInfo info, Type type)[] GetParameterTypes(this MethodBase method)
-			=> method.GetParameterTypes(false);
-
-		/// <summary>
-		/// Gets the parameter types for the specified method.
-		/// </summary>
-		/// <param name="method">The method base.</param>
-		/// <param name="removeRef">True to remove reference type wrappers.</param>
-		/// <returns>An array of tuples with parameter info and its type.</returns>
-		public static (ParameterInfo info, Type type)[] GetParameterTypes(this MethodBase method, bool removeRef)
-		{
-			if (method is null)
-				throw new ArgumentNullException(nameof(method));
+	public const AttributeTargets Types = AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Interface;
 
-			return [.. method.GetParameters().Select(param =>
-			{
-				Type paramType;
+	/// <summary>
+	/// Binding flags for all static members.
+	/// </summary>
+	public const BindingFlags AllStaticMembers = BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic;
 
-				if (removeRef && IsOutput(param))
-					paramType = param.ParameterType.GetElementType();
-				else
-					paramType = param.ParameterType;
+	/// <summary>
+	/// Binding flags for all instance members.
+	/// </summary>
+	public const BindingFlags AllInstanceMembers = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
 
-				return (param, paramType);
-			})];
-		}
+	/// <summary>
+	/// Binding flags for all members.
+	/// </summary>
+	public const BindingFlags AllMembers = AllStaticMembers | AllInstanceMembers;
 
-		#endregion
+	#region Public Methods
 
-		#region GetGenericType
+	/// <summary>
+	/// Gets the invoke method from the specified delegate type.
+	/// </summary>
+	/// <param name="delegType">The delegate type.</param>
+	/// <returns>The MethodInfo representing the Invoke method.</returns>
+	public static MethodInfo GetInvokeMethod(this Type delegType)
+		=> delegType.GetMethod("Invoke");
 
-		private static readonly SynchronizedDictionary<(Type, Type), Type> _genericTypeCache = [];
+	#endregion
 
-		/// <summary>
-		/// Gets the generic type from the target type based on the provided generic type definition.
-		/// </summary>
-		/// <param name="targetType">The target type.</param>
-		/// <param name="genericType">The generic type definition.</param>
-		/// <returns>The found generic type or null if not found.</returns>
-		public static Type GetGenericType(this Type targetType, Type genericType)
-		{
-			return _genericTypeCache.GetFromCache(new(targetType, genericType), key => key.Item1.GetGenericTypeInternal(key.Item2));
-		}
+	#region ProxyTypes
 
-		private static Type GetGenericTypeInternal(this Type targetType, Type genericType)
-		{
-			if (targetType is null)
-				throw new ArgumentNullException(nameof(targetType));
+	private static readonly Dictionary<Type, Type> _proxyTypes = [];
 
-			if (genericType is null)
-				throw new ArgumentNullException(nameof(genericType));
+	/// <summary>
+	/// Gets the proxy types.
+	/// </summary>
+	public static IDictionary<Type, Type> ProxyTypes => _proxyTypes;
 
-			if (!genericType.IsGenericTypeDefinition)
-				throw new ArgumentException(nameof(genericType));
+	#endregion
 
-			if (targetType.IsGenericType && targetType.GetGenericTypeDefinition() == genericType)
-				return targetType;
-			else
-			{
-				if (genericType.IsInterface)
-				{
-					var findedInterfaces = targetType.GetInterfaces()
-						.Where(@interface => @interface.IsGenericType && @interface.GetGenericTypeDefinition() == genericType)
-						.ToList();
-
-					if (findedInterfaces.Count > 1)
-						throw new AmbiguousMatchException("Too many interfaces were found.");
-					else if (findedInterfaces.Count == 1)
-						return findedInterfaces[0];
-					else
-						return null;
-				}
-				else
-				{
-					return targetType.BaseType != null ? GetGenericType(targetType.BaseType, genericType) : null;
-				}
-			}
-		}
+	/// <summary>
+	/// Determines whether the specified parameter is a params array.
+	/// </summary>
+	/// <param name="pi">The parameter info.</param>
+	/// <returns>True if the parameter is marked as params; otherwise, false.</returns>
+	public static bool IsParams(this ParameterInfo pi)
+		=> pi.GetAttribute<ParamArrayAttribute>() != null;
 
-		#endregion
+	#region GetParameterTypes
+
+	/// <summary>
+	/// Gets the parameter types for the specified method.
+	/// </summary>
+	/// <param name="method">The method base.</param>
+	/// <returns>An array of tuples with parameter info and its type.</returns>
+	public static (ParameterInfo info, Type type)[] GetParameterTypes(this MethodBase method)
+		=> method.GetParameterTypes(false);
 
-		#region GetGenericTypeArg
+	/// <summary>
+	/// Gets the parameter types for the specified method.
+	/// </summary>
+	/// <param name="method">The method base.</param>
+	/// <param name="removeRef">True to remove reference type wrappers.</param>
+	/// <returns>An array of tuples with parameter info and its type.</returns>
+	public static (ParameterInfo info, Type type)[] GetParameterTypes(this MethodBase method, bool removeRef)
+	{
+		if (method is null)
+			throw new ArgumentNullException(nameof(method));
 
-		/// <summary>
-		/// Gets the specific generic argument type from the target type.
-		/// </summary>
-		/// <param name="targetType">The target type.</param>
-		/// <param name="genericType">The generic type definition.</param>
-		/// <param name="index">The index of the generic argument.</param>
-		/// <returns>The generic argument type.</returns>
-		public static Type GetGenericTypeArg(this Type targetType, Type genericType, int index)
+		return [.. method.GetParameters().Select(param =>
 		{
-			genericType = GetGenericType(targetType, genericType);
+			Type paramType;
 
-			if (genericType is null)
-				throw new ArgumentException(nameof(targetType));
+			if (removeRef && IsOutput(param))
+				paramType = param.ParameterType.GetElementType();
 			else
-				return genericType.GetGenericArguments()[index];
-		}
+				paramType = param.ParameterType;
 
-		#endregion
+			return (param, paramType);
+		})];
+	}
 
-		#region GetIndexer
+	#endregion
 
-		/// <summary>
-		/// The name for indexer members.
-		/// </summary>
-		public const string IndexerName = "Item";
+	#region GetGenericType
 
-		/// <summary>
-		/// Gets the default indexer property of the specified type.
-		/// </summary>
-		/// <param name="type">The type to search.</param>
-		/// <param name="additionalTypes">Additional types to match.</param>
-		/// <returns>The PropertyInfo of the indexer.</returns>
-		public static PropertyInfo GetIndexer(this Type type, params Type[] additionalTypes)
-		{
-			return GetMember<PropertyInfo>(type, IndexerName, AllInstanceMembers, default, additionalTypes);
-		}
+	private static readonly SynchronizedDictionary<(Type, Type), Type> _genericTypeCache = [];
 
-		#endregion
+	/// <summary>
+	/// Gets the generic type from the target type based on the provided generic type definition.
+	/// </summary>
+	/// <param name="targetType">The target type.</param>
+	/// <param name="genericType">The generic type definition.</param>
+	/// <returns>The found generic type or null if not found.</returns>
+	public static Type GetGenericType(this Type targetType, Type genericType)
+	{
+		return _genericTypeCache.GetFromCache(new(targetType, genericType), key => key.Item1.GetGenericTypeInternal(key.Item2));
+	}
+
+	private static Type GetGenericTypeInternal(this Type targetType, Type genericType)
+	{
+		if (targetType is null)
+			throw new ArgumentNullException(nameof(targetType));
+
+		if (genericType is null)
+			throw new ArgumentNullException(nameof(genericType));
 
-		#region GetIndexers
+		if (!genericType.IsGenericTypeDefinition)
+			throw new ArgumentException(nameof(genericType));
 
-		/// <summary>
-		/// Gets all indexer properties of the specified type.
-		/// </summary>
-		/// <param name="type">The type to search.</param>
-		/// <param name="additionalTypes">Additional types to match.</param>
-		/// <returns>An array with the indexer properties.</returns>
-		public static PropertyInfo[] GetIndexers(this Type type, params Type[] additionalTypes)
+		if (targetType.IsGenericType && targetType.GetGenericTypeDefinition() == genericType)
+			return targetType;
+		else
 		{
-			return GetMembers<PropertyInfo>(type, AllInstanceMembers, true, IndexerName, default, additionalTypes);
+			if (genericType.IsInterface)
+			{
+				var findedInterfaces = targetType.GetInterfaces()
+					.Where(@interface => @interface.IsGenericType && @interface.GetGenericTypeDefinition() == genericType)
+					.ToList();
+
+				if (findedInterfaces.Count > 1)
+					throw new AmbiguousMatchException("Too many interfaces were found.");
+				else if (findedInterfaces.Count == 1)
+					return findedInterfaces[0];
+				else
+					return null;
+			}
+			else
+			{
+				return targetType.BaseType != null ? GetGenericType(targetType.BaseType, genericType) : null;
+			}
 		}
+	}
 
-		#endregion
+	#endregion
 
-		#region GetArgTypes
+	#region GetGenericTypeArg
 
-		/// <summary>
-		/// Gets the argument types from the specified argument.
-		/// </summary>
-		/// <typeparam name="TArg">The type of the argument.</typeparam>
-		/// <param name="arg">The argument.</param>
-		/// <returns>An array of argument types.</returns>
-		public static Type[] GetArgTypes<TArg>(TArg arg)
-		{
-			return arg.IsNull() ? Type.EmptyTypes : arg.To<Type[]>();
-		}
+	/// <summary>
+	/// Gets the specific generic argument type from the target type.
+	/// </summary>
+	/// <param name="targetType">The target type.</param>
+	/// <param name="genericType">The generic type definition.</param>
+	/// <param name="index">The index of the generic argument.</param>
+	/// <returns>The generic argument type.</returns>
+	public static Type GetGenericTypeArg(this Type targetType, Type genericType, int index)
+	{
+		genericType = GetGenericType(targetType, genericType);
 
-		#endregion
+		if (genericType is null)
+			throw new ArgumentException(nameof(targetType));
+		else
+			return genericType.GetGenericArguments()[index];
+	}
 
-		#region GetMember
+	#endregion
 
-		/// <summary>
-		/// Gets a constructor member info from the specified type.
-		/// </summary>
-		/// <typeparam name="T">The member type.</typeparam>
-		/// <param name="type">The target type.</param>
-		/// <param name="additionalTypes">Additional types to match.</param>
-		/// <returns>The member info.</returns>
-		public static T GetMember<T>(this Type type, params Type[] additionalTypes)
-			where T : ConstructorInfo
-		{
-			return type.GetMember<T>(".ctor", AllInstanceMembers, default, additionalTypes);
-		}
+	#region GetIndexer
 
-		/// <summary>
-		/// Gets a member info by name from the specified type.
-		/// </summary>
-		/// <typeparam name="T">The member type.</typeparam>
-		/// <param name="type">The target type.</param>
-		/// <param name="memberName">The name of the member.</param>
-		/// <param name="additionalTypes">Additional types to match.</param>
-		/// <returns>The member info.</returns>
-		public static T GetMember<T>(this Type type, string memberName, params Type[] additionalTypes)
-			where T : MemberInfo
-		{
-			return type.GetMember<T>(memberName, AllMembers, default, additionalTypes);
-		}
+	/// <summary>
+	/// The name for indexer members.
+	/// </summary>
+	public const string IndexerName = "Item";
 
-		/// <summary>
-		/// Gets a member info by name with specified binding flags.
-		/// </summary>
-		/// <typeparam name="T">The member type.</typeparam>
-		/// <param name="type">The target type.</param>
-		/// <param name="memberName">The member name.</param>
-		/// <param name="flags">Binding flags to use for lookup.</param>
-		/// <param name="isSetter">Indicates if it's a setter.</param>
-		/// <param name="additionalTypes">Additional types to match.</param>
-		/// <returns>The member info.</returns>
-		public static T GetMember<T>(this Type type, string memberName, BindingFlags flags, bool? isSetter, params Type[] additionalTypes)
-			where T : MemberInfo
-		{
-			if (type is null)
-				throw new ArgumentNullException(nameof(type));
+	/// <summary>
+	/// Gets the default indexer property of the specified type.
+	/// </summary>
+	/// <param name="type">The type to search.</param>
+	/// <param name="additionalTypes">Additional types to match.</param>
+	/// <returns>The PropertyInfo of the indexer.</returns>
+	public static PropertyInfo GetIndexer(this Type type, params Type[] additionalTypes)
+	{
+		return GetMember<PropertyInfo>(type, IndexerName, AllInstanceMembers, default, additionalTypes);
+	}
 
-			if (memberName.IsEmpty())
-				throw new ArgumentNullException(nameof(memberName));
+	#endregion
 
-			var members = type.GetMembers<T>(flags, true, memberName, isSetter, additionalTypes);
+	#region GetIndexers
 
-			if (members.Length > 1)
-				members = [.. FilterMembers(members, isSetter, additionalTypes)];
+	/// <summary>
+	/// Gets all indexer properties of the specified type.
+	/// </summary>
+	/// <param name="type">The type to search.</param>
+	/// <param name="additionalTypes">Additional types to match.</param>
+	/// <returns>An array with the indexer properties.</returns>
+	public static PropertyInfo[] GetIndexers(this Type type, params Type[] additionalTypes)
+	{
+		return GetMembers<PropertyInfo>(type, AllInstanceMembers, true, IndexerName, default, additionalTypes);
+	}
 
-			if (members.Length != 1)
-			{
-				if (members.Length == 2 && members[0] is EventInfo && members[1] is FieldInfo)
-					return members[1];
+	#endregion
 
-				throw new ArgumentException($"Type '{type}' has '{members.Length}' members with name '{memberName}'.");
-			}
+	#region GetArgTypes
 
-			return members[0];
-		}
+	/// <summary>
+	/// Gets the argument types from the specified argument.
+	/// </summary>
+	/// <typeparam name="TArg">The type of the argument.</typeparam>
+	/// <param name="arg">The argument.</param>
+	/// <returns>An array of argument types.</returns>
+	public static Type[] GetArgTypes<TArg>(TArg arg)
+	{
+		return arg.IsNull() ? Type.EmptyTypes : arg.To<Type[]>();
+	}
 
-		#endregion
+	#endregion
 
-		#region GetMembers
+	#region GetMember
 
-		/// <summary>
-		/// Gets members from the type that match the additional types.
-		/// </summary>
-		/// <typeparam name="T">The member type.</typeparam>
-		/// <param name="type">The target type.</param>
-		/// <param name="additionalTypes">Additional types to match.</param>
-		/// <returns>An array of matched members.</returns>
-		public static T[] GetMembers<T>(this Type type, params Type[] additionalTypes)
-			where T : MemberInfo
-		{
-			return type.GetMembers<T>(AllMembers, additionalTypes);
-		}
+	/// <summary>
+	/// Gets a constructor member info from the specified type.
+	/// </summary>
+	/// <typeparam name="T">The member type.</typeparam>
+	/// <param name="type">The target type.</param>
+	/// <param name="additionalTypes">Additional types to match.</param>
+	/// <returns>The member info.</returns>
+	public static T GetMember<T>(this Type type, params Type[] additionalTypes)
+		where T : ConstructorInfo
+	{
+		return type.GetMember<T>(".ctor", AllInstanceMembers, default, additionalTypes);
+	}
 
-		/// <summary>
-		/// Gets members with specified binding flags that match the additional types.
-		/// </summary>
-		/// <typeparam name="T">The member type.</typeparam>
-		/// <param name="type">The target type.</param>
-		/// <param name="flags">Binding flags for lookup.</param>
-		/// <param name="additionalTypes">Additional types to match.</param>
-		/// <returns>An array of matched members.</returns>
-		public static T[] GetMembers<T>(this Type type, BindingFlags flags, params Type[] additionalTypes)
-			where T : MemberInfo
-		{
-			return type.GetMembers<T>(flags, true, additionalTypes);
-		}
+	/// <summary>
+	/// Gets a member info by name from the specified type.
+	/// </summary>
+	/// <typeparam name="T">The member type.</typeparam>
+	/// <param name="type">The target type.</param>
+	/// <param name="memberName">The name of the member.</param>
+	/// <param name="additionalTypes">Additional types to match.</param>
+	/// <returns>The member info.</returns>
+	public static T GetMember<T>(this Type type, string memberName, params Type[] additionalTypes)
+		where T : MemberInfo
+	{
+		return type.GetMember<T>(memberName, AllMembers, default, additionalTypes);
+	}
 
-		/// <summary>
-		/// Gets members with an option for inheritance and additional types matching.
-		/// </summary>
-		/// <typeparam name="T">The member type.</typeparam>
-		/// <param name="type">The target type.</param>
-		/// <param name="flags">Binding flags for lookup.</param>
-		/// <param name="inheritance">True to include inherited members.</param>
-		/// <param name="additionalTypes">Additional types to match.</param>
-		/// <returns>An array of matched members.</returns>
-		public static T[] GetMembers<T>(this Type type, BindingFlags flags, bool inheritance, params Type[] additionalTypes)
-			where T : MemberInfo
+	/// <summary>
+	/// Gets a member info by name with specified binding flags.
+	/// </summary>
+	/// <typeparam name="T">The member type.</typeparam>
+	/// <param name="type">The target type.</param>
+	/// <param name="memberName">The member name.</param>
+	/// <param name="flags">Binding flags to use for lookup.</param>
+	/// <param name="isSetter">Indicates if it's a setter.</param>
+	/// <param name="additionalTypes">Additional types to match.</param>
+	/// <returns>The member info.</returns>
+	public static T GetMember<T>(this Type type, string memberName, BindingFlags flags, bool? isSetter, params Type[] additionalTypes)
+		where T : MemberInfo
+	{
+		if (type is null)
+			throw new ArgumentNullException(nameof(type));
+
+		if (memberName.IsEmpty())
+			throw new ArgumentNullException(nameof(memberName));
+
+		var members = type.GetMembers<T>(flags, true, memberName, isSetter, additionalTypes);
+
+		if (members.Length > 1)
+			members = [.. FilterMembers(members, isSetter, additionalTypes)];
+
+		if (members.Length != 1)
 		{
-			return type.GetMembers<T>(flags, inheritance, null, default, additionalTypes);
+			if (members.Length == 2 && members[0] is EventInfo && members[1] is FieldInfo)
+				return members[1];
+
+			throw new ArgumentException($"Type '{type}' has '{members.Length}' members with name '{memberName}'.");
 		}
 
-		/// <summary>
-		/// Gets members by name with options for inheritance, setter indication, and additional types matching.
-		/// </summary>
-		/// <typeparam name="T">The member type.</typeparam>
-		/// <param name="type">The target type.</param>
-		/// <param name="flags">Binding flags for lookup.</param>
-		/// <param name="inheritance">True to include inherited members.</param>
-		/// <param name="memberName">The member name.</param>
-		/// <param name="isSetter">Indicates if the member is a setter.</param>
-		/// <param name="additionalTypes">Additional types to match.</param>
-		/// <returns>An array of matched members.</returns>
-		public static T[] GetMembers<T>(this Type type, BindingFlags flags, bool inheritance, string memberName, bool? isSetter, params Type[] additionalTypes)
-			where T : MemberInfo
-		{
-			if (type is null)
-				throw new ArgumentNullException(nameof(type));
+		return members[0];
+	}
+
+	#endregion
+
+	#region GetMembers
+
+	/// <summary>
+	/// Gets members from the type that match the additional types.
+	/// </summary>
+	/// <typeparam name="T">The member type.</typeparam>
+	/// <param name="type">The target type.</param>
+	/// <param name="additionalTypes">Additional types to match.</param>
+	/// <returns>An array of matched members.</returns>
+	public static T[] GetMembers<T>(this Type type, params Type[] additionalTypes)
+		where T : MemberInfo
+	{
+		return type.GetMembers<T>(AllMembers, additionalTypes);
+	}
+
+	/// <summary>
+	/// Gets members with specified binding flags that match the additional types.
+	/// </summary>
+	/// <typeparam name="T">The member type.</typeparam>
+	/// <param name="type">The target type.</param>
+	/// <param name="flags">Binding flags for lookup.</param>
+	/// <param name="additionalTypes">Additional types to match.</param>
+	/// <returns>An array of matched members.</returns>
+	public static T[] GetMembers<T>(this Type type, BindingFlags flags, params Type[] additionalTypes)
+		where T : MemberInfo
+	{
+		return type.GetMembers<T>(flags, true, additionalTypes);
+	}
 
-			if (_proxyTypes.TryGetValue(type, out var proxyType))
-				type = proxyType;
+	/// <summary>
+	/// Gets members with an option for inheritance and additional types matching.
+	/// </summary>
+	/// <typeparam name="T">The member type.</typeparam>
+	/// <param name="type">The target type.</param>
+	/// <param name="flags">Binding flags for lookup.</param>
+	/// <param name="inheritance">True to include inherited members.</param>
+	/// <param name="additionalTypes">Additional types to match.</param>
+	/// <returns>An array of matched members.</returns>
+	public static T[] GetMembers<T>(this Type type, BindingFlags flags, bool inheritance, params Type[] additionalTypes)
+		where T : MemberInfo
+	{
+		return type.GetMembers<T>(flags, inheritance, null, default, additionalTypes);
+	}
+
+	/// <summary>
+	/// Gets members by name with options for inheritance, setter indication, and additional types matching.
+	/// </summary>
+	/// <typeparam name="T">The member type.</typeparam>
+	/// <param name="type">The target type.</param>
+	/// <param name="flags">Binding flags for lookup.</param>
+	/// <param name="inheritance">True to include inherited members.</param>
+	/// <param name="memberName">The member name.</param>
+	/// <param name="isSetter">Indicates if the member is a setter.</param>
+	/// <param name="additionalTypes">Additional types to match.</param>
+	/// <returns>An array of matched members.</returns>
+	public static T[] GetMembers<T>(this Type type, BindingFlags flags, bool inheritance, string memberName, bool? isSetter, params Type[] additionalTypes)
+		where T : MemberInfo
+	{
+		if (type is null)
+			throw new ArgumentNullException(nameof(type));
 
-			var members = type.GetMembers<T>(memberName, flags, inheritance);
+		if (_proxyTypes.TryGetValue(type, out var proxyType))
+			type = proxyType;
 
-			if (!members.IsEmpty() && additionalTypes.Length > 0)
-				members = FilterMembers(members, isSetter, additionalTypes);
+		var members = type.GetMembers<T>(memberName, flags, inheritance);
 
-			return [.. members];
-		}
+		if (!members.IsEmpty() && additionalTypes.Length > 0)
+			members = FilterMembers(members, isSetter, additionalTypes);
 
-		private static IEnumerable<T> GetMembers<T>(this Type type, string memberName, BindingFlags flags, bool inheritance)
-			where T : MemberInfo
-		{
-			var members = new Dictionary<(string, MemberTypes, MemberSignature), ICollection<T>>();
+		return [.. members];
+	}
 
-			if (inheritance)
-			{
-				foreach (Type item in type.GetInterfaces().Concat([type] ))
-				{
-					var allMembers = memberName.IsEmpty() ? item.GetMembers(flags) : item.GetMember(memberName, flags);
+	private static IEnumerable<T> GetMembers<T>(this Type type, string memberName, BindingFlags flags, bool inheritance)
+		where T : MemberInfo
+	{
+		var members = new Dictionary<(string, MemberTypes, MemberSignature), ICollection<T>>();
 
-					foreach (var member in allMembers)
-					{
-						if (member is T && member is not Type)
-							members.AddMember(member);
-					}
-				}
-			}
-			else
+		if (inheritance)
+		{
+			foreach (Type item in type.GetInterfaces().Concat([type] ))
 			{
-				var allMembers = memberName.IsEmpty() ? type.GetMembers(flags) : type.GetMember(memberName, flags);
+				var allMembers = memberName.IsEmpty() ? item.GetMembers(flags) : item.GetMember(memberName, flags);
 
 				foreach (var member in allMembers)
 				{
-					if (member is T && member is not Type && member.ReflectedType == type)
+					if (member is T && member is not Type)
 						members.AddMember(member);
 				}
 			}
+		}
+		else
+		{
+			var allMembers = memberName.IsEmpty() ? type.GetMembers(flags) : type.GetMember(memberName, flags);
 
-			if (type.IsValueType && (typeof(T) == typeof(ConstructorInfo) || memberName == ".ctor"))
+			foreach (var member in allMembers)
 			{
-				MemberInfo member = new DefaultConstructorInfo(type);
-				members.AddMember(member);
+				if (member is T && member is not Type && member.ReflectedType == type)
+					members.AddMember(member);
 			}
+		}
 
-			if (inheritance)
+		if (type.IsValueType && (typeof(T) == typeof(ConstructorInfo) || memberName == ".ctor"))
+		{
+			MemberInfo member = new DefaultConstructorInfo(type);
+			members.AddMember(member);
+		}
+
+		if (inheritance)
+		{
+			if (type.BaseType != null)
 			{
-				if (type.BaseType != null)
-				{
-					foreach (var member in type.BaseType.GetMembers<T>(memberName, flags, true))
-						members.AddMember(member);
-				}
+				foreach (var member in type.BaseType.GetMembers<T>(memberName, flags, true))
+					members.AddMember(member);
+			}
 
-				foreach (var pair in members.Where(arg => arg.Value.Count > 1))
+			foreach (var pair in members.Where(arg => arg.Value.Count > 1))
+			{
+				var sortedMembers = pair.Value.OrderBy((x, y) =>
 				{
-					var sortedMembers = pair.Value.OrderBy((x, y) =>
-					{
-						var result = x.ReflectedType.Compare(y.ReflectedType);
+					var result = x.ReflectedType.Compare(y.ReflectedType);
 
-						if (result == 0)
-							result = x.DeclaringType.Compare(y.DeclaringType);
+					if (result == 0)
+						result = x.DeclaringType.Compare(y.DeclaringType);
 
-						return result;
-					}).ToArray();
+					return result;
+				}).ToArray();
 
-					for (var i = 1; i < sortedMembers.Length; i++)
-					{
-						members[pair.Key].Remove(sortedMembers[i]);
-						//members.Remove(pair.Key, sortedMembers[i]);
-					}
-
-					if (members[pair.Key].IsEmpty())
-						members.Remove(pair.Key);
+				for (var i = 1; i < sortedMembers.Length; i++)
+				{
+					members[pair.Key].Remove(sortedMembers[i]);
+					//members.Remove(pair.Key, sortedMembers[i]);
 				}
+
+				if (members[pair.Key].IsEmpty())
+					members.Remove(pair.Key);
 			}
+		}
 
-			var retVal = new List<T>();
+		var retVal = new List<T>();
 
-			foreach (var collection in members.Values)
-				retVal.AddRange(collection);
+		foreach (var collection in members.Values)
+			retVal.AddRange(collection);
 
-			return retVal;
-		}
+		return retVal;
+	}
 
-		private static void AddMember<T>(this Dictionary<(string, MemberTypes, MemberSignature), ICollection<T>> members, MemberInfo member)
-		{
-			if (members is null)
-				throw new ArgumentNullException(nameof(members));
+	private static void AddMember<T>(this Dictionary<(string, MemberTypes, MemberSignature), ICollection<T>> members, MemberInfo member)
+	{
+		if (members is null)
+			throw new ArgumentNullException(nameof(members));
 
-			if (member is null)
-				throw new ArgumentNullException(nameof(member));
+		if (member is null)
+			throw new ArgumentNullException(nameof(member));
 
-			members.SafeAdd(new(member.Name, member.MemberType, new(member)), delegate
-			{
-				return [];
-			}).Add(member.To<T>());
-		}
+		members.SafeAdd(new(member.Name, member.MemberType, new(member)), delegate
+		{
+			return [];
+		}).Add(member.To<T>());
+	}
 
-		#endregion
+	#endregion
 
-		#region FilterMembers
+	#region FilterMembers
 
-		/// <summary>
-		/// Filters members based on setter indication and additional type parameters.
-		/// </summary>
-		/// <typeparam name="T">The member type.</typeparam>
-		/// <param name="members">The collection of members.</param>
-		/// <param name="isSetter">Indicates if filtering by setter should be applied.</param>
-		/// <param name="additionalTypes">Additional types to match.</param>
-		/// <returns>An enumerable of filtered members.</returns>
-		public static IEnumerable<T> FilterMembers<T>(this IEnumerable<T> members, bool? isSetter, params Type[] additionalTypes)
-			where T : MemberInfo
-		{
-			var ms = FilterMembers(members, false, isSetter, additionalTypes);
-			return ms.IsEmpty() ? FilterMembers(members, true, isSetter, additionalTypes) : ms;
-		}
+	/// <summary>
+	/// Filters members based on setter indication and additional type parameters.
+	/// </summary>
+	/// <typeparam name="T">The member type.</typeparam>
+	/// <param name="members">The collection of members.</param>
+	/// <param name="isSetter">Indicates if filtering by setter should be applied.</param>
+	/// <param name="additionalTypes">Additional types to match.</param>
+	/// <returns>An enumerable of filtered members.</returns>
+	public static IEnumerable<T> FilterMembers<T>(this IEnumerable<T> members, bool? isSetter, params Type[] additionalTypes)
+		where T : MemberInfo
+	{
+		var ms = FilterMembers(members, false, isSetter, additionalTypes);
+		return ms.IsEmpty() ? FilterMembers(members, true, isSetter, additionalTypes) : ms;
+	}
 
-		/// <summary>
-		/// Filters members based on inheritance, setter indication, and additional type parameters.
-		/// </summary>
-		/// <typeparam name="T">The member type.</typeparam>
-		/// <param name="members">The collection of members.</param>
-		/// <param name="useInheritance">True to use inheritance comparison.</param>
-		/// <param name="isSetter">Indicates if filtering by setter should be applied.</param>
-		/// <param name="additionalTypes">Additional types to match.</param>
-		/// <returns>An enumerable of filtered members.</returns>
-		public static IEnumerable<T> FilterMembers<T>(this IEnumerable<T> members, bool useInheritance, bool? isSetter, params Type[] additionalTypes)
-			where T : MemberInfo
-		{
-			if (members is null)
-				throw new ArgumentNullException(nameof(members));
+	/// <summary>
+	/// Filters members based on inheritance, setter indication, and additional type parameters.
+	/// </summary>
+	/// <typeparam name="T">The member type.</typeparam>
+	/// <param name="members">The collection of members.</param>
+	/// <param name="useInheritance">True to use inheritance comparison.</param>
+	/// <param name="isSetter">Indicates if filtering by setter should be applied.</param>
+	/// <param name="additionalTypes">Additional types to match.</param>
+	/// <returns>An enumerable of filtered members.</returns>
+	public static IEnumerable<T> FilterMembers<T>(this IEnumerable<T> members, bool useInheritance, bool? isSetter, params Type[] additionalTypes)
+		where T : MemberInfo
+	{
+		if (members is null)
+			throw new ArgumentNullException(nameof(members));
 
-			if (additionalTypes is null)
-				throw new ArgumentNullException(nameof(additionalTypes));
+		if (additionalTypes is null)
+			throw new ArgumentNullException(nameof(additionalTypes));
 
-			return members.Where(arg =>
+		return members.Where(arg =>
+		{
+			if (IsIndexer(arg) && additionalTypes.Length > 0)
 			{
-				if (IsIndexer(arg) && additionalTypes.Length > 0)
-				{
-					var pi = arg.To<PropertyInfo>();
+				var pi = arg.To<PropertyInfo>();
 
-					return GetIndexerTypes(pi).SequenceEqual(isSetter == true ? additionalTypes.Take(additionalTypes.Length - 1) : additionalTypes, (paramType, additionalType) =>
-					{
-						if (additionalType == typeof(void))
-							return true;
-						else
-							return paramType.Compare(additionalType, useInheritance);
-					});
-				}
-				else if (additionalTypes.Length == 1 && (arg is FieldInfo || arg is PropertyInfo || arg is EventInfo))
+				return GetIndexerTypes(pi).SequenceEqual(isSetter == true ? additionalTypes.Take(additionalTypes.Length - 1) : additionalTypes, (paramType, additionalType) =>
 				{
-					return GetMemberType(arg).Compare(additionalTypes[0], useInheritance);
-				}
-				else if (arg is MethodBase mb)
+					if (additionalType == typeof(void))
+						return true;
+					else
+						return paramType.Compare(additionalType, useInheritance);
+				});
+			}
+			else if (additionalTypes.Length == 1 && (arg is FieldInfo || arg is PropertyInfo || arg is EventInfo))
+			{
+				return GetMemberType(arg).Compare(additionalTypes[0], useInheritance);
+			}
+			else if (arg is MethodBase mb)
+			{
+				var tuples = mb.GetParameterTypes(true);
+
+				if (tuples.Length > 0 && tuples.Last().info.IsParams())
 				{
-					var tuples = mb.GetParameterTypes(true);
+					// wrap plain params types into object[]
+					var paramsTypes = additionalTypes.Skip(tuples.Length - 1).ToArray();
 
-					if (tuples.Length > 0 && tuples.Last().info.IsParams())
+					if (paramsTypes.Length > 0)
 					{
-						// wrap plain params types into object[]
-						var paramsTypes = additionalTypes.Skip(tuples.Length - 1).ToArray();
-
-						if (paramsTypes.Length > 0)
-						{
-							additionalTypes = [.. additionalTypes.Take(tuples.Length - 1), tuples.Last().type];
-						}
+						additionalTypes = [.. additionalTypes.Take(tuples.Length - 1), tuples.Last().type];
 					}
-
-					return tuples.Select(t => t.type).SequenceEqual(additionalTypes, (paramType, additionalType) =>
-					{
-						if (additionalType == typeof(void))
-							return true;
-						else
-							return paramType.Compare(additionalType, useInheritance);
-					});
 				}
-				else
-					return false;
-			});
-		}
 
-		#endregion
+				return tuples.Select(t => t.type).SequenceEqual(additionalTypes, (paramType, additionalType) =>
+				{
+					if (additionalType == typeof(void))
+						return true;
+					else
+						return paramType.Compare(additionalType, useInheritance);
+				});
+			}
+			else
+				return false;
+		});
+	}
 
-		#region IsAbstract
+	#endregion
 
-		private static readonly SynchronizedDictionary<MemberInfo, bool> _isAbstractCache = [];
+	#region IsAbstract
 
-		/// <summary>
-		/// Determines whether the specified member is abstract.
-		/// </summary>
-		/// <param name="member">The member info.</param>
-		/// <returns>True if the member is abstract; otherwise, false.</returns>
-		public static bool IsAbstract(this MemberInfo member)
-		{
-			if (member is null)
-				throw new ArgumentNullException(nameof(member));
+	private static readonly SynchronizedDictionary<MemberInfo, bool> _isAbstractCache = [];
+
+	/// <summary>
+	/// Determines whether the specified member is abstract.
+	/// </summary>
+	/// <param name="member">The member info.</param>
+	/// <returns>True if the member is abstract; otherwise, false.</returns>
+	public static bool IsAbstract(this MemberInfo member)
+	{
+		if (member is null)
+			throw new ArgumentNullException(nameof(member));
 
-			return _isAbstractCache.GetFromCache(member, delegate
+		return _isAbstractCache.GetFromCache(member, delegate
+		{
+			return member switch
 			{
-				return member switch
-				{
-					MethodBase mb => mb.IsAbstract,
-					Type type => type.IsAbstract,
-					PropertyInfo prop => (prop.CanRead && prop.GetGetMethod(true).IsAbstract) || (prop.CanWrite && prop.GetSetMethod(true).IsAbstract),
-					EventInfo evt => evt.GetAddMethod(true).IsAbstract || evt.GetRemoveMethod(true).IsAbstract,
-					_ => false,
-				};
-			});
-		}
+				MethodBase mb => mb.IsAbstract,
+				Type type => type.IsAbstract,
+				PropertyInfo prop => (prop.CanRead && prop.GetGetMethod(true).IsAbstract) || (prop.CanWrite && prop.GetSetMethod(true).IsAbstract),
+				EventInfo evt => evt.GetAddMethod(true).IsAbstract || evt.GetRemoveMethod(true).IsAbstract,
+				_ => false,
+			};
+		});
+	}
 
-		#endregion
+	#endregion
 
-		#region IsVirtual
+	#region IsVirtual
 
-		private static readonly SynchronizedDictionary<MemberInfo, bool> _isVirtualCache = [];
+	private static readonly SynchronizedDictionary<MemberInfo, bool> _isVirtualCache = [];
 
-		/// <summary>
-		/// Determines whether the specified member is virtual.
-		/// </summary>
-		/// <param name="member">The member info.</param>
-		/// <returns>True if the member is virtual; otherwise, false.</returns>
-		public static bool IsVirtual(this MemberInfo member)
+	/// <summary>
+	/// Determines whether the specified member is virtual.
+	/// </summary>
+	/// <param name="member">The member info.</param>
+	/// <returns>True if the member is virtual; otherwise, false.</returns>
+	public static bool IsVirtual(this MemberInfo member)
+	{
+		if (member is null)
+			throw new ArgumentNullException(nameof(member));
+
+		return _isVirtualCache.GetFromCache(member, delegate
 		{
-			if (member is null)
-				throw new ArgumentNullException(nameof(member));
+			if (member is MethodBase mb)
+				return mb.IsVirtual;
+			//else if (member is Type type)
+			//	return type.IsVirtual;
+			else if (member is PropertyInfo prop)
+				return (prop.CanRead && prop.GetGetMethod(true).IsVirtual) || (prop.CanWrite && prop.GetSetMethod(true).IsVirtual);
+			else if (member is EventInfo evt)
+				return evt.GetAddMethod(true).IsVirtual || evt.GetRemoveMethod(true).IsVirtual;
+			else
+				return false;
+		});
+	}
 
-			return _isVirtualCache.GetFromCache(member, delegate
-			{
-				if (member is MethodBase mb)
-					return mb.IsVirtual;
-				//else if (member is Type type)
-				//	return type.IsVirtual;
-				else if (member is PropertyInfo prop)
-					return (prop.CanRead && prop.GetGetMethod(true).IsVirtual) || (prop.CanWrite && prop.GetSetMethod(true).IsVirtual);
-				else if (member is EventInfo evt)
-					return evt.GetAddMethod(true).IsVirtual || evt.GetRemoveMethod(true).IsVirtual;
-				else
-					return false;
-			});
-		}
+	#endregion
 
-		#endregion
+	#region IsOverloadable
 
-		#region IsOverloadable
+	/// <summary>
+	/// Determines whether the specified member is overloadable.
+	/// </summary>
+	/// <param name="member">The member info.</param>
+	/// <returns>True if the member is overloadable; otherwise, false.</returns>
+	public static bool IsOverloadable(this MemberInfo member)
+	{
+		if (member is null)
+			throw new ArgumentNullException(nameof(member));
 
-		/// <summary>
-		/// Determines whether the specified member is overloadable.
-		/// </summary>
-		/// <param name="member">The member info.</param>
-		/// <returns>True if the member is overloadable; otherwise, false.</returns>
-		public static bool IsOverloadable(this MemberInfo member)
-		{
-			if (member is null)
-				throw new ArgumentNullException(nameof(member));
+		return member is ConstructorInfo || member.IsAbstract() || member.IsVirtual();
+	}
 
-			return member is ConstructorInfo || member.IsAbstract() || member.IsVirtual();
-		}
+	#endregion
 
-		#endregion
+	#region IsIndexer
 
-		#region IsIndexer
+	/// <summary>
+	/// Determines whether the specified member is an indexer.
+	/// </summary>
+	/// <param name="member">The member info.</param>
+	/// <returns>True if the member is an indexer; otherwise, false.</returns>
+	public static bool IsIndexer(this MemberInfo member)
+	{
+		if (member is PropertyInfo prop)
+			return prop.IsIndexer();
+		else
+			return false;
+	}
 
-		/// <summary>
-		/// Determines whether the specified member is an indexer.
-		/// </summary>
-		/// <param name="member">The member info.</param>
-		/// <returns>True if the member is an indexer; otherwise, false.</returns>
-		public static bool IsIndexer(this MemberInfo member)
-		{
-			if (member is PropertyInfo prop)
-				return prop.IsIndexer();
-			else
-				return false;
-		}
+	/// <summary>
+	/// Determines whether the specified property is an indexer.
+	/// </summary>
+	/// <param name="property">The property info.</param>
+	/// <returns>True if the property is an indexer; otherwise, false.</returns>
+	public static bool IsIndexer(this PropertyInfo property)
+	{
+		if (property is null)
+			throw new ArgumentNullException(nameof(property));
 
-		/// <summary>
-		/// Determines whether the specified property is an indexer.
-		/// </summary>
-		/// <param name="property">The property info.</param>
-		/// <returns>True if the property is an indexer; otherwise, false.</returns>
-		public static bool IsIndexer(this PropertyInfo property)
-		{
-			if (property is null)
-				throw new ArgumentNullException(nameof(property));
+		return property.GetIndexParameters().Length > 0;
+	}
 
-			return property.GetIndexParameters().Length > 0;
-		}
+	#endregion
 
-		#endregion
+	#region GetIndexerTypes
 
-		#region GetIndexerTypes
+	/// <summary>
+	/// Gets the types of the parameters of the indexer property.
+	/// </summary>
+	/// <param name="property">The indexer property.</param>
+	/// <returns>An enumerable of parameter types.</returns>
+	public static IEnumerable<Type> GetIndexerTypes(this PropertyInfo property)
+	{
+		if (property is null)
+			throw new ArgumentNullException(nameof(property));
 
-		/// <summary>
-		/// Gets the types of the parameters of the indexer property.
-		/// </summary>
-		/// <param name="property">The indexer property.</param>
-		/// <returns>An enumerable of parameter types.</returns>
-		public static IEnumerable<Type> GetIndexerTypes(this PropertyInfo property)
-		{
-			if (property is null)
-				throw new ArgumentNullException(nameof(property));
+		var accessor = property.GetGetMethod(true) ?? property.GetSetMethod(true);
 
-			var accessor = property.GetGetMethod(true) ?? property.GetSetMethod(true);
+		if (accessor is null)
+			throw new ArgumentException(nameof(property), "No any accessors.");
 
-			if (accessor is null)
-				throw new ArgumentException(nameof(property), "No any accessors.");
+		return accessor.GetParameterTypes().Select(t => t.type);
+	}
 
-			return accessor.GetParameterTypes().Select(t => t.type);
-		}
+	#endregion
 
-		#endregion
+	#region MemberIs
 
-		#region MemberIs
+	/// <summary>
+	/// Determines whether the member has one of the specified member types.
+	/// </summary>
+	/// <param name="member">The member info.</param>
+	/// <param name="types">The member types to check.</param>
+	/// <returns>True if the member matches one of the types; otherwise, false.</returns>
+	public static bool MemberIs(this MemberInfo member, params MemberTypes[] types)
+	{
+		if (member is null)
+			throw new ArgumentNullException(nameof(member));
 
-		/// <summary>
-		/// Determines whether the member has one of the specified member types.
-		/// </summary>
-		/// <param name="member">The member info.</param>
-		/// <param name="types">The member types to check.</param>
-		/// <returns>True if the member matches one of the types; otherwise, false.</returns>
-		public static bool MemberIs(this MemberInfo member, params MemberTypes[] types)
-		{
-			if (member is null)
-				throw new ArgumentNullException(nameof(member));
+		return types.Any(type => member.MemberType == type);
+	}
 
-			return types.Any(type => member.MemberType == type);
-		}
+	#endregion
 
-		#endregion
+	#region IsOutput
 
-		#region IsOutput
+	/// <summary>
+	/// Determines whether the specified parameter is an output parameter.
+	/// </summary>
+	/// <param name="param">The parameter info.</param>
+	/// <returns>True if the parameter is output; otherwise, false.</returns>
+	public static bool IsOutput(this ParameterInfo param)
+	{
+		if (param is null)
+			throw new ArgumentNullException(nameof(param));
 
-		/// <summary>
-		/// Determines whether the specified parameter is an output parameter.
-		/// </summary>
-		/// <param name="param">The parameter info.</param>
-		/// <returns>True if the parameter is output; otherwise, false.</returns>
-		public static bool IsOutput(this ParameterInfo param)
-		{
-			if (param is null)
-				throw new ArgumentNullException(nameof(param));
+		return param.IsOut || param.ParameterType.IsByRef;
+	}
 
-			return param.IsOut || param.ParameterType.IsByRef;
-		}
+	#endregion
 
-		#endregion
+	#region GetMemberType
 
-		#region GetMemberType
+	/// <summary>
+	/// Gets the type associated with the member.
+	/// </summary>
+	/// <param name="member">The member info.</param>
+	/// <returns>The type of the member.</returns>
+	public static Type GetMemberType(this MemberInfo member)
+	{
+		if (member is null)
+			throw new ArgumentNullException(nameof(member));
 
-		/// <summary>
-		/// Gets the type associated with the member.
-		/// </summary>
-		/// <param name="member">The member info.</param>
-		/// <returns>The type of the member.</returns>
-		public static Type GetMemberType(this MemberInfo member)
+		return member switch
 		{
-			if (member is null)
-				throw new ArgumentNullException(nameof(member));
+			PropertyInfo pi => pi.PropertyType,
+			FieldInfo fi => fi.FieldType,
+			MethodInfo mi => mi.ReturnType,
+			EventInfo ei => ei.EventHandlerType,
+			ConstructorInfo _ => member.ReflectedType,
+			_ => throw new ArgumentOutOfRangeException(nameof(member), member.To<string>()),
+		};
+	}
 
-			return member switch
-			{
-				PropertyInfo pi => pi.PropertyType,
-				FieldInfo fi => fi.FieldType,
-				MethodInfo mi => mi.ReturnType,
-				EventInfo ei => ei.EventHandlerType,
-				ConstructorInfo _ => member.ReflectedType,
-				_ => throw new ArgumentOutOfRangeException(nameof(member), member.To<string>()),
-			};
-		}
+	#endregion
 
-		#endregion
+	#region IsCollection
 
-		#region IsCollection
+	private static readonly SynchronizedDictionary<Type, bool> _isCollectionCache = [];
 
-		private static readonly SynchronizedDictionary<Type, bool> _isCollectionCache = [];
+	/// <summary>
+	/// Determines whether the specified type is a collection.
+	/// </summary>
+	/// <param name="type">The type to check.</param>
+	/// <returns>True if the type is a collection; otherwise, false.</returns>
+	public static bool IsCollection(this Type type)
+	{
+		if (type is null)
+			throw new ArgumentNullException(nameof(type));
 
-		/// <summary>
-		/// Determines whether the specified type is a collection.
-		/// </summary>
-		/// <param name="type">The type to check.</param>
-		/// <returns>True if the type is a collection; otherwise, false.</returns>
-		public static bool IsCollection(this Type type)
+		return _isCollectionCache.GetFromCache(type, delegate
 		{
-			if (type is null)
-				throw new ArgumentNullException(nameof(type));
+			return type.Is<ICollection>()
+						|| type.GetGenericType(typeof(ICollection<>)) != null
+						|| type.Is<IEnumerable>()
+						|| type.GetGenericType(typeof(IEnumerable<>)) != null;
+		});
 
-			return _isCollectionCache.GetFromCache(type, delegate
-			{
-				return type.Is<ICollection>()
-							|| type.GetGenericType(typeof(ICollection<>)) != null
-							|| type.Is<IEnumerable>()
-							|| type.GetGenericType(typeof(IEnumerable<>)) != null;
-			});
 
+	}
 
-		}
+	#endregion
 
-		#endregion
+	#region IsStatic
 
-		#region IsStatic
+	private static readonly SynchronizedDictionary<MemberInfo, bool> _isStaticCache = [];
 
-		private static readonly SynchronizedDictionary<MemberInfo, bool> _isStaticCache = [];
+	/// <summary>
+	/// Determines whether the specified member is static.
+	/// </summary>
+	/// <param name="member">The member info.</param>
+	/// <returns>True if the member is static; otherwise, false.</returns>
+	public static bool IsStatic(this MemberInfo member)
+	{
+		if (member is null)
+			throw new ArgumentNullException(nameof(member));
 
-		/// <summary>
-		/// Determines whether the specified member is static.
-		/// </summary>
-		/// <param name="member">The member info.</param>
-		/// <returns>True if the member is static; otherwise, false.</returns>
-		public static bool IsStatic(this MemberInfo member)
+		return _isStaticCache.GetFromCache(member, delegate
 		{
-			if (member is null)
-				throw new ArgumentNullException(nameof(member));
-
-			return _isStaticCache.GetFromCache(member, delegate
+			if (member is MethodBase mb)
+				return mb.IsStatic;
+			else if (member is PropertyInfo prop)
 			{
-				if (member is MethodBase mb)
-					return mb.IsStatic;
-				else if (member is PropertyInfo prop)
-				{
-					if (prop.CanRead)
-						return IsStatic(prop.GetGetMethod(true));
-					else if (prop.CanWrite)
-						return IsStatic(prop.GetSetMethod(true));
-					else
-						throw new ArgumentOutOfRangeException(nameof(member), member.To<string>());
-				}
-				else if (member is FieldInfo fi)
-					return fi.IsStatic;
-				else if (member is EventInfo evt)
-					return IsStatic(evt.GetAddMethod(true));
-				else if (member is Type type)
-					return type.IsAbstract && type.IsSealed;
+				if (prop.CanRead)
+					return IsStatic(prop.GetGetMethod(true));
+				else if (prop.CanWrite)
+					return IsStatic(prop.GetSetMethod(true));
 				else
 					throw new ArgumentOutOfRangeException(nameof(member), member.To<string>());
-			});
-		}
+			}
+			else if (member is FieldInfo fi)
+				return fi.IsStatic;
+			else if (member is EventInfo evt)
+				return IsStatic(evt.GetAddMethod(true));
+			else if (member is Type type)
+				return type.IsAbstract && type.IsSealed;
+			else
+				throw new ArgumentOutOfRangeException(nameof(member), member.To<string>());
+		});
+	}
 
-		#endregion
+	#endregion
 
-		#region GetItemType
+	#region GetItemType
 
-		[MethodImpl(MethodImplOptions.NoInlining)]
-		private static Type TryGetAsyncEnumerableItem(this Type collectionType)
+	[MethodImpl(MethodImplOptions.NoInlining)]
+	private static Type TryGetAsyncEnumerableItem(this Type collectionType)
+	{
+		try
 		{
-			try
-			{
-				return collectionType.GetGenericType(typeof(IAsyncEnumerable<>));
-			}
-			catch (FileNotFoundException)
-			{
-				return null;
-			}
+			return collectionType.GetGenericType(typeof(IAsyncEnumerable<>));
 		}
-
-		private static readonly SynchronizedDictionary<Type, Type> _getItemTypeCache = [];
-
-		/// <summary>
-		/// Gets the item type for a collection type.
-		/// </summary>
-		/// <param name="collectionType">The collection type.</param>
-		/// <returns>The item type contained in the collection.</returns>
-		public static Type GetItemType(this Type collectionType)
+		catch (FileNotFoundException)
 		{
-			if (collectionType is null)
-				throw new ArgumentNullException(nameof(collectionType));
+			return null;
+		}
+	}
 
-			return _getItemTypeCache.GetFromCache(collectionType, delegate
-			{
-				var interfaceType =
-					collectionType.GetGenericType(typeof(ICollection<>)) ??
-					collectionType.GetGenericType(typeof(IEnumerable<>)) ??
-					collectionType.TryGetAsyncEnumerableItem();
+	private static readonly SynchronizedDictionary<Type, Type> _getItemTypeCache = [];
 
-				if (interfaceType != null)
-					return interfaceType.GetGenericArguments()[0];
-				else
-					throw new InvalidOperationException($"Type '{collectionType}' isn't collection.");
-			});
-		}
+	/// <summary>
+	/// Gets the item type for a collection type.
+	/// </summary>
+	/// <param name="collectionType">The collection type.</param>
+	/// <returns>The item type contained in the collection.</returns>
+	public static Type GetItemType(this Type collectionType)
+	{
+		if (collectionType is null)
+			throw new ArgumentNullException(nameof(collectionType));
 
-		#endregion
-
-		/// <summary>
-		/// Getters prefix.
-		/// </summary>
-		public const string GetPrefix = "get_";
-
-		/// <summary>
-		/// Setters prefix.
-		/// </summary>
-		public const string SetPrefix = "set_";
-
-		/// <summary>
-		/// Adders prefix.
-		/// </summary>
-		public const string AddPrefix = "add_";
-
-		/// <summary>
-		/// Removers prefix.
-		/// </summary>
-		public const string RemovePrefix = "remove_";
-
-		#region MakePropertyName
-
-		/// <summary>
-		/// Makes the property name from the accessor name.
-		/// </summary>
-		/// <param name="accessorName">The accessor name.</param>
-		/// <returns>
-		/// The property name.</returns>
-		public static string MakePropertyName(this string accessorName)
+		return _getItemTypeCache.GetFromCache(collectionType, delegate
 		{
-			return accessorName.ThrowIfEmpty(nameof(accessorName))
-							.Remove(GetPrefix)
-							.Remove(SetPrefix)
-							.Remove(AddPrefix)
-							.Remove(RemovePrefix);
-		}
-
-		#endregion
+			var interfaceType =
+				collectionType.GetGenericType(typeof(ICollection<>)) ??
+				collectionType.GetGenericType(typeof(IEnumerable<>)) ??
+				collectionType.TryGetAsyncEnumerableItem();
 
-		#region GetAccessorOwner
+			if (interfaceType != null)
+				return interfaceType.GetGenericArguments()[0];
+			else
+				throw new InvalidOperationException($"Type '{collectionType}' isn't collection.");
+		});
+	}
 
-		private static readonly SynchronizedDictionary<MethodInfo, MemberInfo> _getAccessorOwnerCache = [];
+	#endregion
 
-		/// <summary>
-		/// Gets the owner of the accessor method.
-		/// </summary>
-		/// <param name="method"></param>
-		/// <returns></returns>
-		public static MemberInfo GetAccessorOwner(this MethodInfo method)
-		{
-			if (method is null)
-				throw new ArgumentNullException(nameof(method));
+	/// <summary>
+	/// Getters prefix.
+	/// </summary>
+	public const string GetPrefix = "get_";
 
-			return _getAccessorOwnerCache.GetFromCache(method, delegate
-			{
-				var flags = method.IsStatic ? AllStaticMembers : AllInstanceMembers;
+	/// <summary>
+	/// Setters prefix.
+	/// </summary>
+	public const string SetPrefix = "set_";
 
-				if (method.Name.Contains(GetPrefix) || method.Name.Contains(SetPrefix))
-				{
-					var name = MakePropertyName(method.Name);
+	/// <summary>
+	/// Adders prefix.
+	/// </summary>
+	public const string AddPrefix = "add_";
 
-					return GetMembers<PropertyInfo>(method.ReflectedType, flags, true, name, default)
-						.FirstOrDefault(property => property.GetGetMethod(true) == method || property.GetSetMethod(true) == method);
-				}
-				else if (method.Name.Contains(AddPrefix) || method.Name.Contains(RemovePrefix))
-				{
-					var name = MakePropertyName(method.Name);
+	/// <summary>
+	/// Removers prefix.
+	/// </summary>
+	public const string RemovePrefix = "remove_";
 
-					return GetMembers<EventInfo>(method.ReflectedType, flags, true, name, default)
-						.FirstOrDefault(@event => @event.GetAddMethod(true) == method || @event.GetRemoveMethod(true) == method);
-				}
+	#region MakePropertyName
 
-				return null;
-			});
-		}
+	/// <summary>
+	/// Makes the property name from the accessor name.
+	/// </summary>
+	/// <param name="accessorName">The accessor name.</param>
+	/// <returns>
+	/// The property name.</returns>
+	public static string MakePropertyName(this string accessorName)
+	{
+		return accessorName.ThrowIfEmpty(nameof(accessorName))
+						.Remove(GetPrefix)
+						.Remove(SetPrefix)
+						.Remove(AddPrefix)
+						.Remove(RemovePrefix);
+	}
 
-		#endregion
+	#endregion
 
-		/// <summary>
-		/// Makes the generic method.
-		/// </summary>
-		/// <param name="method"></param>
-		/// <param name="types"></param>
-		/// <returns></returns>
-		public static MethodInfo Make(this MethodInfo method, params Type[] types)
-		{
-			if (method is null)
-				throw new ArgumentNullException(nameof(method));
+	#region GetAccessorOwner
 
-			return method.MakeGenericMethod(types);
-		}
+	private static readonly SynchronizedDictionary<MethodInfo, MemberInfo> _getAccessorOwnerCache = [];
 
-		/// <summary>
-		/// Makes the generic method.
-		/// </summary>
-		/// <param name="type"></param>
-		/// <returns></returns>
-		public static bool IsRuntimeType(this Type type)
-		{
-			return type.BaseType == typeof(Type);
-		}
+	/// <summary>
+	/// Gets the owner of the accessor method.
+	/// </summary>
+	/// <param name="method"></param>
+	/// <returns></returns>
+	public static MemberInfo GetAccessorOwner(this MethodInfo method)
+	{
+		if (method is null)
+			throw new ArgumentNullException(nameof(method));
 
-		/// <summary>
-		/// Determines whether the specified type is an assembly.
-		/// </summary>
-		/// <param name="dllName"></param>
-		/// <returns></returns>
-		public static bool IsAssembly(this string dllName)
+		return _getAccessorOwnerCache.GetFromCache(method, delegate
 		{
-			return dllName.VerifyAssembly() != null;
-		}
+			var flags = method.IsStatic ? AllStaticMembers : AllInstanceMembers;
 
-		/// <summary>
-		/// Verifies the assembly.
-		/// </summary>
-		/// <param name="dllName"></param>
-		/// <returns></returns>
-		public static AssemblyName VerifyAssembly(this string dllName)
-		{
-			try
+			if (method.Name.Contains(GetPrefix) || method.Name.Contains(SetPrefix))
 			{
-				return AssemblyName.GetAssemblyName(dllName);
+				var name = MakePropertyName(method.Name);
+
+				return GetMembers<PropertyInfo>(method.ReflectedType, flags, true, name, default)
+					.FirstOrDefault(property => property.GetGetMethod(true) == method || property.GetSetMethod(true) == method);
 			}
-			catch (BadImageFormatException)
+			else if (method.Name.Contains(AddPrefix) || method.Name.Contains(RemovePrefix))
 			{
-				return null;
+				var name = MakePropertyName(method.Name);
+
+				return GetMembers<EventInfo>(method.ReflectedType, flags, true, name, default)
+					.FirstOrDefault(@event => @event.GetAddMethod(true) == method || @event.GetRemoveMethod(true) == method);
 			}
-		}
 
-		/// <summary>
-		/// Is cache enabled.
-		/// </summary>
-		public static bool CacheEnabled { get; set; } = true;
+			return null;
+		});
+	}
 
-		/// <summary>
-		/// Clear cache.
-		/// </summary>
-		public static void ClearCache()
-		{
-			_genericTypeCache.Clear();
-			_getAccessorOwnerCache.Clear();
-			_getItemTypeCache.Clear();
-			_isAbstractCache.Clear();
-			_isCollectionCache.Clear();
-			_isStaticCache.Clear();
-			_isVirtualCache.Clear();
-		}
+	#endregion
 
-		private static TValue GetFromCache<TKey, TValue>(this SynchronizedDictionary<TKey, TValue> cache, TKey key, Func<TKey, TValue> createValue)
-		{
-			if (!CacheEnabled)
-				return createValue(key);
+	/// <summary>
+	/// Makes the generic method.
+	/// </summary>
+	/// <param name="method"></param>
+	/// <param name="types"></param>
+	/// <returns></returns>
+	public static MethodInfo Make(this MethodInfo method, params Type[] types)
+	{
+		if (method is null)
+			throw new ArgumentNullException(nameof(method));
 
-			return cache.SafeAdd(key, createValue);
-		}
+		return method.MakeGenericMethod(types);
+	}
+
+	/// <summary>
+	/// Makes the generic method.
+	/// </summary>
+	/// <param name="type"></param>
+	/// <returns></returns>
+	public static bool IsRuntimeType(this Type type)
+	{
+		return type.BaseType == typeof(Type);
+	}
 
-		/// <summary>
-		/// Find all <typeparamref name="T"/> implementation in the specified assembly.
-		/// </summary>
-		/// <typeparam name="T">Filter interface type.</typeparam>
-		/// <param name="assembly">Assembly in where types scan required.</param>
-		/// <param name="showObsolete">Show types marked as obsolete.</param>
-		/// <param name="showNonPublic">Show non public types.</param>
-		/// <param name="showNonBrowsable">Show types marked as non browsable.</param>
-		/// <param name="extraFilter">Extra filter.</param>
-		/// <returns>Found types.</returns>
-		public static IEnumerable<Type> FindImplementations<T>(this Assembly assembly, bool showObsolete = default, bool showNonPublic = default, bool showNonBrowsable = default, Func<Type, bool> extraFilter = default)
+	/// <summary>
+	/// Determines whether the specified type is an assembly.
+	/// </summary>
+	/// <param name="dllName"></param>
+	/// <returns></returns>
+	public static bool IsAssembly(this string dllName)
+	{
+		return dllName.VerifyAssembly() != null;
+	}
+
+	/// <summary>
+	/// Verifies the assembly.
+	/// </summary>
+	/// <param name="dllName"></param>
+	/// <returns></returns>
+	public static AssemblyName VerifyAssembly(this string dllName)
+	{
+		try
 		{
-			if (assembly is null)
-				throw new ArgumentNullException(nameof(assembly));
-
-			extraFilter ??= t => true;
-
-			return assembly
-				.GetTypes()
-				.Where(t => t.Is<T>() && !t.IsAbstract && !t.IsInterface &&
-					(showNonPublic || t.IsPublic) &&
-					(showObsolete || !t.IsObsolete()) &&
-					(showNonBrowsable || t.IsBrowsable()) &&
-					extraFilter(t));
+			return AssemblyName.GetAssemblyName(dllName);
 		}
-
-		/// <summary>
-		/// Is type compatible.
-		/// </summary>
-		/// <typeparam name="T">Required type.</typeparam>
-		/// <param name="type">Type.</param>
-		/// <returns>Check result.</returns>
-		public static bool IsRequiredType<T>(this Type type)
-			=> IsRequiredType(type, typeof(T));
-
-		/// <summary>
-		/// Is type compatible.
-		/// </summary>
-		/// <param name="type">Type.</param>
-		/// <param name="required">Required type.</param>
-		/// <returns>Check result.</returns>
-		public static bool IsRequiredType(this Type type, Type required)
+		catch (BadImageFormatException)
 		{
-			if (type is null)
-				throw new ArgumentNullException(nameof(type));
+			return null;
+		}
+	}
 
-			if (required is null)
-				throw new ArgumentNullException(nameof(required));
+	/// <summary>
+	/// Is cache enabled.
+	/// </summary>
+	public static bool CacheEnabled { get; set; } = true;
 
-			return !type.IsAbstract &&
-				type.IsPublic &&
-				!type.IsGenericTypeDefinition &&
-				type.Is(required) &&
-				type.GetConstructor([]) is not null;
-		}
+	/// <summary>
+	/// Clear cache.
+	/// </summary>
+	public static void ClearCache()
+	{
+		_genericTypeCache.Clear();
+		_getAccessorOwnerCache.Clear();
+		_getItemTypeCache.Clear();
+		_isAbstractCache.Clear();
+		_isCollectionCache.Clear();
+		_isStaticCache.Clear();
+		_isVirtualCache.Clear();
+	}
 
-		/// <summary>
-		/// Try find type.
-		/// </summary>
-		/// <param name="types">Types.</param>
-		/// <param name="isTypeCompatible">Is type compatible.</param>
-		/// <param name="typeName">The type name.</param>
-		/// <returns>The found type.</returns>
-		public static Type TryFindType(this IEnumerable<Type> types, Func<Type, bool> isTypeCompatible, string typeName)
-		{
-			if (types is null)
-				throw new ArgumentNullException(nameof(types));
+	private static TValue GetFromCache<TKey, TValue>(this SynchronizedDictionary<TKey, TValue> cache, TKey key, Func<TKey, TValue> createValue)
+	{
+		if (!CacheEnabled)
+			return createValue(key);
 
-			if (isTypeCompatible is null && typeName.IsEmpty())
-				throw new ArgumentNullException(nameof(typeName));
+		return cache.SafeAdd(key, createValue);
+	}
 
-			if (!typeName.IsEmpty())
-				return types.FirstOrDefault(t => t.Name.EqualsIgnoreCase(typeName));
-			else
-				return types.FirstOrDefault(isTypeCompatible);
-		}
+	/// <summary>
+	/// Find all <typeparamref name="T"/> implementation in the specified assembly.
+	/// </summary>
+	/// <typeparam name="T">Filter interface type.</typeparam>
+	/// <param name="assembly">Assembly in where types scan required.</param>
+	/// <param name="showObsolete">Show types marked as obsolete.</param>
+	/// <param name="showNonPublic">Show non public types.</param>
+	/// <param name="showNonBrowsable">Show types marked as non browsable.</param>
+	/// <param name="extraFilter">Extra filter.</param>
+	/// <returns>Found types.</returns>
+	public static IEnumerable<Type> FindImplementations<T>(this Assembly assembly, bool showObsolete = default, bool showNonPublic = default, bool showNonBrowsable = default, Func<Type, bool> extraFilter = default)
+	{
+		if (assembly is null)
+			throw new ArgumentNullException(nameof(assembly));
+
+		extraFilter ??= t => true;
+
+		return assembly
+			.GetTypes()
+			.Where(t => t.Is<T>() && !t.IsAbstract && !t.IsInterface &&
+				(showNonPublic || t.IsPublic) &&
+				(showObsolete || !t.IsObsolete()) &&
+				(showNonBrowsable || t.IsBrowsable()) &&
+				extraFilter(t));
+	}
 
-		/// <summary>
-		/// Order the members by declaration.
-		/// </summary>
-		/// <typeparam name="TMember">Member type.</typeparam>
-		/// <param name="members">Members.</param>
-		/// <returns>Ordered members.</returns>
-		public static IEnumerable<TMember> OrderByDeclaration<TMember>(this IEnumerable<TMember> members)
-			where TMember : MemberInfo
-			=> members.OrderBy(m => m.MetadataToken);
-
-		/// <summary>
-		/// Determines the property is modifiable.
-		/// </summary>
-		/// <param name="pi">The property info.</param>
-		/// <returns>Operations result.</returns>
-		public static bool IsModifiable(this PropertyInfo pi)
-			=> pi.CanWrite && pi.GetAttribute<ReadOnlyAttribute>()?.IsReadOnly != true && pi.SetMethod?.IsPublic == true;
-
-		/// <summary>
-		/// Determines the property is match.
-		/// </summary>
-		/// <param name="propertyInfo">The property info.</param>
-		/// <param name="bindingFlags"><see cref="BindingFlags"/></param>
-		/// <returns>Operations result.</returns>
-		public static bool IsMatch(this PropertyInfo propertyInfo, BindingFlags bindingFlags)
-		{
-			var hasPublic = bindingFlags.HasFlag(BindingFlags.Public);
-			var hasNonPublic = bindingFlags.HasFlag(BindingFlags.NonPublic);
+	/// <summary>
+	/// Is type compatible.
+	/// </summary>
+	/// <typeparam name="T">Required type.</typeparam>
+	/// <param name="type">Type.</param>
+	/// <returns>Check result.</returns>
+	public static bool IsRequiredType<T>(this Type type)
+		=> IsRequiredType(type, typeof(T));
 
-			if (!hasPublic || !hasNonPublic)
-			{
-				var isPublic = propertyInfo.GetMethod?.IsPublic == true || propertyInfo.SetMethod?.IsPublic == true;
+	/// <summary>
+	/// Is type compatible.
+	/// </summary>
+	/// <param name="type">Type.</param>
+	/// <param name="required">Required type.</param>
+	/// <returns>Check result.</returns>
+	public static bool IsRequiredType(this Type type, Type required)
+	{
+		if (type is null)
+			throw new ArgumentNullException(nameof(type));
 
-				if (hasPublic && !isPublic)
-					return false;
+		if (required is null)
+			throw new ArgumentNullException(nameof(required));
 
-				if (hasNonPublic && isPublic)
-					return false;
-			}
+		return !type.IsAbstract &&
+			type.IsPublic &&
+			!type.IsGenericTypeDefinition &&
+			type.Is(required) &&
+			type.GetConstructor([]) is not null;
+	}
 
-			var hasStatic = bindingFlags.HasFlag(BindingFlags.Static);
-			var hasInstance = bindingFlags.HasFlag(BindingFlags.Instance);
+	/// <summary>
+	/// Try find type.
+	/// </summary>
+	/// <param name="types">Types.</param>
+	/// <param name="isTypeCompatible">Is type compatible.</param>
+	/// <param name="typeName">The type name.</param>
+	/// <returns>The found type.</returns>
+	public static Type TryFindType(this IEnumerable<Type> types, Func<Type, bool> isTypeCompatible, string typeName)
+	{
+		if (types is null)
+			throw new ArgumentNullException(nameof(types));
 
-			if (!hasStatic || !hasInstance)
-			{
-				var isStatic = propertyInfo.IsStatic();
+		if (isTypeCompatible is null && typeName.IsEmpty())
+			throw new ArgumentNullException(nameof(typeName));
 
-				if (hasStatic && !isStatic)
-					return false;
+		if (!typeName.IsEmpty())
+			return types.FirstOrDefault(t => t.Name.EqualsIgnoreCase(typeName));
+		else
+			return types.FirstOrDefault(isTypeCompatible);
+	}
 
-				if (hasInstance && isStatic)
-					return false;
-			}
+	/// <summary>
+	/// Order the members by declaration.
+	/// </summary>
+	/// <typeparam name="TMember">Member type.</typeparam>
+	/// <param name="members">Members.</param>
+	/// <returns>Ordered members.</returns>
+	public static IEnumerable<TMember> OrderByDeclaration<TMember>(this IEnumerable<TMember> members)
+		where TMember : MemberInfo
+		=> members.OrderBy(m => m.MetadataToken);
 
-			return true;
-		}
+	/// <summary>
+	/// Determines the property is modifiable.
+	/// </summary>
+	/// <param name="pi">The property info.</param>
+	/// <returns>Operations result.</returns>
+	public static bool IsModifiable(this PropertyInfo pi)
+		=> pi.CanWrite && pi.GetAttribute<ReadOnlyAttribute>()?.IsReadOnly != true && pi.SetMethod?.IsPublic == true;
 
-		/// <summary>
-		/// Determines the method is match.
-		/// </summary>
-		/// <param name="methodInfo">The method info.</param>
-		/// <param name="bindingFlags"><see cref="BindingFlags"/></param>
-		/// <returns>Operations result.</returns>
-		public static bool IsMatch(this MethodBase methodInfo, BindingFlags bindingFlags)
+	/// <summary>
+	/// Determines the property is match.
+	/// </summary>
+	/// <param name="propertyInfo">The property info.</param>
+	/// <param name="bindingFlags"><see cref="BindingFlags"/></param>
+	/// <returns>Operations result.</returns>
+	public static bool IsMatch(this PropertyInfo propertyInfo, BindingFlags bindingFlags)
+	{
+		var hasPublic = bindingFlags.HasFlag(BindingFlags.Public);
+		var hasNonPublic = bindingFlags.HasFlag(BindingFlags.NonPublic);
+
+		if (!hasPublic || !hasNonPublic)
 		{
-			var hasPublic = bindingFlags.HasFlag(BindingFlags.Public);
-			var hasNonPublic = bindingFlags.HasFlag(BindingFlags.NonPublic);
+			var isPublic = propertyInfo.GetMethod?.IsPublic == true || propertyInfo.SetMethod?.IsPublic == true;
 
-			if (!hasPublic || !hasNonPublic)
-			{
-				var isPublic = methodInfo.IsPublic;
+			if (hasPublic && !isPublic)
+				return false;
+
+			if (hasNonPublic && isPublic)
+				return false;
+		}
 
-				if (hasPublic && !isPublic)
-					return false;
+		var hasStatic = bindingFlags.HasFlag(BindingFlags.Static);
+		var hasInstance = bindingFlags.HasFlag(BindingFlags.Instance);
 
-				if (hasNonPublic && isPublic)
-					return false;
-			}
+		if (!hasStatic || !hasInstance)
+		{
+			var isStatic = propertyInfo.IsStatic();
 
-			var hasStatic = bindingFlags.HasFlag(BindingFlags.Static);
-			var hasInstance = bindingFlags.HasFlag(BindingFlags.Instance);
+			if (hasStatic && !isStatic)
+				return false;
 
-			if (!hasStatic || !hasInstance)
-			{
-				var isStatic = methodInfo.IsStatic;
+			if (hasInstance && isStatic)
+				return false;
+		}
 
-				if (hasStatic && !isStatic)
-					return false;
+		return true;
+	}
 
-				if (hasInstance && isStatic)
-					return false;
-			}
+	/// <summary>
+	/// Determines the method is match.
+	/// </summary>
+	/// <param name="methodInfo">The method info.</param>
+	/// <param name="bindingFlags"><see cref="BindingFlags"/></param>
+	/// <returns>Operations result.</returns>
+	public static bool IsMatch(this MethodBase methodInfo, BindingFlags bindingFlags)
+	{
+		var hasPublic = bindingFlags.HasFlag(BindingFlags.Public);
+		var hasNonPublic = bindingFlags.HasFlag(BindingFlags.NonPublic);
 
-			return true;
+		if (!hasPublic || !hasNonPublic)
+		{
+			var isPublic = methodInfo.IsPublic;
+
+			if (hasPublic && !isPublic)
+				return false;
+
+			if (hasNonPublic && isPublic)
+				return false;
 		}
 
-		/// <summary>
-		/// Determines the field is match.
-		/// </summary>
-		/// <param name="field">The field.</param>
-		/// <param name="bindingFlags"><see cref="BindingFlags"/></param>
-		/// <returns>Operations result.</returns>
-		public static bool IsMatch(this FieldInfo field, BindingFlags bindingFlags)
+		var hasStatic = bindingFlags.HasFlag(BindingFlags.Static);
+		var hasInstance = bindingFlags.HasFlag(BindingFlags.Instance);
+
+		if (!hasStatic || !hasInstance)
 		{
-			var hasPublic = bindingFlags.HasFlag(BindingFlags.Public);
-			var hasNonPublic = bindingFlags.HasFlag(BindingFlags.NonPublic);
+			var isStatic = methodInfo.IsStatic;
 
-			if (!hasPublic || !hasNonPublic)
-			{
-				var isPublic = field.IsPublic;
+			if (hasStatic && !isStatic)
+				return false;
 
-				if (hasPublic && !isPublic)
-					return false;
+			if (hasInstance && isStatic)
+				return false;
+		}
 
-				if (hasNonPublic && isPublic)
-					return false;
-			}
+		return true;
+	}
 
-			var hasStatic = bindingFlags.HasFlag(BindingFlags.Static);
-			var hasInstance = bindingFlags.HasFlag(BindingFlags.Instance);
+	/// <summary>
+	/// Determines the field is match.
+	/// </summary>
+	/// <param name="field">The field.</param>
+	/// <param name="bindingFlags"><see cref="BindingFlags"/></param>
+	/// <returns>Operations result.</returns>
+	public static bool IsMatch(this FieldInfo field, BindingFlags bindingFlags)
+	{
+		var hasPublic = bindingFlags.HasFlag(BindingFlags.Public);
+		var hasNonPublic = bindingFlags.HasFlag(BindingFlags.NonPublic);
 
-			if (!hasStatic || !hasInstance)
-			{
-				var isStatic = field.IsStatic;
+		if (!hasPublic || !hasNonPublic)
+		{
+			var isPublic = field.IsPublic;
 
-				if (hasStatic && !isStatic)
-					return false;
+			if (hasPublic && !isPublic)
+				return false;
 
-				if (hasInstance && isStatic)
-					return false;
-			}
+			if (hasNonPublic && isPublic)
+				return false;
+		}
+
+		var hasStatic = bindingFlags.HasFlag(BindingFlags.Static);
+		var hasInstance = bindingFlags.HasFlag(BindingFlags.Instance);
 
-			return true;
+		if (!hasStatic || !hasInstance)
+		{
+			var isStatic = field.IsStatic;
+
+			if (hasStatic && !isStatic)
+				return false;
+
+			if (hasInstance && isStatic)
+				return false;
 		}
+
+		return true;
 	}
 }
\ No newline at end of file
diff --git a/Security/CryptoAlgorithm.cs b/Security/CryptoAlgorithm.cs
index 2a028270..ffe95696 100644
--- a/Security/CryptoAlgorithm.cs
+++ b/Security/CryptoAlgorithm.cs
@@ -1,205 +1,204 @@
-namespace Ecng.Security
+namespace Ecng.Security;
+
+using System;
+using System.Security.Cryptography;
+
+using Ecng.Common;
+using Ecng.Security.Cryptographers;
+
+/// <summary>
+/// Algorithm types.
+/// </summary>
+public enum AlgorithmTypes
+{
+	/// <summary>
+	/// Symmetric.
+	/// </summary>
+	Symmetric,
+
+	/// <summary>
+	/// Asymmetric.
+	/// </summary>
+	Asymmetric,
+
+	/// <summary>
+	/// Hash.
+	/// </summary>
+	Hash,
+}
+
+/// <summary>
+/// Crypto algorithm.
+/// </summary>
+[Serializable]
+public class CryptoAlgorithm : Disposable
 {
-	using System;
-	using System.Security.Cryptography;
+	#region Private Fields
+
+	private readonly SymmetricCryptographer _symmetric;
+	private readonly AsymmetricCryptographer _asymmetric;
+	private readonly HashCryptographer _hash;
+
+	#endregion
 
-	using Ecng.Common;
-	using Ecng.Security.Cryptographers;
+	#region CryptoAlgorithm.ctor()
+
+	/// <summary>
+	/// Initializes a new instance of the <see cref="CryptoAlgorithm"/> class.
+	/// </summary>
+	/// <param name="symmetric"><see cref="SymmetricCryptographer"/></param>
+	public CryptoAlgorithm(SymmetricCryptographer symmetric)
+	{
+		_symmetric = symmetric ?? throw new ArgumentNullException(nameof(symmetric));
+	}
 
 	/// <summary>
-	/// Algorithm types.
+	/// Initializes a new instance of the <see cref="CryptoAlgorithm"/> class.
 	/// </summary>
-	public enum AlgorithmTypes
+	/// <param name="asymmetric"><see cref="AsymmetricCryptographer"/></param>
+	public CryptoAlgorithm(AsymmetricCryptographer asymmetric)
 	{
-		/// <summary>
-		/// Symmetric.
-		/// </summary>
-		Symmetric,
-
-		/// <summary>
-		/// Asymmetric.
-		/// </summary>
-		Asymmetric,
-
-		/// <summary>
-		/// Hash.
-		/// </summary>
-		Hash,
+		_asymmetric = asymmetric ?? throw new ArgumentNullException(nameof(asymmetric));
 	}
 
 	/// <summary>
-	/// Crypto algorithm.
+	/// Initializes a new instance of the <see cref="CryptoAlgorithm"/> class.
 	/// </summary>
-	[Serializable]
-	public class CryptoAlgorithm : Disposable
+	/// <param name="hash"><see cref="HashCryptographer"/></param>
+	public CryptoAlgorithm(HashCryptographer hash)
 	{
-		#region Private Fields
+		_hash = hash ?? throw new ArgumentNullException(nameof(hash));
+	}
 
-		private readonly SymmetricCryptographer _symmetric;
-		private readonly AsymmetricCryptographer _asymmetric;
-		private readonly HashCryptographer _hash;
+	#endregion
 
-		#endregion
+	#region Public Constants
 
-		#region CryptoAlgorithm.ctor()
+	/// <summary>
+	/// The default symmetric algorithm name.
+	/// </summary>
+	public const string DefaultSymmetricAlgoName = "AES";
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="CryptoAlgorithm"/> class.
-		/// </summary>
-		/// <param name="symmetric"><see cref="SymmetricCryptographer"/></param>
-		public CryptoAlgorithm(SymmetricCryptographer symmetric)
-		{
-			_symmetric = symmetric ?? throw new ArgumentNullException(nameof(symmetric));
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="CryptoAlgorithm"/> class.
-		/// </summary>
-		/// <param name="asymmetric"><see cref="AsymmetricCryptographer"/></param>
-		public CryptoAlgorithm(AsymmetricCryptographer asymmetric)
-		{
-			_asymmetric = asymmetric ?? throw new ArgumentNullException(nameof(asymmetric));
-		}
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="CryptoAlgorithm"/> class.
-		/// </summary>
-		/// <param name="hash"><see cref="HashCryptographer"/></param>
-		public CryptoAlgorithm(HashCryptographer hash)
-		{
-			_hash = hash ?? throw new ArgumentNullException(nameof(hash));
-		}
-
-		#endregion
-
-		#region Public Constants
-
-		/// <summary>
-		/// The default symmetric algorithm name.
-		/// </summary>
-		public const string DefaultSymmetricAlgoName = "AES";
-
-		/// <summary>
-		/// The default asymmetric algorithm name.
-		/// </summary>
-		public const string DefaultAsymmetricAlgoName = "RSA";
-
-		/// <summary>
-		/// The default hash algorithm name.
-		/// </summary>
-		public const string DefaultHashAlgoName = "SHA";
-
-		#endregion
-
-		#region Create
-
-		/// <summary>
-		/// Creates a symmetric cryptographer.
-		/// </summary>
-		/// <param name="publicKey">The public key.</param>
-		/// <returns>The symmetric cryptographer.</returns>
-		public static CryptoAlgorithm CreateAssymetricVerifier(byte[] publicKey)
-			=> new(new AsymmetricCryptographer(AsymmetricAlgorithm.Create(DefaultAsymmetricAlgoName), publicKey));
-
-		/// <summary>
-		/// Creates a symmetric cryptographer.
-		/// </summary>
-		/// <param name="type"><see cref="AlgorithmTypes"/></param>
-		/// <param name="keys">The keys.</param>
-		/// <returns><see cref="CryptoAlgorithm"/></returns>
-		public static CryptoAlgorithm Create(AlgorithmTypes type, params byte[][] keys)
-		{
-			return type switch
-			{
-				AlgorithmTypes.Symmetric => new(new SymmetricCryptographer(SymmetricAlgorithm.Create(DefaultSymmetricAlgoName), keys[0])),
-				AlgorithmTypes.Asymmetric => new(new AsymmetricCryptographer(AsymmetricAlgorithm.Create(DefaultAsymmetricAlgoName), keys[0], keys[1])),
-				AlgorithmTypes.Hash => new(keys.Length == 0 ? new HashCryptographer(HashAlgorithm.Create(DefaultHashAlgoName)) : new HashCryptographer(HashAlgorithm.Create(DefaultHashAlgoName), keys[0])),
-				_ => throw new ArgumentOutOfRangeException(nameof(type), type, "Unknown type."),
-			};
-		}
-
-		#endregion
-
-		#region Encrypt
-
-		/// <summary>
-		/// Encrypts the specified data.
-		/// </summary>
-		/// <param name="data">The decrypted data.</param>
-		/// <returns>The encrypted data.</returns>
-		public byte[] Encrypt(byte[] data)
-		{
-			if (_symmetric is not null)
-				return _symmetric.Encrypt(data);
-			else if (_asymmetric is not null)
-				return _asymmetric.Encrypt(data);
-			else if (_hash is not null)
-				return _hash.ComputeHash(data);
-			else
-				throw new InvalidOperationException();
-		}
-
-		#endregion
-
-		#region Decrypt
-
-		/// <summary>
-		/// Decrypts the specified data.
-		/// </summary>
-		/// <param name="data">The encrypted data.</param>
-		/// <returns>The decrypted data.</returns>
-		public byte[] Decrypt(byte[] data)
-		{
-			if (_symmetric is not null)
-				return _symmetric.Decrypt(data);
-			else if (_asymmetric is not null)
-				return _asymmetric.Decrypt(data);
-			else if (_hash is not null)
-				throw new NotSupportedException();
-			else
-				throw new InvalidOperationException();
-		}
-
-		#endregion
-
-		/// <summary>
-		/// Computes the hash value of the plaintext.
-		/// </summary>
-		/// <param name="data">The plaintext in which you wish to hash.</param>
-		/// <returns>The resulting hash.</returns>
-		public byte[] CreateSignature(byte[] data)
-		{
-			if (_asymmetric is null)
-				throw new NotSupportedException();
-
-			return _asymmetric.CreateSignature(data);
-		}
-
-		/// <summary>
-		/// Verifies the signature.
-		/// </summary>
-		/// <param name="data">The data.</param>
-		/// <param name="signature">The signature.</param>
-		/// <returns>
-		/// <c>true</c> if the signature is valid; otherwise, <c>false</c>.
-		/// </returns>
-		public bool VerifySignature(byte[] data, byte[] signature)
-		{
-			if (_asymmetric is null)
-				throw new NotSupportedException();
+	/// <summary>
+	/// The default asymmetric algorithm name.
+	/// </summary>
+	public const string DefaultAsymmetricAlgoName = "RSA";
+
+	/// <summary>
+	/// The default hash algorithm name.
+	/// </summary>
+	public const string DefaultHashAlgoName = "SHA";
+
+	#endregion
 
-			return _asymmetric.VerifySignature(data, signature);
-		}
+	#region Create
 
-		#region Disposable Members
+	/// <summary>
+	/// Creates a symmetric cryptographer.
+	/// </summary>
+	/// <param name="publicKey">The public key.</param>
+	/// <returns>The symmetric cryptographer.</returns>
+	public static CryptoAlgorithm CreateAssymetricVerifier(byte[] publicKey)
+		=> new(new AsymmetricCryptographer(AsymmetricAlgorithm.Create(DefaultAsymmetricAlgoName), publicKey));
 
-		/// <inheritdoc />
-		protected override void DisposeManaged()
+	/// <summary>
+	/// Creates a symmetric cryptographer.
+	/// </summary>
+	/// <param name="type"><see cref="AlgorithmTypes"/></param>
+	/// <param name="keys">The keys.</param>
+	/// <returns><see cref="CryptoAlgorithm"/></returns>
+	public static CryptoAlgorithm Create(AlgorithmTypes type, params byte[][] keys)
+	{
+		return type switch
 		{
-			_symmetric?.Dispose();
-			_asymmetric?.Dispose();
-		}
+			AlgorithmTypes.Symmetric => new(new SymmetricCryptographer(SymmetricAlgorithm.Create(DefaultSymmetricAlgoName), keys[0])),
+			AlgorithmTypes.Asymmetric => new(new AsymmetricCryptographer(AsymmetricAlgorithm.Create(DefaultAsymmetricAlgoName), keys[0], keys[1])),
+			AlgorithmTypes.Hash => new(keys.Length == 0 ? new HashCryptographer(HashAlgorithm.Create(DefaultHashAlgoName)) : new HashCryptographer(HashAlgorithm.Create(DefaultHashAlgoName), keys[0])),
+			_ => throw new ArgumentOutOfRangeException(nameof(type), type, "Unknown type."),
+		};
+	}
+
+	#endregion
+
+	#region Encrypt
+
+	/// <summary>
+	/// Encrypts the specified data.
+	/// </summary>
+	/// <param name="data">The decrypted data.</param>
+	/// <returns>The encrypted data.</returns>
+	public byte[] Encrypt(byte[] data)
+	{
+		if (_symmetric is not null)
+			return _symmetric.Encrypt(data);
+		else if (_asymmetric is not null)
+			return _asymmetric.Encrypt(data);
+		else if (_hash is not null)
+			return _hash.ComputeHash(data);
+		else
+			throw new InvalidOperationException();
+	}
+
+	#endregion
+
+	#region Decrypt
+
+	/// <summary>
+	/// Decrypts the specified data.
+	/// </summary>
+	/// <param name="data">The encrypted data.</param>
+	/// <returns>The decrypted data.</returns>
+	public byte[] Decrypt(byte[] data)
+	{
+		if (_symmetric is not null)
+			return _symmetric.Decrypt(data);
+		else if (_asymmetric is not null)
+			return _asymmetric.Decrypt(data);
+		else if (_hash is not null)
+			throw new NotSupportedException();
+		else
+			throw new InvalidOperationException();
+	}
+
+	#endregion
+
+	/// <summary>
+	/// Computes the hash value of the plaintext.
+	/// </summary>
+	/// <param name="data">The plaintext in which you wish to hash.</param>
+	/// <returns>The resulting hash.</returns>
+	public byte[] CreateSignature(byte[] data)
+	{
+		if (_asymmetric is null)
+			throw new NotSupportedException();
+
+		return _asymmetric.CreateSignature(data);
+	}
 
-		#endregion
+	/// <summary>
+	/// Verifies the signature.
+	/// </summary>
+	/// <param name="data">The data.</param>
+	/// <param name="signature">The signature.</param>
+	/// <returns>
+	/// <c>true</c> if the signature is valid; otherwise, <c>false</c>.
+	/// </returns>
+	public bool VerifySignature(byte[] data, byte[] signature)
+	{
+		if (_asymmetric is null)
+			throw new NotSupportedException();
+
+		return _asymmetric.VerifySignature(data, signature);
 	}
+
+	#region Disposable Members
+
+	/// <inheritdoc />
+	protected override void DisposeManaged()
+	{
+		_symmetric?.Dispose();
+		_asymmetric?.Dispose();
+	}
+
+	#endregion
 }
\ No newline at end of file
diff --git a/Security/CryptoHelper.cs b/Security/CryptoHelper.cs
index d4859265..cb7cb2a3 100644
--- a/Security/CryptoHelper.cs
+++ b/Security/CryptoHelper.cs
@@ -1,403 +1,402 @@
-namespace Ecng.Security
-{
-	using System;
-	using System.Linq;
-	using System.IO;
-	using System.Security.Cryptography;
-	using System.Security;
+namespace Ecng.Security;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Security.Cryptography;
+using System.Security;
 
-	using Ecng.Common;
+using Ecng.Common;
 
+/// <summary>
+/// Crypto helper.
+/// </summary>
+public static class CryptoHelper
+{
 	/// <summary>
-	/// Crypto helper.
+	/// Converts the <see cref="RSAParameters"/> to a byte array.
 	/// </summary>
-	public static class CryptoHelper
+	/// <param name="param"><see cref="RSAParameters"/></param>
+	/// <returns>Byte array.</returns>
+	public static byte[] FromRsa(this RSAParameters param)
 	{
-		/// <summary>
-		/// Converts the <see cref="RSAParameters"/> to a byte array.
-		/// </summary>
-		/// <param name="param"><see cref="RSAParameters"/></param>
-		/// <returns>Byte array.</returns>
-		public static byte[] FromRsa(this RSAParameters param)
-		{
-			var stream = new MemoryStream();
-
-			WriteByteArray(stream, param.P);
-			WriteByteArray(stream, param.Q);
-			WriteByteArray(stream, param.D);
-			WriteByteArray(stream, param.DP);
-			WriteByteArray(stream, param.DQ);
-			WriteByteArray(stream, param.InverseQ);
-			WriteByteArray(stream, param.Exponent);
-			WriteByteArray(stream, param.Modulus);
-
-			return stream.To<byte[]>();
-		}
+		var stream = new MemoryStream();
+
+		WriteByteArray(stream, param.P);
+		WriteByteArray(stream, param.Q);
+		WriteByteArray(stream, param.D);
+		WriteByteArray(stream, param.DP);
+		WriteByteArray(stream, param.DQ);
+		WriteByteArray(stream, param.InverseQ);
+		WriteByteArray(stream, param.Exponent);
+		WriteByteArray(stream, param.Modulus);
+
+		return stream.To<byte[]>();
+	}
 
-		/// <summary>
-		/// Converts the byte array to <see cref="RSAParameters"/>.
-		/// </summary>
-		/// <param name="key">Byte array.</param>
-		/// <returns><see cref="RSAParameters"/></returns>
-		public static RSAParameters ToRsa(this byte[] key)
-		{
-			if (key is null)
-				throw new ArgumentNullException(nameof(key));
-
-			var stream = key.To<Stream>();
-
-			return new()
-			{
-				P = ReadByteArray(stream),
-				Q = ReadByteArray(stream),
-				D = ReadByteArray(stream),
-				DP = ReadByteArray(stream),
-				DQ = ReadByteArray(stream),
-				InverseQ = ReadByteArray(stream),
-				Exponent = ReadByteArray(stream),
-				Modulus = ReadByteArray(stream)
-			};
-		}
+	/// <summary>
+	/// Converts the byte array to <see cref="RSAParameters"/>.
+	/// </summary>
+	/// <param name="key">Byte array.</param>
+	/// <returns><see cref="RSAParameters"/></returns>
+	public static RSAParameters ToRsa(this byte[] key)
+	{
+		if (key is null)
+			throw new ArgumentNullException(nameof(key));
 
-		#region WriteByteArray
+		var stream = key.To<Stream>();
 
-		private static void WriteByteArray(Stream stream, byte[] array)
+		return new()
 		{
-			if (stream is null)
-				throw new ArgumentNullException(nameof(stream));
+			P = ReadByteArray(stream),
+			Q = ReadByteArray(stream),
+			D = ReadByteArray(stream),
+			DP = ReadByteArray(stream),
+			DQ = ReadByteArray(stream),
+			InverseQ = ReadByteArray(stream),
+			Exponent = ReadByteArray(stream),
+			Modulus = ReadByteArray(stream)
+		};
+	}
 
-			stream.WriteEx(array is null);
+	#region WriteByteArray
 
-			if (array is null)
-				return;
+	private static void WriteByteArray(Stream stream, byte[] array)
+	{
+		if (stream is null)
+			throw new ArgumentNullException(nameof(stream));
 
-			stream.WriteEx(array);
-		}
+		stream.WriteEx(array is null);
 
-		#endregion
+		if (array is null)
+			return;
 
-		#region ReadByteArray
+		stream.WriteEx(array);
+	}
 
-		private static byte[] ReadByteArray(Stream stream)
-		{
-			if (stream is null)
-				throw new ArgumentNullException(nameof(stream));
+	#endregion
 
-			var isNull = stream.Read<bool>();
+	#region ReadByteArray
 
-			if (isNull)
-				return null;
+	private static byte[] ReadByteArray(Stream stream)
+	{
+		if (stream is null)
+			throw new ArgumentNullException(nameof(stream));
 
-			return stream.Read<byte[]>();
-		}
+		var isNull = stream.Read<bool>();
 
-		#endregion
+		if (isNull)
+			return null;
 
-		#region Generate
+		return stream.Read<byte[]>();
+	}
 
-		/// <summary>
-		/// Returns a new generated <code>RSAParameters</code> class which
-		/// will be used as a key for the signature.
-		/// <remarks>
-		/// It will generate a PRIVATE key (which includes the PUBLIC key).
-		/// </remarks>
-		/// </summary>
-		public static RSAParameters GenerateRsa()
-		{
-			using var provider = new RSACryptoServiceProvider();
-			return provider.ExportParameters(true);
-		}
+	#endregion
+
+	#region Generate
 
-		#endregion
+	/// <summary>
+	/// Returns a new generated <code>RSAParameters</code> class which
+	/// will be used as a key for the signature.
+	/// <remarks>
+	/// It will generate a PRIVATE key (which includes the PUBLIC key).
+	/// </remarks>
+	/// </summary>
+	public static RSAParameters GenerateRsa()
+	{
+		using var provider = new RSACryptoServiceProvider();
+		return provider.ExportParameters(true);
+	}
 
-		/// <summary>
-		/// Returns the public part of the <see cref="RSAParameters"/>.
-		/// </summary>
-		/// <param name="param"><see cref="RSAParameters"/></param>
-		/// <returns>The public part of the <see cref="RSAParameters"/>.</returns>
-		public static RSAParameters PublicPart(this RSAParameters param)
+	#endregion
+
+	/// <summary>
+	/// Returns the public part of the <see cref="RSAParameters"/>.
+	/// </summary>
+	/// <param name="param"><see cref="RSAParameters"/></param>
+	/// <returns>The public part of the <see cref="RSAParameters"/>.</returns>
+	public static RSAParameters PublicPart(this RSAParameters param)
+	{
+		return new()
 		{
-			return new()
-			{
-				Exponent = param.Exponent,
-				Modulus = param.Modulus,
-			};
-		}
+			Exponent = param.Exponent,
+			Modulus = param.Modulus,
+		};
+	}
 
-		// https://stackoverflow.com/a/10177020/8029915
+	// https://stackoverflow.com/a/10177020/8029915
 
-		// This constant is used to determine the keysize of the encryption algorithm in bits.
-		// We divide this by 8 within the code below to get the equivalent number of bytes.
-		private const int _keySize = 256;
+	// This constant is used to determine the keysize of the encryption algorithm in bits.
+	// We divide this by 8 within the code below to get the equivalent number of bytes.
+	private const int _keySize = 256;
 
-		// This constant determines the number of iterations for the password bytes generation function.
-		private const int _derivationIterations = 1000;
+	// This constant determines the number of iterations for the password bytes generation function.
+	private const int _derivationIterations = 1000;
 
-		private static SymmetricAlgorithm CreateRijndaelManaged()
-		{
-			var algo = Aes.Create();
+	private static SymmetricAlgorithm CreateRijndaelManaged()
+	{
+		var algo = Aes.Create();
 
-			algo.BlockSize = 128;
-			algo.Mode = CipherMode.CBC;
-			algo.Padding = PaddingMode.PKCS7;
+		algo.BlockSize = 128;
+		algo.Mode = CipherMode.CBC;
+		algo.Padding = PaddingMode.PKCS7;
 
-			return algo;
-		}
+		return algo;
+	}
 
-		/// <summary>
-		/// Encrypts the plain text.
-		/// </summary>
-		/// <param name="plain">The plain text.</param>
-		/// <param name="passPhrase">The pass phrase.</param>
-		/// <param name="salt">The salt.</param>
-		/// <param name="iv">The iv.</param>
-		/// <returns>The encrypted bytes.</returns>
-		public static byte[] Encrypt(this byte[] plain, string passPhrase, byte[] salt, byte[] iv)
-		{
-			if (plain is null)
-				throw new ArgumentNullException(nameof(plain));
+	/// <summary>
+	/// Encrypts the plain text.
+	/// </summary>
+	/// <param name="plain">The plain text.</param>
+	/// <param name="passPhrase">The pass phrase.</param>
+	/// <param name="salt">The salt.</param>
+	/// <param name="iv">The iv.</param>
+	/// <returns>The encrypted bytes.</returns>
+	public static byte[] Encrypt(this byte[] plain, string passPhrase, byte[] salt, byte[] iv)
+	{
+		if (plain is null)
+			throw new ArgumentNullException(nameof(plain));
 
-			if (passPhrase.IsEmpty())
-				throw new ArgumentNullException(nameof(passPhrase));
+		if (passPhrase.IsEmpty())
+			throw new ArgumentNullException(nameof(passPhrase));
 
-			if (iv?.Length > 16)
-				iv = [.. iv.Take(16)];
+		if (iv?.Length > 16)
+			iv = [.. iv.Take(16)];
 
-			using var password = new Rfc2898DeriveBytes(passPhrase, salt, _derivationIterations);
+		using var password = new Rfc2898DeriveBytes(passPhrase, salt, _derivationIterations);
 
-			var keyBytes = password.GetBytes(_keySize / 8);
+		var keyBytes = password.GetBytes(_keySize / 8);
 
-			using var symmetricKey = CreateRijndaelManaged();
+		using var symmetricKey = CreateRijndaelManaged();
 
-			using var encryptor = symmetricKey.CreateEncryptor(keyBytes, iv);
-			using var memoryStream = new MemoryStream();
-			using var cryptoStream = new CryptoStream(memoryStream, encryptor, CryptoStreamMode.Write);
+		using var encryptor = symmetricKey.CreateEncryptor(keyBytes, iv);
+		using var memoryStream = new MemoryStream();
+		using var cryptoStream = new CryptoStream(memoryStream, encryptor, CryptoStreamMode.Write);
 
-			cryptoStream.Write(plain, 0, plain.Length);
-			cryptoStream.FlushFinalBlock();
-			// Create the final bytes as a concatenation of the random salt bytes, the random iv bytes and the cipher bytes.
+		cryptoStream.Write(plain, 0, plain.Length);
+		cryptoStream.FlushFinalBlock();
+		// Create the final bytes as a concatenation of the random salt bytes, the random iv bytes and the cipher bytes.
 
-			return memoryStream.ToArray();
-		}
+		return memoryStream.ToArray();
+	}
+
+	private static byte[] ReadStream(this CryptoStream stream, int maxLen)
+	{
+		var buffer = new byte[maxLen];
+		var offset = 0;
 
-		private static byte[] ReadStream(this CryptoStream stream, int maxLen)
+		while (offset < maxLen)
 		{
-			var buffer = new byte[maxLen];
-			var offset = 0;
+			var numRead = stream.Read(buffer, offset, maxLen - offset);
+			if (numRead == 0)
+				break;
 
-			while (offset < maxLen)
-			{
-				var numRead = stream.Read(buffer, offset, maxLen - offset);
-				if (numRead == 0)
-					break;
+			offset += numRead;
+		}
 
-				offset += numRead;
-			}
+		Array.Resize(ref buffer, offset);
 
-			Array.Resize(ref buffer, offset);
+		return buffer;
+	}
 
-			return buffer;
-		}
+	/// <summary>
+	/// Decrypts the cipher text.
+	/// </summary>
+	/// <param name="cipherText">The cipher text.</param>
+	/// <param name="passPhrase">The pass phrase.</param>
+	/// <param name="salt">The salt.</param>
+	/// <param name="iv">The iv.</param>
+	/// <returns>The decrypted bytes.</returns>
+	public static byte[] Decrypt(this byte[] cipherText, string passPhrase, byte[] salt, byte[] iv)
+	{
+		if (cipherText is null)
+			throw new ArgumentNullException(nameof(cipherText));
 
-		/// <summary>
-		/// Decrypts the cipher text.
-		/// </summary>
-		/// <param name="cipherText">The cipher text.</param>
-		/// <param name="passPhrase">The pass phrase.</param>
-		/// <param name="salt">The salt.</param>
-		/// <param name="iv">The iv.</param>
-		/// <returns>The decrypted bytes.</returns>
-		public static byte[] Decrypt(this byte[] cipherText, string passPhrase, byte[] salt, byte[] iv)
-		{
-			if (cipherText is null)
-				throw new ArgumentNullException(nameof(cipherText));
+		if (passPhrase.IsEmpty())
+			throw new ArgumentNullException(nameof(passPhrase));
 
-			if (passPhrase.IsEmpty())
-				throw new ArgumentNullException(nameof(passPhrase));
+		if (iv?.Length > 16)
+			iv = [.. iv.Take(16)];
 
-			if (iv?.Length > 16)
-				iv = [.. iv.Take(16)];
+		using var password = new Rfc2898DeriveBytes(passPhrase, salt, _derivationIterations);
 
-			using var password = new Rfc2898DeriveBytes(passPhrase, salt, _derivationIterations);
+		var keyBytes = password.GetBytes(_keySize / 8);
 
-			var keyBytes = password.GetBytes(_keySize / 8);
+		using var symmetricKey = CreateRijndaelManaged();
 
-			using var symmetricKey = CreateRijndaelManaged();
+		using var decryptor = symmetricKey.CreateDecryptor(keyBytes, iv);
+		using var memoryStream = new MemoryStream(cipherText);
+		using var cryptoStream = new CryptoStream(memoryStream, decryptor, CryptoStreamMode.Read);
 
-			using var decryptor = symmetricKey.CreateDecryptor(keyBytes, iv);
-			using var memoryStream = new MemoryStream(cipherText);
-			using var cryptoStream = new CryptoStream(memoryStream, decryptor, CryptoStreamMode.Read);
+		return cryptoStream.ReadStream(cipherText.Length);
+	}
 
-			return cryptoStream.ReadStream(cipherText.Length);
-		}
+	private static byte[] TransformAes(bool isEncrypt, byte[] inputBytes, string passPhrase, byte[] salt, byte[] iv)
+	{
+		if (inputBytes is null)
+			throw new ArgumentNullException(nameof(inputBytes));
+
+		if (passPhrase.IsEmpty())
+			throw new ArgumentNullException(nameof(passPhrase));
+
+		using var password = new Rfc2898DeriveBytes(passPhrase, salt, _derivationIterations);
+
+		var keyBytes = password.GetBytes(_keySize / 8);
 
-		private static byte[] TransformAes(bool isEncrypt, byte[] inputBytes, string passPhrase, byte[] salt, byte[] iv)
+		using var aes = Aes.Create();
+
+		aes.Mode = CipherMode.CBC;
+		aes.Padding = PaddingMode.PKCS7;
+
+		if (isEncrypt)
 		{
-			if (inputBytes is null)
-				throw new ArgumentNullException(nameof(inputBytes));
+			using var encryptor = aes.CreateEncryptor(keyBytes, iv);
+			using var memoryStream = new MemoryStream();
+			using var cryptoStream = new CryptoStream(memoryStream, encryptor, CryptoStreamMode.Write);
 
-			if (passPhrase.IsEmpty())
-				throw new ArgumentNullException(nameof(passPhrase));
+			cryptoStream.Write(inputBytes, 0, inputBytes.Length);
+			cryptoStream.FlushFinalBlock();
+			return memoryStream.ToArray();
+		}
+		else
+		{
+			using var decryptor = aes.CreateDecryptor(keyBytes, iv);
+			using var memoryStream = new MemoryStream(inputBytes);
+			using var cryptoStream = new CryptoStream(memoryStream, decryptor, CryptoStreamMode.Read);
 
-			using var password = new Rfc2898DeriveBytes(passPhrase, salt, _derivationIterations);
+			return cryptoStream.ReadStream(inputBytes.Length);
+		}
+	}
 
-			var keyBytes = password.GetBytes(_keySize / 8);
+	/// <summary>
+	/// Encrypts the plain text.
+	/// </summary>
+	/// <param name="plain">The plain text.</param>
+	/// <param name="passPhrase">The pass phrase.</param>
+	/// <param name="salt">The salt.</param>
+	/// <param name="iv">The iv.</param>
+	/// <returns>The cipher text.</returns>
+	public static byte[] EncryptAes(this byte[] plain, string passPhrase, byte[] salt, byte[] iv) => TransformAes(true, plain, passPhrase, salt, iv);
 
-			using var aes = Aes.Create();
+	/// <summary>
+	/// Decrypts the cipher text.
+	/// </summary>
+	/// <param name="cipherText">The cipher text.</param>
+	/// <param name="passPhrase">The pass phrase.</param>
+	/// <param name="salt">The salt.</param>
+	/// <param name="iv">The iv.</param>
+	/// <returns>The plain text.</returns>
+	public static byte[] DecryptAes(this byte[] cipherText, string passPhrase, byte[] salt, byte[] iv) => TransformAes(false, cipherText, passPhrase, salt, iv);
+
+	private static string Hash(this byte[] value, HashAlgorithm algo)
+	{
+		if (value is null)
+			throw new ArgumentNullException(nameof(value));
 
-			aes.Mode = CipherMode.CBC;
-			aes.Padding = PaddingMode.PKCS7;
+		if (value.Length == 0)
+			throw new ArgumentOutOfRangeException(nameof(value));
 
-			if (isEncrypt)
-			{
-				using var encryptor = aes.CreateEncryptor(keyBytes, iv);
-				using var memoryStream = new MemoryStream();
-				using var cryptoStream = new CryptoStream(memoryStream, encryptor, CryptoStreamMode.Write);
+		if (algo is null)
+			throw new ArgumentNullException(nameof(algo));
 
-				cryptoStream.Write(inputBytes, 0, inputBytes.Length);
-				cryptoStream.FlushFinalBlock();
-				return memoryStream.ToArray();
-			}
-			else
-			{
-				using var decryptor = aes.CreateDecryptor(keyBytes, iv);
-				using var memoryStream = new MemoryStream(inputBytes);
-				using var cryptoStream = new CryptoStream(memoryStream, decryptor, CryptoStreamMode.Read);
+		using (algo)
+			return algo.ComputeHash(value).Digest();
+	}
 
-				return cryptoStream.ReadStream(inputBytes.Length);
-			}
-		}
+	/// <summary>
+	/// MD5 hash.
+	/// </summary>
+	/// <param name="value">The value to hash.</param>
+	/// <returns>The hash.</returns>
+	public static string Md5(this byte[] value)
+	{
+		return value.Hash(MD5.Create());
+	}
 
-		/// <summary>
-		/// Encrypts the plain text.
-		/// </summary>
-		/// <param name="plain">The plain text.</param>
-		/// <param name="passPhrase">The pass phrase.</param>
-		/// <param name="salt">The salt.</param>
-		/// <param name="iv">The iv.</param>
-		/// <returns>The cipher text.</returns>
-		public static byte[] EncryptAes(this byte[] plain, string passPhrase, byte[] salt, byte[] iv) => TransformAes(true, plain, passPhrase, salt, iv);
-
-		/// <summary>
-		/// Decrypts the cipher text.
-		/// </summary>
-		/// <param name="cipherText">The cipher text.</param>
-		/// <param name="passPhrase">The pass phrase.</param>
-		/// <param name="salt">The salt.</param>
-		/// <param name="iv">The iv.</param>
-		/// <returns>The plain text.</returns>
-		public static byte[] DecryptAes(this byte[] cipherText, string passPhrase, byte[] salt, byte[] iv) => TransformAes(false, cipherText, passPhrase, salt, iv);
-
-		private static string Hash(this byte[] value, HashAlgorithm algo)
-		{
-			if (value is null)
-				throw new ArgumentNullException(nameof(value));
+	/// <summary>
+	/// SHA1 hash.
+	/// </summary>
+	/// <param name="value">The value to hash.</param>
+	/// <returns>The hash.</returns>
+	public static string Sha256(this byte[] value)
+	{
+		return value.Hash(SHA256.Create());
+	}
 
-			if (value.Length == 0)
-				throw new ArgumentOutOfRangeException(nameof(value));
+	/// <summary>
+	/// SHA512 hash.
+	/// </summary>
+	/// <param name="value">The value to hash.</param>
+	/// <returns>The hash.</returns>
+	public static string Sha512(this byte[] value)
+	{
+		return value.Hash(SHA512.Create());
+	}
 
-			if (algo is null)
-				throw new ArgumentNullException(nameof(algo));
+	/// <summary>
+	/// Validates the password.
+	/// </summary>
+	/// <param name="secret"><see cref="Secret"/></param>
+	/// <param name="password">The password to check.</param>
+	/// <returns>Operation result.</returns>
+	public static bool IsValid(this Secret secret, SecureString password)
+		=> secret.IsValid(password.UnSecure());
 
-			using (algo)
-				return algo.ComputeHash(value).Digest();
-		}
+	/// <summary>
+	/// Validates the password.
+	/// </summary>
+	/// <param name="secret"><see cref="Secret"/></param>
+	/// <param name="password">The password to check.</param>
+	/// <returns>Operation result.</returns>
+	public static bool IsValid(this Secret secret, string password)
+		=> secret.Equals(password.CreateSecret(secret));
 
-		/// <summary>
-		/// MD5 hash.
-		/// </summary>
-		/// <param name="value">The value to hash.</param>
-		/// <returns>The hash.</returns>
-		public static string Md5(this byte[] value)
-		{
-			return value.Hash(MD5.Create());
-		}
+	/// <summary>
+	/// Creates a new <see cref="Secret"/> from the plain text.
+	/// </summary>
+	/// <param name="plainText">The plain text.</param>
+	/// <returns><see cref="Secret"/></returns>
+	public static Secret CreateSecret(this SecureString plainText)
+		=> plainText.UnSecure().CreateSecret();
 
-		/// <summary>
-		/// SHA1 hash.
-		/// </summary>
-		/// <param name="value">The value to hash.</param>
-		/// <returns>The hash.</returns>
-		public static string Sha256(this byte[] value)
-		{
-			return value.Hash(SHA256.Create());
-		}
+	/// <summary>
+	/// Creates a new <see cref="Secret"/> from the plain text.
+	/// </summary>
+	/// <param name="plainText">The plain text.</param>
+	/// <returns><see cref="Secret"/></returns>
+	public static Secret CreateSecret(this string plainText)
+		=> plainText.CreateSecret(TypeHelper.GenerateSalt(Secret.DefaultSaltSize));
 
-		/// <summary>
-		/// SHA512 hash.
-		/// </summary>
-		/// <param name="value">The value to hash.</param>
-		/// <returns>The hash.</returns>
-		public static string Sha512(this byte[] value)
-		{
-			return value.Hash(SHA512.Create());
-		}
+	/// <summary>
+	/// Creates a new <see cref="Secret"/> from the plain text.
+	/// </summary>
+	/// <param name="plainText">The plain text.</param>
+	/// <param name="secret"><see cref="Secret"/></param>
+	/// <returns><see cref="Secret"/></returns>
+	public static Secret CreateSecret(this string plainText, Secret secret)
+		=> plainText.CreateSecret(secret.CheckOnNull(nameof(secret)).Salt, secret.Algo);
 
-		/// <summary>
-		/// Validates the password.
-		/// </summary>
-		/// <param name="secret"><see cref="Secret"/></param>
-		/// <param name="password">The password to check.</param>
-		/// <returns>Operation result.</returns>
-		public static bool IsValid(this Secret secret, SecureString password)
-			=> secret.IsValid(password.UnSecure());
-
-		/// <summary>
-		/// Validates the password.
-		/// </summary>
-		/// <param name="secret"><see cref="Secret"/></param>
-		/// <param name="password">The password to check.</param>
-		/// <returns>Operation result.</returns>
-		public static bool IsValid(this Secret secret, string password)
-			=> secret.Equals(password.CreateSecret(secret));
-
-		/// <summary>
-		/// Creates a new <see cref="Secret"/> from the plain text.
-		/// </summary>
-		/// <param name="plainText">The plain text.</param>
-		/// <returns><see cref="Secret"/></returns>
-		public static Secret CreateSecret(this SecureString plainText)
-			=> plainText.UnSecure().CreateSecret();
-
-		/// <summary>
-		/// Creates a new <see cref="Secret"/> from the plain text.
-		/// </summary>
-		/// <param name="plainText">The plain text.</param>
-		/// <returns><see cref="Secret"/></returns>
-		public static Secret CreateSecret(this string plainText)
-			=> plainText.CreateSecret(TypeHelper.GenerateSalt(Secret.DefaultSaltSize));
-
-		/// <summary>
-		/// Creates a new <see cref="Secret"/> from the plain text.
-		/// </summary>
-		/// <param name="plainText">The plain text.</param>
-		/// <param name="secret"><see cref="Secret"/></param>
-		/// <returns><see cref="Secret"/></returns>
-		public static Secret CreateSecret(this string plainText, Secret secret)
-			=> plainText.CreateSecret(secret.CheckOnNull(nameof(secret)).Salt, secret.Algo);
-
-		/// <summary>
-		/// Creates a new <see cref="Secret"/> from the plain text.
-		/// </summary>
-		/// <param name="plainText">The plain text.</param>
-		/// <param name="salt">The salt.</param>
-		/// <param name="algo">The hash algorithm.</param>
-		/// <returns><see cref="Secret"/></returns>
-		public static Secret CreateSecret(this string plainText, byte[] salt, CryptoAlgorithm algo = null)
-		{
-			if (plainText.IsEmpty())
-				throw new ArgumentNullException(nameof(plainText));
+	/// <summary>
+	/// Creates a new <see cref="Secret"/> from the plain text.
+	/// </summary>
+	/// <param name="plainText">The plain text.</param>
+	/// <param name="salt">The salt.</param>
+	/// <param name="algo">The hash algorithm.</param>
+	/// <returns><see cref="Secret"/></returns>
+	public static Secret CreateSecret(this string plainText, byte[] salt, CryptoAlgorithm algo = null)
+	{
+		if (plainText.IsEmpty())
+			throw new ArgumentNullException(nameof(plainText));
 
-			if (salt is null)
-				throw new ArgumentNullException(nameof(salt));
+		if (salt is null)
+			throw new ArgumentNullException(nameof(salt));
 
-			var unencodedBytes = plainText.Unicode();
-			var buffer = new byte[unencodedBytes.Length + salt.Length];
+		var unencodedBytes = plainText.Unicode();
+		var buffer = new byte[unencodedBytes.Length + salt.Length];
 
-			Buffer.BlockCopy(unencodedBytes, 0, buffer, 0, unencodedBytes.Length);
-			Buffer.BlockCopy(salt, 0, buffer, unencodedBytes.Length - 1, salt.Length);
+		Buffer.BlockCopy(unencodedBytes, 0, buffer, 0, unencodedBytes.Length);
+		Buffer.BlockCopy(salt, 0, buffer, unencodedBytes.Length - 1, salt.Length);
 
-			return new Secret(buffer, salt, algo);
-		}
+		return new Secret(buffer, salt, algo);
 	}
 }
\ No newline at end of file
diff --git a/Security/IAuthorization.cs b/Security/IAuthorization.cs
index 44ffe7d3..0a21f975 100644
--- a/Security/IAuthorization.cs
+++ b/Security/IAuthorization.cs
@@ -1,87 +1,86 @@
-namespace Ecng.Security
-{
-	using System;
-	using System.Net;
-	using System.Security;
-	using System.Threading;
-	using System.Threading.Tasks;
+namespace Ecng.Security;
+
+using System;
+using System.Net;
+using System.Security;
+using System.Threading;
+using System.Threading.Tasks;
 
-	using Ecng.Common;
+using Ecng.Common;
 
+/// <summary>
+/// Defines the interface to an authorization module.
+/// </summary>
+public interface IAuthorization
+{
 	/// <summary>
-	/// Defines the interface to an authorization module.
+	/// Check login and password.
 	/// </summary>
-	public interface IAuthorization
-	{
-		/// <summary>
-		/// Check login and password.
-		/// </summary>
-		/// <param name="login">Login.</param>
-		/// <param name="password">Password.</param>
-		/// <param name="clientAddress">Remote network address.</param>
-		/// <returns>Session identifier.</returns>
-		/// <param name="cancellationToken"><see cref="CancellationToken"/></param>
-		/// <returns><see cref="ValueTask{T}"/></returns>
-		ValueTask<string> ValidateCredentials(string login, SecureString password, IPAddress clientAddress, CancellationToken cancellationToken);
-	}
+	/// <param name="login">Login.</param>
+	/// <param name="password">Password.</param>
+	/// <param name="clientAddress">Remote network address.</param>
+	/// <returns>Session identifier.</returns>
+	/// <param name="cancellationToken"><see cref="CancellationToken"/></param>
+	/// <returns><see cref="ValueTask{T}"/></returns>
+	ValueTask<string> ValidateCredentials(string login, SecureString password, IPAddress clientAddress, CancellationToken cancellationToken);
+}
 
+/// <summary>
+/// Authorization module granted access for everyone.
+/// </summary>
+public class AnonymousAuthorization : IAuthorization
+{
 	/// <summary>
-	/// Authorization module granted access for everyone.
+	/// Initializes a new instance of the <see cref="AnonymousAuthorization"/>.
 	/// </summary>
-	public class AnonymousAuthorization : IAuthorization
+	public AnonymousAuthorization()
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="AnonymousAuthorization"/>.
-		/// </summary>
-		public AnonymousAuthorization()
-		{
-		}
-
-		/// <inheritdoc />
-		public virtual ValueTask<string> ValidateCredentials(string login, SecureString password, IPAddress clientAddress, CancellationToken cancellationToken)
-			=> new(Guid.NewGuid().To<string>());
 	}
 
+	/// <inheritdoc />
+	public virtual ValueTask<string> ValidateCredentials(string login, SecureString password, IPAddress clientAddress, CancellationToken cancellationToken)
+		=> new(Guid.NewGuid().To<string>());
+}
+
+/// <summary>
+/// The connection access check module which provides access by simple login and password set.
+/// </summary>
+public class SimpleAuthorization : AnonymousAuthorization
+{
 	/// <summary>
-	/// The connection access check module which provides access by simple login and password set.
+	/// Initializes a new instance of the <see cref="SimpleAuthorization"/>.
 	/// </summary>
-	public class SimpleAuthorization : AnonymousAuthorization
+	public SimpleAuthorization()
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="SimpleAuthorization"/>.
-		/// </summary>
-		public SimpleAuthorization()
-		{
-		}
-
-		/// <summary>
-		/// Login.
-		/// </summary>
-		public string Login { get; set; }
-
-		/// <summary>
-		/// Password.
-		/// </summary>
-		public SecureString Password { get; set; }
-
-		/// <inheritdoc />
-		public override ValueTask<string> ValidateCredentials(string login, SecureString password, IPAddress clientAddress, CancellationToken cancellationToken)
-		{
-			if (Login.IsEmpty())
-				return base.ValidateCredentials(login, password, clientAddress, cancellationToken);
-			else if (login.EqualsIgnoreCase(Login) && password != null && Password != null && password.IsEqualTo(Password))
-				return new(Guid.NewGuid().To<string>());
-
-			throw new UnauthorizedAccessException();
-		}
 	}
 
 	/// <summary>
-	/// <see cref="IAuthorization"/> do not allow access.
+	/// Login.
+	/// </summary>
+	public string Login { get; set; }
+
+	/// <summary>
+	/// Password.
 	/// </summary>
-	public class UnauthorizedAuthorization : IAuthorization
+	public SecureString Password { get; set; }
+
+	/// <inheritdoc />
+	public override ValueTask<string> ValidateCredentials(string login, SecureString password, IPAddress clientAddress, CancellationToken cancellationToken)
 	{
-		ValueTask<string> IAuthorization.ValidateCredentials(string login, SecureString password, IPAddress clientAddress, CancellationToken cancellationToken)
-			=> throw new UnauthorizedAccessException();
+		if (Login.IsEmpty())
+			return base.ValidateCredentials(login, password, clientAddress, cancellationToken);
+		else if (login.EqualsIgnoreCase(Login) && password != null && Password != null && password.IsEqualTo(Password))
+			return new(Guid.NewGuid().To<string>());
+
+		throw new UnauthorizedAccessException();
 	}
+}
+
+/// <summary>
+/// <see cref="IAuthorization"/> do not allow access.
+/// </summary>
+public class UnauthorizedAuthorization : IAuthorization
+{
+	ValueTask<string> IAuthorization.ValidateCredentials(string login, SecureString password, IPAddress clientAddress, CancellationToken cancellationToken)
+		=> throw new UnauthorizedAccessException();
 }
\ No newline at end of file
diff --git a/Security/Secret.cs b/Security/Secret.cs
index f97cfdd5..11142980 100644
--- a/Security/Secret.cs
+++ b/Security/Secret.cs
@@ -1,113 +1,112 @@
-namespace Ecng.Security
+namespace Ecng.Security;
+
+using System;
+using System.Linq;
+
+using Ecng.Common;
+using Ecng.Collections;
+
+/// <summary>
+/// Secret.
+/// </summary>
+public class Secret : Equatable<Secret>
 {
-	using System;
-	using System.Linq;
+	/// <summary>
+	/// Initializes a new instance of the <see cref="Secret"/> class.
+	/// </summary>
+	public Secret()
+	{
+		Algo = CreateDefaultAlgo();
+	}
 
-	using Ecng.Common;
-	using Ecng.Collections;
+	/// <summary>
+	/// Initializes a new instance of the <see cref="Secret"/> class.
+	/// </summary>
+	/// <param name="passwordBytes"></param>
+	/// <param name="salt">The salt.</param>
+	/// <param name="algo">Hash algorithm. Can be <see langword="null"/>.</param>
+	public Secret(byte[] passwordBytes, byte[] salt, CryptoAlgorithm algo = null)
+	{
+		Salt = salt ?? throw new ArgumentNullException(nameof(salt));
+		Algo = algo ?? CreateDefaultAlgo();
+		Hash = passwordBytes ?? throw new ArgumentNullException(nameof(passwordBytes));
+
+		Hash = Algo.Encrypt(Hash);
+	}
+
+	private static CryptoAlgorithm CreateDefaultAlgo() => CryptoAlgorithm.Create(AlgorithmTypes.Hash);
+
+	/// <summary>
+	/// The default salt size.
+	/// </summary>
+	public const int DefaultSaltSize = 128;
 
 	/// <summary>
-	/// Secret.
+	/// Gets or sets the salt.
 	/// </summary>
-	public class Secret : Equatable<Secret>
+	/// <value>The salt.</value>
+	public byte[] Salt { get; set; }
+
+	/// <summary>
+	/// Gets or sets the hash.
+	/// </summary>
+	/// <value>The hash.</value>
+	public byte[] Hash { get; set; }
+
+	/// <summary>
+	/// Gets the hash algorithm.
+	/// </summary>
+	[Newtonsoft.Json.JsonIgnore]
+	public CryptoAlgorithm Algo { get; }
+
+	/// <inheritdoc />
+	protected override bool OnEquals(Secret other)
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="Secret"/> class.
-		/// </summary>
-		public Secret()
+		if (EnsureGetHashCode() != other.EnsureGetHashCode())
+			return false;
+
+		if (Hash is null)
 		{
-			Algo = CreateDefaultAlgo();
+			if (other.Hash != null)
+				return false;
 		}
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="Secret"/> class.
-		/// </summary>
-		/// <param name="passwordBytes"></param>
-		/// <param name="salt">The salt.</param>
-		/// <param name="algo">Hash algorithm. Can be <see langword="null"/>.</param>
-		public Secret(byte[] passwordBytes, byte[] salt, CryptoAlgorithm algo = null)
+		else
 		{
-			Salt = salt ?? throw new ArgumentNullException(nameof(salt));
-			Algo = algo ?? CreateDefaultAlgo();
-			Hash = passwordBytes ?? throw new ArgumentNullException(nameof(passwordBytes));
-
-			Hash = Algo.Encrypt(Hash);
+			if (other.Hash is null)
+				return false;
+			else if (!Hash.SequenceEqual(other.Hash))
+				return false;
 		}
 
-		private static CryptoAlgorithm CreateDefaultAlgo() => CryptoAlgorithm.Create(AlgorithmTypes.Hash);
-
-		/// <summary>
-		/// The default salt size.
-		/// </summary>
-		public const int DefaultSaltSize = 128;
-
-		/// <summary>
-		/// Gets or sets the salt.
-		/// </summary>
-		/// <value>The salt.</value>
-		public byte[] Salt { get; set; }
-
-		/// <summary>
-		/// Gets or sets the hash.
-		/// </summary>
-		/// <value>The hash.</value>
-		public byte[] Hash { get; set; }
-
-		/// <summary>
-		/// Gets the hash algorithm.
-		/// </summary>
-		[Newtonsoft.Json.JsonIgnore]
-		public CryptoAlgorithm Algo { get; }
-
-		/// <inheritdoc />
-		protected override bool OnEquals(Secret other)
+		if (Salt is null)
 		{
-			if (EnsureGetHashCode() != other.EnsureGetHashCode())
+			if (other.Salt != null)
 				return false;
-
-			if (Hash is null)
-			{
-				if (other.Hash != null)
-					return false;
-			}
-			else
-			{
-				if (other.Hash is null)
-					return false;
-				else if (!Hash.SequenceEqual(other.Hash))
-					return false;
-			}
-
-			if (Salt is null)
-			{
-				if (other.Salt != null)
-					return false;
-			}
-			else
-			{
-				if (other.Salt is null)
-					return false;
-				else if (!Salt.SequenceEqual(other.Salt))
-					return false;
-			}
-
-			return true;
 		}
-
-		private int _hashCode;
-
-		private int EnsureGetHashCode()
+		else
 		{
-			if (_hashCode == 0)
-				_hashCode = (Hash?.GetHashCodeEx() ?? 0) ^ (Salt?.GetHashCodeEx() ?? 0);
-
-			return _hashCode;
+			if (other.Salt is null)
+				return false;
+			else if (!Salt.SequenceEqual(other.Salt))
+				return false;
 		}
 
-		/// <inheritdoc />
-		public override int GetHashCode() => EnsureGetHashCode();
+		return true;
+	}
+
+	private int _hashCode;
+
+	private int EnsureGetHashCode()
+	{
+		if (_hashCode == 0)
+			_hashCode = (Hash?.GetHashCodeEx() ?? 0) ^ (Salt?.GetHashCodeEx() ?? 0);
 
-		/// <inheritdoc />
-		public override Secret Clone() => new() { Hash = Hash?.ToArray(), Salt = Salt?.ToArray() };
+		return _hashCode;
 	}
+
+	/// <inheritdoc />
+	public override int GetHashCode() => EnsureGetHashCode();
+
+	/// <inheritdoc />
+	public override Secret Clone() => new() { Hash = Hash?.ToArray(), Salt = Salt?.ToArray() };
 }
\ No newline at end of file
diff --git a/Serialization/ContinueOnExceptionContext.cs b/Serialization/ContinueOnExceptionContext.cs
index 4ab7ec41..7f73e169 100644
--- a/Serialization/ContinueOnExceptionContext.cs
+++ b/Serialization/ContinueOnExceptionContext.cs
@@ -1,53 +1,52 @@
-namespace Ecng.Serialization
+namespace Ecng.Serialization;
+
+using System;
+
+using Ecng.Common;
+
+/// <summary>
+/// Context for continue on exception.
+/// </summary>
+public class ContinueOnExceptionContext
 {
-	using System;
+	/// <summary>
+	/// Initializes a new instance of the <see cref="ContinueOnExceptionContext"/>.
+	/// </summary>
+	public event Action<Exception> Error;
+
+	/// <summary>
+	/// Do not encrypt.
+	/// </summary>
+	public bool DoNotEncrypt { get; set; }
 
-	using Ecng.Common;
+	/// <summary>
+	/// Initializes a new instance of the <see cref="ContinueOnExceptionContext"/>.
+	/// </summary>
+	/// <param name="ex">The exception.</param>
+	/// <returns>Operation result.</returns>
+	public static bool TryProcess(Exception ex)
+	{
+		if (ex is null)
+			throw new ArgumentNullException(nameof(ex));
+
+		var ctx = Scope<ContinueOnExceptionContext>.Current;
+
+		if (ctx is null)
+			return false;
+
+		ctx.Value.Process(ex);
+		return true;
+	}
 
 	/// <summary>
-	/// Context for continue on exception.
+	/// Process the exception.
 	/// </summary>
-	public class ContinueOnExceptionContext
+	/// <param name="ex">The exception.</param>
+	public void Process(Exception ex)
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="ContinueOnExceptionContext"/>.
-		/// </summary>
-		public event Action<Exception> Error;
-
-		/// <summary>
-		/// Do not encrypt.
-		/// </summary>
-		public bool DoNotEncrypt { get; set; }
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="ContinueOnExceptionContext"/>.
-		/// </summary>
-		/// <param name="ex">The exception.</param>
-		/// <returns>Operation result.</returns>
-		public static bool TryProcess(Exception ex)
-		{
-			if (ex is null)
-				throw new ArgumentNullException(nameof(ex));
-
-			var ctx = Scope<ContinueOnExceptionContext>.Current;
-
-			if (ctx is null)
-				return false;
-
-			ctx.Value.Process(ex);
-			return true;
-		}
-
-		/// <summary>
-		/// Process the exception.
-		/// </summary>
-		/// <param name="ex">The exception.</param>
-		public void Process(Exception ex)
-		{
-			if (ex is null)
-				throw new ArgumentNullException(nameof(ex));
-
-			Error?.Invoke(ex);
-		}
+		if (ex is null)
+			throw new ArgumentNullException(nameof(ex));
+
+		Error?.Invoke(ex);
 	}
 }
\ No newline at end of file
diff --git a/Serialization/DelayAction.cs b/Serialization/DelayAction.cs
index a976b103..fc2e911a 100644
--- a/Serialization/DelayAction.cs
+++ b/Serialization/DelayAction.cs
@@ -1,580 +1,579 @@
-namespace Ecng.Serialization
-{
-	using System;
-	using System.Collections.Generic;
-	using System.Diagnostics;
-	using System.Linq;
-	using System.Threading;
+namespace Ecng.Serialization;
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading;
 
-	using Ecng.Collections;
-	using Ecng.Common;
+using Ecng.Collections;
+using Ecng.Common;
 
+/// <summary>
+/// Provides delayed action execution with batching support.
+/// </summary>
+public class DelayAction : Disposable
+{
 	/// <summary>
-	/// Provides delayed action execution with batching support.
+	/// Represents a group of delayed actions.
 	/// </summary>
-	public class DelayAction : Disposable
+	public interface IGroup
 	{
 		/// <summary>
-		/// Represents a group of delayed actions.
+		/// Adds an action to the group.
 		/// </summary>
-		public interface IGroup
-		{
-			/// <summary>
-			/// Adds an action to the group.
-			/// </summary>
-			/// <param name="action">The action to execute.</param>
-			/// <param name="postAction">An action to execute after the main action, with an exception parameter if an error occurred.</param>
-			/// <param name="canBatch">Determines if the action can be batched.</param>
-			/// <param name="breakBatchOnError">Determines if batching should break on error.</param>
-			void Add(Action action, Action<Exception> postAction = null, bool canBatch = true, bool breakBatchOnError = true);
+		/// <param name="action">The action to execute.</param>
+		/// <param name="postAction">An action to execute after the main action, with an exception parameter if an error occurred.</param>
+		/// <param name="canBatch">Determines if the action can be batched.</param>
+		/// <param name="breakBatchOnError">Determines if batching should break on error.</param>
+		void Add(Action action, Action<Exception> postAction = null, bool canBatch = true, bool breakBatchOnError = true);
 
-			/// <summary>
-			/// Adds an action that receives an IDisposable scope to the group.
-			/// </summary>
-			/// <param name="action">The action to execute with the provided scope.</param>
-			/// <param name="postAction">An action to execute after the main action, with an exception parameter if an error occurred.</param>
-			/// <param name="canBatch">Determines if the action can be batched.</param>
-			/// <param name="breakBatchOnError">Determines if batching should break on error.</param>
-			void Add(Action<IDisposable> action, Action<Exception> postAction = null, bool canBatch = true, bool breakBatchOnError = true);
+		/// <summary>
+		/// Adds an action that receives an IDisposable scope to the group.
+		/// </summary>
+		/// <param name="action">The action to execute with the provided scope.</param>
+		/// <param name="postAction">An action to execute after the main action, with an exception parameter if an error occurred.</param>
+		/// <param name="canBatch">Determines if the action can be batched.</param>
+		/// <param name="breakBatchOnError">Determines if batching should break on error.</param>
+		void Add(Action<IDisposable> action, Action<Exception> postAction = null, bool canBatch = true, bool breakBatchOnError = true);
 
-			/// <summary>
-			/// Waits until all actions in the group have been flushed.
-			/// </summary>
-			/// <param name="dispose">Determines if the DelayAction instance should be disposed after flushing.</param>
-			void WaitFlush(bool dispose);
-		}
+		/// <summary>
+		/// Waits until all actions in the group have been flushed.
+		/// </summary>
+		/// <param name="dispose">Determines if the DelayAction instance should be disposed after flushing.</param>
+		void WaitFlush(bool dispose);
+	}
 
+	/// <summary>
+	/// Represents a group of delayed actions with a specific group state.
+	/// </summary>
+	/// <typeparam name="T">The type of the group state, which implements IDisposable.</typeparam>
+	public interface IGroup<T> : IGroup
+		where T : IDisposable
+	{
 		/// <summary>
-		/// Represents a group of delayed actions with a specific group state.
+		/// Adds an action that receives the group state.
 		/// </summary>
-		/// <typeparam name="T">The type of the group state, which implements IDisposable.</typeparam>
-		public interface IGroup<T> : IGroup
-			where T : IDisposable
-		{
-			/// <summary>
-			/// Adds an action that receives the group state.
-			/// </summary>
-			/// <param name="action">The action to execute with the group state.</param>
-			/// <param name="postAction">An action to execute after the main action, with an exception parameter if an error occurred.</param>
-			/// <param name="canBatch">Determines if the action can be batched.</param>
-			/// <param name="breakBatchOnError">Determines if batching should break on error.</param>
-			void Add(Action<T> action, Action<Exception> postAction = null, bool canBatch = true, bool breakBatchOnError = true);
+		/// <param name="action">The action to execute with the group state.</param>
+		/// <param name="postAction">An action to execute after the main action, with an exception parameter if an error occurred.</param>
+		/// <param name="canBatch">Determines if the action can be batched.</param>
+		/// <param name="breakBatchOnError">Determines if batching should break on error.</param>
+		void Add(Action<T> action, Action<Exception> postAction = null, bool canBatch = true, bool breakBatchOnError = true);
 
-			/// <summary>
-			/// Adds an action that receives the group state and an additional state parameter.
-			/// </summary>
-			/// <typeparam name="TState">The type of the additional state.</typeparam>
-			/// <param name="action">The action to execute with the group state and additional state.</param>
-			/// <param name="state">The additional state for the action.</param>
-			/// <param name="postAction">An action to execute after the main action, with an exception parameter if an error occurred.</param>
-			/// <param name="canBatch">Determines if the action can be batched.</param>
-			/// <param name="breakBatchOnError">Determines if batching should break on error.</param>
-			/// <param name="compareStates">A function to compare two state values for batching decisions.</param>
-			void Add<TState>(Action<T, TState> action, TState state, Action<Exception> postAction = null, bool canBatch = true, bool breakBatchOnError = true, Func<TState, TState, bool> compareStates = null);
-		}
+		/// <summary>
+		/// Adds an action that receives the group state and an additional state parameter.
+		/// </summary>
+		/// <typeparam name="TState">The type of the additional state.</typeparam>
+		/// <param name="action">The action to execute with the group state and additional state.</param>
+		/// <param name="state">The additional state for the action.</param>
+		/// <param name="postAction">An action to execute after the main action, with an exception parameter if an error occurred.</param>
+		/// <param name="canBatch">Determines if the action can be batched.</param>
+		/// <param name="breakBatchOnError">Determines if batching should break on error.</param>
+		/// <param name="compareStates">A function to compare two state values for batching decisions.</param>
+		void Add<TState>(Action<T, TState> action, TState state, Action<Exception> postAction = null, bool canBatch = true, bool breakBatchOnError = true, Func<TState, TState, bool> compareStates = null);
+	}
 
-		private interface IInternalGroup
-		{
-			IDisposable Init();
-			IGroupItem[] GetItemsAndClear();
-		}
+	private interface IInternalGroup
+	{
+		IDisposable Init();
+		IGroupItem[] GetItemsAndClear();
+	}
 
-		private interface IGroupItem
-		{
-			void Do(IDisposable scope);
-			Action<Exception> PostAction { get; }
-			bool CanBatch { get; }
-			bool BreakBatchOnError { get; }
-		}
+	private interface IGroupItem
+	{
+		void Do(IDisposable scope);
+		Action<Exception> PostAction { get; }
+		bool CanBatch { get; }
+		bool BreakBatchOnError { get; }
+	}
 
-		private interface IInternalGroupItem
-		{
-			bool Equals(IGroupItem other);
-			int GetStateHashCode();
-		}
+	private interface IInternalGroupItem
+	{
+		bool Equals(IGroupItem other);
+		int GetStateHashCode();
+	}
 
-		private class Group<T>(DelayAction parent, Func<T> init) : IGroup<T>, IInternalGroup
-			where T : IDisposable
+	private class Group<T>(DelayAction parent, Func<T> init) : IGroup<T>, IInternalGroup
+		where T : IDisposable
+	{
+		private class Dummy : IDisposable
 		{
-			private class Dummy : IDisposable
+			void IDisposable.Dispose()
 			{
-				void IDisposable.Dispose()
-				{
-				}
 			}
+		}
 
-			private class Item<TState> : IGroupItem, IInternalGroupItem
-			{
-				private readonly TState _state;
-				private readonly Func<TState, TState, bool> _compareStates;
-				private readonly Action<T, TState> _action;
-
-				public virtual void Do(IDisposable scope)
-				{
-					_action((T)scope, _state);
-				}
+		private class Item<TState> : IGroupItem, IInternalGroupItem
+		{
+			private readonly TState _state;
+			private readonly Func<TState, TState, bool> _compareStates;
+			private readonly Action<T, TState> _action;
 
-				public Action<Exception> PostAction { get; protected set; }
-				public bool CanBatch { get; protected set; }
-				public bool BreakBatchOnError { get; protected set; }
+			public virtual void Do(IDisposable scope)
+			{
+				_action((T)scope, _state);
+			}
 
-				protected Item()
-				{
-				}
+			public Action<Exception> PostAction { get; protected set; }
+			public bool CanBatch { get; protected set; }
+			public bool BreakBatchOnError { get; protected set; }
 
-				public Item(Action<T, TState> action, TState state, Action<Exception> postAction, bool canBatch, bool breakBatchOnError, Func<TState, TState, bool> compareStates)
-				{
-					_state = state;
-					_compareStates = compareStates;
-					_action = action;
+			protected Item()
+			{
+			}
 
-					PostAction = postAction;
-					CanBatch = canBatch;
-					BreakBatchOnError = breakBatchOnError;
-				}
+			public Item(Action<T, TState> action, TState state, Action<Exception> postAction, bool canBatch, bool breakBatchOnError, Func<TState, TState, bool> compareStates)
+			{
+				_state = state;
+				_compareStates = compareStates;
+				_action = action;
 
-				bool IInternalGroupItem.Equals(IGroupItem other)
-				{
-					if (_compareStates is null)
-						return false;
+				PostAction = postAction;
+				CanBatch = canBatch;
+				BreakBatchOnError = breakBatchOnError;
+			}
 
+			bool IInternalGroupItem.Equals(IGroupItem other)
+			{
+				if (_compareStates is null)
+					return false;
 
-					if (other is not Item<TState> item)
-						return false;
 
-					return _compareStates(_state, item._state);
-				}
+				if (other is not Item<TState> item)
+					return false;
 
-				int IInternalGroupItem.GetStateHashCode()
-				{
-					return typeof(TState).GetHashCode() ^ (_state is null ? 0 : 1) ^ (_compareStates is null ? 0 : 1);
-				}
+				return _compareStates(_state, item._state);
 			}
 
-			private class FlushItem : Item<object>
+			int IInternalGroupItem.GetStateHashCode()
 			{
-				private readonly SyncObject _syncObject = new();
-				private bool _isProcessed;
-				private Exception _err;
-
-				/// <summary>
-				/// Initializes a new instance of the FlushItem class.
-				/// </summary>
-				/// <param name="parent">The parent DelayAction.</param>
-				/// <param name="dispose">Indicates if the parent should be disposed after flushing.</param>
-				public FlushItem(DelayAction parent, bool dispose)
-				{
-					if (parent is null)
-						throw new ArgumentNullException(nameof(parent));
-
-					PostAction = err =>
-					{
-						_err = err;
+				return typeof(TState).GetHashCode() ^ (_state is null ? 0 : 1) ^ (_compareStates is null ? 0 : 1);
+			}
+		}
 
-						if (dispose)
-							parent.Dispose();
+		private class FlushItem : Item<object>
+		{
+			private readonly SyncObject _syncObject = new();
+			private bool _isProcessed;
+			private Exception _err;
 
-						lock (_syncObject)
-						{
-							_isProcessed = true;
-							_syncObject.Pulse();
-						}
-					};
-					CanBatch = true;
-					BreakBatchOnError = true;
-				}
+			/// <summary>
+			/// Initializes a new instance of the FlushItem class.
+			/// </summary>
+			/// <param name="parent">The parent DelayAction.</param>
+			/// <param name="dispose">Indicates if the parent should be disposed after flushing.</param>
+			public FlushItem(DelayAction parent, bool dispose)
+			{
+				if (parent is null)
+					throw new ArgumentNullException(nameof(parent));
 
-				public override void Do(IDisposable scope)
+				PostAction = err =>
 				{
-				}
+					_err = err;
+
+					if (dispose)
+						parent.Dispose();
 
-				/// <summary>
-				/// Waits for this flush item to be processed.
-				/// </summary>
-				public void Wait()
-				{
 					lock (_syncObject)
 					{
-						if (!_isProcessed)
-							_syncObject.Wait();
+						_isProcessed = true;
+						_syncObject.Pulse();
 					}
-
-					if (_err != null)
-						throw _err;
-				}
+				};
+				CanBatch = true;
+				BreakBatchOnError = true;
 			}
 
-			private readonly DelayAction _parent = parent ?? throw new ArgumentNullException(nameof(parent));
-			private readonly Func<T> _init = init;
-			private readonly SynchronizedList<IGroupItem> _actions = [];
-			private readonly Dummy _dummy = new();
-
-			public IDisposable Init()
+			public override void Do(IDisposable scope)
 			{
-				if (_init is null)
-					return _dummy;
-
-				var state = _init.Invoke();
-
-				if (state is null)
-					throw new InvalidOperationException();
-
-				return state;
 			}
 
-			public void Add(Action action, Action<Exception> postAction = null, bool canBatch = true, bool breakBatchOnError = true)
+			/// <summary>
+			/// Waits for this flush item to be processed.
+			/// </summary>
+			public void Wait()
 			{
-				if (action is null)
-					throw new ArgumentNullException(nameof(action));
+				lock (_syncObject)
+				{
+					if (!_isProcessed)
+						_syncObject.Wait();
+				}
 
-				Add((IDisposable s) => action(), postAction, canBatch, breakBatchOnError);
+				if (_err != null)
+					throw _err;
 			}
+		}
 
-			public void Add(Action<IDisposable> action, Action<Exception> postAction = null, bool canBatch = true, bool breakBatchOnError = true)
-			{
-				if (action is null)
-					throw new ArgumentNullException(nameof(action));
+		private readonly DelayAction _parent = parent ?? throw new ArgumentNullException(nameof(parent));
+		private readonly Func<T> _init = init;
+		private readonly SynchronizedList<IGroupItem> _actions = [];
+		private readonly Dummy _dummy = new();
 
-				Add((T scope) => action(scope), postAction, canBatch, breakBatchOnError);
-			}
+		public IDisposable Init()
+		{
+			if (_init is null)
+				return _dummy;
 
-			public void Add(Action<T> action, Action<Exception> postAction = null, bool canBatch = true, bool breakBatchOnError = true)
-			{
-				if (action is null)
-					throw new ArgumentNullException(nameof(action));
+			var state = _init.Invoke();
 
-				Add<object>((scope, state) => action(scope), null, postAction, canBatch, breakBatchOnError);
-			}
+			if (state is null)
+				throw new InvalidOperationException();
 
-			public void Add<TState>(Action<T, TState> action, TState state, Action<Exception> postAction = null, bool canBatch = true, bool breakBatchOnError = true, Func<TState, TState, bool> compareStates = null)
-			{
-				Add(new Item<TState>(action, state, postAction, canBatch, breakBatchOnError, compareStates));
-			}
+			return state;
+		}
 
-			private void Add<TState>(Item<TState> item)
-			{
-				if (item is null)
-					throw new ArgumentNullException(nameof(item));
+		public void Add(Action action, Action<Exception> postAction = null, bool canBatch = true, bool breakBatchOnError = true)
+		{
+			if (action is null)
+				throw new ArgumentNullException(nameof(action));
 
-				lock (_actions.SyncRoot)
-					_actions.Add(item);
+			Add((IDisposable s) => action(), postAction, canBatch, breakBatchOnError);
+		}
 
-				_parent.TryCreateTimer();
-			}
+		public void Add(Action<IDisposable> action, Action<Exception> postAction = null, bool canBatch = true, bool breakBatchOnError = true)
+		{
+			if (action is null)
+				throw new ArgumentNullException(nameof(action));
 
-			public void WaitFlush(bool dispose)
-			{
-				var item = new FlushItem(_parent, dispose);
-				Add(item);
-				item.Wait();
-			}
+			Add((T scope) => action(scope), postAction, canBatch, breakBatchOnError);
+		}
 
-			public IGroupItem[] GetItemsAndClear()
-				=> _actions.CopyAndClear();
+		public void Add(Action<T> action, Action<Exception> postAction = null, bool canBatch = true, bool breakBatchOnError = true)
+		{
+			if (action is null)
+				throw new ArgumentNullException(nameof(action));
+
+			Add<object>((scope, state) => action(scope), null, postAction, canBatch, breakBatchOnError);
 		}
 
-		private readonly Action<Exception> _errorHandler;
+		public void Add<TState>(Action<T, TState> action, TState state, Action<Exception> postAction = null, bool canBatch = true, bool breakBatchOnError = true, Func<TState, TState, bool> compareStates = null)
+		{
+			Add(new Item<TState>(action, state, postAction, canBatch, breakBatchOnError, compareStates));
+		}
 
-		private Timer _flushTimer;
-		private bool _isFlushing;
+		private void Add<TState>(Item<TState> item)
+		{
+			if (item is null)
+				throw new ArgumentNullException(nameof(item));
 
-		private readonly CachedSynchronizedList<IGroup> _groups = [];
+			lock (_actions.SyncRoot)
+				_actions.Add(item);
 
-		/// <summary>
-		/// Initializes a new instance of the DelayAction class.
-		/// </summary>
-		/// <param name="errorHandler">A delegate to handle errors that occur during execution.</param>
-		public DelayAction(Action<Exception> errorHandler)
+			_parent.TryCreateTimer();
+		}
+
+		public void WaitFlush(bool dispose)
 		{
-			_errorHandler = errorHandler ?? throw new ArgumentNullException(nameof(errorHandler));
-			DefaultGroup = CreateGroup<IDisposable>(null);
+			var item = new FlushItem(_parent, dispose);
+			Add(item);
+			item.Wait();
 		}
 
-		/// <summary>
-		/// Gets the default group for delayed actions.
-		/// </summary>
-		public IGroup DefaultGroup { get; }
+		public IGroupItem[] GetItemsAndClear()
+			=> _actions.CopyAndClear();
+	}
 
-		private TimeSpan _flushInterval = TimeSpan.FromSeconds(1);
+	private readonly Action<Exception> _errorHandler;
 
-		/// <summary>
-		/// Gets or sets the flush interval for batching actions.
-		/// </summary>
-		public TimeSpan FlushInterval
+	private Timer _flushTimer;
+	private bool _isFlushing;
+
+	private readonly CachedSynchronizedList<IGroup> _groups = [];
+
+	/// <summary>
+	/// Initializes a new instance of the DelayAction class.
+	/// </summary>
+	/// <param name="errorHandler">A delegate to handle errors that occur during execution.</param>
+	public DelayAction(Action<Exception> errorHandler)
+	{
+		_errorHandler = errorHandler ?? throw new ArgumentNullException(nameof(errorHandler));
+		DefaultGroup = CreateGroup<IDisposable>(null);
+	}
+
+	/// <summary>
+	/// Gets the default group for delayed actions.
+	/// </summary>
+	public IGroup DefaultGroup { get; }
+
+	private TimeSpan _flushInterval = TimeSpan.FromSeconds(1);
+
+	/// <summary>
+	/// Gets or sets the flush interval for batching actions.
+	/// </summary>
+	public TimeSpan FlushInterval
+	{
+		get => _flushInterval;
+		set
 		{
-			get => _flushInterval;
-			set
-			{
-				_flushInterval = value;
+			_flushInterval = value;
 
-				lock (_groups.SyncRoot)
-				{
-					if (_flushTimer is null)
-						return;
+			lock (_groups.SyncRoot)
+			{
+				if (_flushTimer is null)
+					return;
 
-					_flushTimer.Interval(_flushInterval);
-				}
+				_flushTimer.Interval(_flushInterval);
 			}
 		}
+	}
 
-		/// <summary>
-		/// Creates a new group of delayed actions with a specific state.
-		/// </summary>
-		/// <typeparam name="T">The type of the group state, which implements IDisposable.</typeparam>
-		/// <param name="init">
-		/// A function to initialize the group state.
-		/// If null, a dummy state is used.
-		/// </param>
-		/// <returns>A new group for handling delayed actions.</returns>
-		public IGroup<T> CreateGroup<T>(Func<T> init)
-			where T : IDisposable
-		{
-			var group = new Group<T>(this, init);
-			_groups.Add(group);
-			return group;
-		}
+	/// <summary>
+	/// Creates a new group of delayed actions with a specific state.
+	/// </summary>
+	/// <typeparam name="T">The type of the group state, which implements IDisposable.</typeparam>
+	/// <param name="init">
+	/// A function to initialize the group state.
+	/// If null, a dummy state is used.
+	/// </param>
+	/// <returns>A new group for handling delayed actions.</returns>
+	public IGroup<T> CreateGroup<T>(Func<T> init)
+		where T : IDisposable
+	{
+		var group = new Group<T>(this, init);
+		_groups.Add(group);
+		return group;
+	}
 
-		/// <summary>
-		/// Deletes a previously created group of delayed actions.
-		/// </summary>
-		/// <param name="group">The group to delete.</param>
-		public void DeleteGroup(IGroup group)
-		{
-			if (group is null)
-				throw new ArgumentNullException(nameof(group));
+	/// <summary>
+	/// Deletes a previously created group of delayed actions.
+	/// </summary>
+	/// <param name="group">The group to delete.</param>
+	public void DeleteGroup(IGroup group)
+	{
+		if (group is null)
+			throw new ArgumentNullException(nameof(group));
 
-			if (group == DefaultGroup)
-				throw new ArgumentException();
+		if (group == DefaultGroup)
+			throw new ArgumentException();
 
-			_groups.Remove(group);
-		}
+		_groups.Remove(group);
+	}
 
-		private int _maxBatchSize = 1000;
+	private int _maxBatchSize = 1000;
 
-		/// <summary>
-		/// Gets or sets the maximum number of actions in a single batch.
-		/// </summary>
-		public int MaxBatchSize
+	/// <summary>
+	/// Gets or sets the maximum number of actions in a single batch.
+	/// </summary>
+	public int MaxBatchSize
+	{
+		get => _maxBatchSize;
+		set
 		{
-			get => _maxBatchSize;
-			set
-			{
-				if (value <= 0)
-					throw new ArgumentOutOfRangeException();
+			if (value <= 0)
+				throw new ArgumentOutOfRangeException();
 
-				_maxBatchSize = value;
-			}
+			_maxBatchSize = value;
 		}
+	}
 
-		private void TryCreateTimer()
+	private void TryCreateTimer()
+	{
+		lock (_groups.SyncRoot)
 		{
-			lock (_groups.SyncRoot)
+			if (!_isFlushing && _flushTimer is null)
 			{
-				if (!_isFlushing && _flushTimer is null)
-				{
-					_flushTimer = ThreadingHelper
-						.TimerInvariant(OnFlush)
-						.Interval(_flushInterval);
-				}
+				_flushTimer = ThreadingHelper
+					.TimerInvariant(OnFlush)
+					.Interval(_flushInterval);
 			}
 		}
+	}
 
-		/// <summary>
-		/// Flushes all queued actions by executing them in batches.
-		/// </summary>
-		public void OnFlush()
+	/// <summary>
+	/// Flushes all queued actions by executing them in batches.
+	/// </summary>
+	public void OnFlush()
+	{
+		try
 		{
-			try
+			IGroup[] groups;
+
+			lock (_groups.SyncRoot)
 			{
-				IGroup[] groups;
+				if (_isFlushing)
+					return;
 
-				lock (_groups.SyncRoot)
-				{
-					if (_isFlushing)
-						return;
+				_isFlushing = true;
 
-					_isFlushing = true;
+				groups = _groups.Cache;
+			}
 
-					groups = _groups.Cache;
-				}
+			var hasItems = false;
 
-				var hasItems = false;
+			try
+			{
+				Debug.WriteLine($"Groups: {groups.Length}");
 
-				try
+				foreach (var group in groups)
 				{
-					Debug.WriteLine($"Groups: {groups.Length}");
-
-					foreach (var group in groups)
-					{
-						if (IsDisposed)
-							break;
+					if (IsDisposed)
+						break;
 
-						var items = ((IInternalGroup)group).GetItemsAndClear();
+					var items = ((IInternalGroup)group).GetItemsAndClear();
 
-						if (items.Length == 0)
-							continue;
+					if (items.Length == 0)
+						continue;
 
-						Debug.WriteLine($"Flushing: {items.Length}");
+					Debug.WriteLine($"Flushing: {items.Length}");
 
-						hasItems = true;
+					hasItems = true;
 
-						var list = new List<IGroupItem>();
+					var list = new List<IGroupItem>();
 
-						foreach (var item in items)
+					foreach (var item in items)
+					{
+						if (!item.CanBatch)
 						{
-							if (!item.CanBatch)
-							{
-								Debug.WriteLine($"!!! Interrupt: {list.Count}");
+							Debug.WriteLine($"!!! Interrupt: {list.Count}");
 
-								BatchFlushAndClear(group, list);
-								list.Clear();
+							BatchFlushAndClear(group, list);
+							list.Clear();
 
-								if (IsDisposed)
-									break;
+							if (IsDisposed)
+								break;
 
-								Flush(item);
-							}
-							else
-								list.Add(item);
+							Flush(item);
 						}
-
-						if (!IsDisposed)
-							BatchFlushAndClear(group, list);
+						else
+							list.Add(item);
 					}
+
+					if (!IsDisposed)
+						BatchFlushAndClear(group, list);
 				}
-				finally
+			}
+			finally
+			{
+				lock (_groups.SyncRoot)
 				{
-					lock (_groups.SyncRoot)
-					{
-						_isFlushing = false;
+					_isFlushing = false;
 
-						if (!hasItems)
+					if (!hasItems)
+					{
+						if (_flushTimer != null)
 						{
-							if (_flushTimer != null)
-							{
-								_flushTimer.Dispose();
-								_flushTimer = null;
-							}
+							_flushTimer.Dispose();
+							_flushTimer = null;
 						}
 					}
 				}
 			}
-			catch (Exception ex)
-			{
-				_errorHandler(ex);
-			}
 		}
-
-		private void Flush(IGroupItem item)
+		catch (Exception ex)
 		{
-			Exception error;
+			_errorHandler(ex);
+		}
+	}
 
-			try
-			{
-				item.Do(null);
-				error = null;
-			}
-			catch (Exception ex)
-			{
-				_errorHandler(ex);
-				error = ex;
-			}
+	private void Flush(IGroupItem item)
+	{
+		Exception error;
 
-			item.PostAction?.Invoke(error);
+		try
+		{
+			item.Do(null);
+			error = null;
 		}
-
-		/// <summary>
-		/// Waits until all queued actions are flushed and optionally disposes the DelayAction instance.
-		/// </summary>
-		/// <param name="dispose">If set to true, disposes the DelayAction instance after flushing.</param>
-		public void WaitFlush(bool dispose)
+		catch (Exception ex)
 		{
-			_groups.Cache.Where(g => g != DefaultGroup).ForEach(g => g.WaitFlush(false));
-			DefaultGroup.WaitFlush(dispose);
+			_errorHandler(ex);
+			error = ex;
 		}
 
-		private class ItemComparer : IEqualityComparer<IGroupItem>
+		item.PostAction?.Invoke(error);
+	}
+
+	/// <summary>
+	/// Waits until all queued actions are flushed and optionally disposes the DelayAction instance.
+	/// </summary>
+	/// <param name="dispose">If set to true, disposes the DelayAction instance after flushing.</param>
+	public void WaitFlush(bool dispose)
+	{
+		_groups.Cache.Where(g => g != DefaultGroup).ForEach(g => g.WaitFlush(false));
+		DefaultGroup.WaitFlush(dispose);
+	}
+
+	private class ItemComparer : IEqualityComparer<IGroupItem>
+	{
+		bool IEqualityComparer<IGroupItem>.Equals(IGroupItem x, IGroupItem y)
 		{
-			bool IEqualityComparer<IGroupItem>.Equals(IGroupItem x, IGroupItem y)
-			{
-				return ((IInternalGroupItem)x).Equals(y);
-			}
+			return ((IInternalGroupItem)x).Equals(y);
+		}
 
-			int IEqualityComparer<IGroupItem>.GetHashCode(IGroupItem obj)
-			{
-				return ((IInternalGroupItem)obj).GetStateHashCode();
-			}
+		int IEqualityComparer<IGroupItem>.GetHashCode(IGroupItem obj)
+		{
+			return ((IInternalGroupItem)obj).GetStateHashCode();
 		}
+	}
 
-		private static readonly IEqualityComparer<IGroupItem> _itemComparer = new ItemComparer();
+	private static readonly IEqualityComparer<IGroupItem> _itemComparer = new ItemComparer();
 
-		private void BatchFlushAndClear(IGroup group, ICollection<IGroupItem> actions)
-		{
-			if (actions.IsEmpty())
-				return;
+	private void BatchFlushAndClear(IGroup group, ICollection<IGroupItem> actions)
+	{
+		if (actions.IsEmpty())
+			return;
 
-			Debug.WriteLine($"Batch: {actions.Count}");
+		Debug.WriteLine($"Batch: {actions.Count}");
 
-			Exception error = null;
+		Exception error = null;
 
-			try
-			{
-				using var scope = ((IInternalGroup)group).Init();
+		try
+		{
+			using var scope = ((IInternalGroup)group).Init();
 
-				foreach (var packet in actions.Distinct(_itemComparer).Batch(MaxBatchSize))
+			foreach (var packet in actions.Distinct(_itemComparer).Batch(MaxBatchSize))
+			{
+				using (var batch = BeginBatch(group))
 				{
-					using (var batch = BeginBatch(group))
+					foreach (var action in packet)
 					{
-						foreach (var action in packet)
-						{
-							if (action.BreakBatchOnError)
-								action.Do(scope);
-							else
-								Flush(action);
+						if (action.BreakBatchOnError)
+							action.Do(scope);
+						else
+							Flush(action);
 
-							if (IsDisposed)
-								break;
-						}
-
-						batch.Commit();
+						if (IsDisposed)
+							break;
 					}
 
-					if (IsDisposed)
-						break;
+					batch.Commit();
 				}
-			}
-			catch (Exception ex)
-			{
-				_errorHandler(ex);
-				error = ex;
-			}
 
-			actions
-				.Where(a => a.PostAction != null)
-				.ForEach(a => a.PostAction(error));
+				if (IsDisposed)
+					break;
+			}
 		}
-
-		private class DummyBatchContext : IBatchContext
+		catch (Exception ex)
 		{
-			void IDisposable.Dispose()
-			{
-			}
-
-			void IBatchContext.Commit()
-			{
-			}
+			_errorHandler(ex);
+			error = ex;
 		}
 
-		private readonly DummyBatchContext _batchContext = new();
+		actions
+			.Where(a => a.PostAction != null)
+			.ForEach(a => a.PostAction(error));
+	}
 
-		/// <summary>
-		/// Begins a new batch for the specified group.
-		/// </summary>
-		/// <param name="group">The group for which to begin the batch.</param>
-		/// <returns>An IBatchContext representing the batch operation.</returns>
-		protected virtual IBatchContext BeginBatch(IGroup group)
+	private class DummyBatchContext : IBatchContext
+	{
+		void IDisposable.Dispose()
 		{
-			return _batchContext;
 		}
+
+		void IBatchContext.Commit()
+		{
+		}
+	}
+
+	private readonly DummyBatchContext _batchContext = new();
+
+	/// <summary>
+	/// Begins a new batch for the specified group.
+	/// </summary>
+	/// <param name="group">The group for which to begin the batch.</param>
+	/// <returns>An IBatchContext representing the batch operation.</returns>
+	protected virtual IBatchContext BeginBatch(IGroup group)
+	{
+		return _batchContext;
 	}
 }
\ No newline at end of file
diff --git a/Serialization/IBatchContext.cs b/Serialization/IBatchContext.cs
index 22817093..6c50139d 100644
--- a/Serialization/IBatchContext.cs
+++ b/Serialization/IBatchContext.cs
@@ -1,15 +1,14 @@
-namespace Ecng.Serialization
-{
-	using System;
+namespace Ecng.Serialization;
+
+using System;
 
+/// <summary>
+/// Defines a context for batch operations that supports committing transactions and resource disposal.
+/// </summary>
+public interface IBatchContext : IDisposable
+{
 	/// <summary>
-	/// Defines a context for batch operations that supports committing transactions and resource disposal.
+	/// Commits the current batch of operations.
 	/// </summary>
-	public interface IBatchContext : IDisposable
-	{
-		/// <summary>
-		/// Commits the current batch of operations.
-		/// </summary>
-		void Commit();
-	}
+	void Commit();
 }
\ No newline at end of file
diff --git a/Serialization/IPersistable.cs b/Serialization/IPersistable.cs
index e7dacd6b..cd4aff15 100644
--- a/Serialization/IPersistable.cs
+++ b/Serialization/IPersistable.cs
@@ -1,45 +1,44 @@
-namespace Ecng.Serialization
-{
-	using System.Threading;
-	using System.Threading.Tasks;
+namespace Ecng.Serialization;
+
+using System.Threading;
+using System.Threading.Tasks;
 
+/// <summary>
+/// Interface for objects whose state can be persisted synchronously using a SettingsStorage.
+/// </summary>
+public interface IPersistable
+{
 	/// <summary>
-	/// Interface for objects whose state can be persisted synchronously using a SettingsStorage.
+	/// Loads the state of the object from the specified SettingsStorage.
 	/// </summary>
-	public interface IPersistable
-	{
-		/// <summary>
-		/// Loads the state of the object from the specified SettingsStorage.
-		/// </summary>
-		/// <param name="storage">The SettingsStorage instance from which to load the data.</param>
-		void Load(SettingsStorage storage);
+	/// <param name="storage">The SettingsStorage instance from which to load the data.</param>
+	void Load(SettingsStorage storage);
 
-		/// <summary>
-		/// Saves the state of the object to the specified SettingsStorage.
-		/// </summary>
-		/// <param name="storage">The SettingsStorage instance to which to save the data.</param>
-		void Save(SettingsStorage storage);
-	}
+	/// <summary>
+	/// Saves the state of the object to the specified SettingsStorage.
+	/// </summary>
+	/// <param name="storage">The SettingsStorage instance to which to save the data.</param>
+	void Save(SettingsStorage storage);
+}
 
+/// <summary>
+/// Interface for objects whose state can be persisted asynchronously using a SettingsStorage.
+/// </summary>
+public interface IAsyncPersistable
+{
 	/// <summary>
-	/// Interface for objects whose state can be persisted asynchronously using a SettingsStorage.
+	/// Asynchronously loads the state of the object from the specified SettingsStorage.
 	/// </summary>
-	public interface IAsyncPersistable
-	{
-		/// <summary>
-		/// Asynchronously loads the state of the object from the specified SettingsStorage.
-		/// </summary>
-		/// <param name="storage">The SettingsStorage instance from which to load the data.</param>
-		/// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
-		/// <returns>A task that represents the asynchronous load operation.</returns>
-		Task LoadAsync(SettingsStorage storage, CancellationToken cancellationToken);
+	/// <param name="storage">The SettingsStorage instance from which to load the data.</param>
+	/// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
+	/// <returns>A task that represents the asynchronous load operation.</returns>
+	Task LoadAsync(SettingsStorage storage, CancellationToken cancellationToken);
 
-		/// <summary>
-		/// Asynchronously saves the state of the object to the specified SettingsStorage.
-		/// </summary>
-		/// <param name="storage">The SettingsStorage instance to which to save the data.</param>
-		/// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
-		/// <returns>A task that represents the asynchronous save operation.</returns>
-		Task SaveAsync(SettingsStorage storage, CancellationToken cancellationToken);
-	}
+	/// <summary>
+	/// Asynchronously saves the state of the object to the specified SettingsStorage.
+	/// </summary>
+	/// <param name="storage">The SettingsStorage instance to which to save the data.</param>
+	/// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
+	/// <returns>A task that represents the asynchronous save operation.</returns>
+	Task SaveAsync(SettingsStorage storage, CancellationToken cancellationToken);
 }
\ No newline at end of file
diff --git a/Serialization/IPersistableAdapter.cs b/Serialization/IPersistableAdapter.cs
index e1e9386d..801c64cd 100644
--- a/Serialization/IPersistableAdapter.cs
+++ b/Serialization/IPersistableAdapter.cs
@@ -1,13 +1,12 @@
-namespace Ecng.Serialization
+namespace Ecng.Serialization;
+
+/// <summary>
+/// Provides an adapter for persisting values.
+/// </summary>
+public interface IPersistableAdapter
 {
 	/// <summary>
-	/// Provides an adapter for persisting values.
+	/// Gets or sets the underlying value that is persisted.
 	/// </summary>
-	public interface IPersistableAdapter
-	{
-		/// <summary>
-		/// Gets or sets the underlying value that is persisted.
-		/// </summary>
-		object UnderlyingValue { get; set; }
-	}
+	object UnderlyingValue { get; set; }
 }
\ No newline at end of file
diff --git a/Serialization/ISerializer.cs b/Serialization/ISerializer.cs
index fb194798..725a6e42 100644
--- a/Serialization/ISerializer.cs
+++ b/Serialization/ISerializer.cs
@@ -1,58 +1,57 @@
-namespace Ecng.Serialization
-{
-	using System.IO;
-	using System.Threading;
-	using System.Threading.Tasks;
+namespace Ecng.Serialization;
+
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
 
+/// <summary>
+/// Provides methods for serializing and deserializing objects.
+/// </summary>
+public interface ISerializer
+{
 	/// <summary>
-	/// Provides methods for serializing and deserializing objects.
+	/// Gets the file extension associated with the serialized format.
 	/// </summary>
-	public interface ISerializer
-	{
-		/// <summary>
-		/// Gets the file extension associated with the serialized format.
-		/// </summary>
-		string FileExtension { get; }
+	string FileExtension { get; }
 
-		/// <summary>
-		/// Asynchronously serializes the specified object graph into the provided stream.
-		/// </summary>
-		/// <param name="graph">The object graph to serialize.</param>
-		/// <param name="stream">The stream to which the object is serialized.</param>
-		/// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
-		/// <returns>A <see cref="ValueTask"/> representing the asynchronous operation.</returns>
-		public abstract ValueTask SerializeAsync(object graph, Stream stream, CancellationToken cancellationToken);
+	/// <summary>
+	/// Asynchronously serializes the specified object graph into the provided stream.
+	/// </summary>
+	/// <param name="graph">The object graph to serialize.</param>
+	/// <param name="stream">The stream to which the object is serialized.</param>
+	/// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
+	/// <returns>A <see cref="ValueTask"/> representing the asynchronous operation.</returns>
+	public abstract ValueTask SerializeAsync(object graph, Stream stream, CancellationToken cancellationToken);
 
-		/// <summary>
-		/// Asynchronously deserializes an object graph from the provided stream.
-		/// </summary>
-		/// <param name="stream">The stream from which the object is deserialized.</param>
-		/// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
-		/// <returns>A <see cref="ValueTask{T}"/> representing the asynchronous operation and the deserialized object.</returns>
-		public abstract ValueTask<object> DeserializeAsync(Stream stream, CancellationToken cancellationToken);
-	}
+	/// <summary>
+	/// Asynchronously deserializes an object graph from the provided stream.
+	/// </summary>
+	/// <param name="stream">The stream from which the object is deserialized.</param>
+	/// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
+	/// <returns>A <see cref="ValueTask{T}"/> representing the asynchronous operation and the deserialized object.</returns>
+	public abstract ValueTask<object> DeserializeAsync(Stream stream, CancellationToken cancellationToken);
+}
 
+/// <summary>
+/// Provides methods for serializing and deserializing objects of type <typeparamref name="T"/>.
+/// </summary>
+/// <typeparam name="T">The type of the object graph to serialize and deserialize.</typeparam>
+public interface ISerializer<T> : ISerializer
+{
 	/// <summary>
-	/// Provides methods for serializing and deserializing objects of type <typeparamref name="T"/>.
+	/// Asynchronously serializes the specified object of type <typeparamref name="T"/> into the provided stream.
 	/// </summary>
-	/// <typeparam name="T">The type of the object graph to serialize and deserialize.</typeparam>
-	public interface ISerializer<T> : ISerializer
-	{
-		/// <summary>
-		/// Asynchronously serializes the specified object of type <typeparamref name="T"/> into the provided stream.
-		/// </summary>
-		/// <param name="graph">The object to serialize.</param>
-		/// <param name="stream">The stream to which the object is serialized.</param>
-		/// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
-		/// <returns>A <see cref="ValueTask"/> representing the asynchronous operation.</returns>
-		public abstract ValueTask SerializeAsync(T graph, Stream stream, CancellationToken cancellationToken);
+	/// <param name="graph">The object to serialize.</param>
+	/// <param name="stream">The stream to which the object is serialized.</param>
+	/// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
+	/// <returns>A <see cref="ValueTask"/> representing the asynchronous operation.</returns>
+	public abstract ValueTask SerializeAsync(T graph, Stream stream, CancellationToken cancellationToken);
 
-		/// <summary>
-		/// Asynchronously deserializes an object of type <typeparamref name="T"/> from the provided stream.
-		/// </summary>
-		/// <param name="stream">The stream from which the object is deserialized.</param>
-		/// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
-		/// <returns>A <see cref="ValueTask{T}"/> representing the asynchronous operation and the deserialized object.</returns>
-		public new abstract ValueTask<T> DeserializeAsync(Stream stream, CancellationToken cancellationToken);
-	}
+	/// <summary>
+	/// Asynchronously deserializes an object of type <typeparamref name="T"/> from the provided stream.
+	/// </summary>
+	/// <param name="stream">The stream from which the object is deserialized.</param>
+	/// <param name="cancellationToken">A token to monitor for cancellation requests.</param>
+	/// <returns>A <see cref="ValueTask{T}"/> representing the asynchronous operation and the deserialized object.</returns>
+	public new abstract ValueTask<T> DeserializeAsync(Stream stream, CancellationToken cancellationToken);
 }
\ No newline at end of file
diff --git a/Serialization/ISerializerExtensions.cs b/Serialization/ISerializerExtensions.cs
index 4c0c52e6..9a09119b 100644
--- a/Serialization/ISerializerExtensions.cs
+++ b/Serialization/ISerializerExtensions.cs
@@ -1,101 +1,100 @@
-namespace Ecng.Serialization
-{
-	using System.IO;
+namespace Ecng.Serialization;
+
+using System.IO;
 
-	using Ecng.Common;
+using Ecng.Common;
 
+/// <summary>
+/// Provides extension methods for the ISerializer and ISerializer&lt;T&gt; interfaces to support serialization
+/// and deserialization operations with files, streams, and byte arrays.
+/// </summary>
+public static class ISerializerExtensions
+{
 	/// <summary>
-	/// Provides extension methods for the ISerializer and ISerializer&lt;T&gt; interfaces to support serialization
-	/// and deserialization operations with files, streams, and byte arrays.
+	/// Serializes the specified object graph and writes the output to a file.
 	/// </summary>
-	public static class ISerializerExtensions
-	{
-		/// <summary>
-		/// Serializes the specified object graph and writes the output to a file.
-		/// </summary>
-		/// <param name="serializer">The serializer instance.</param>
-		/// <param name="graph">The object graph to serialize.</param>
-		/// <param name="fileName">The path of the file to write to.</param>
-		public static void Serialize(this ISerializer serializer, object graph, string fileName)
-			=> File.WriteAllBytes(fileName, serializer.CheckOnNull(nameof(serializer)).Serialize(graph));
+	/// <param name="serializer">The serializer instance.</param>
+	/// <param name="graph">The object graph to serialize.</param>
+	/// <param name="fileName">The path of the file to write to.</param>
+	public static void Serialize(this ISerializer serializer, object graph, string fileName)
+		=> File.WriteAllBytes(fileName, serializer.CheckOnNull(nameof(serializer)).Serialize(graph));
 
-		/// <summary>
-		/// Serializes the specified object graph and returns the result as a byte array.
-		/// </summary>
-		/// <param name="serializer">The serializer instance.</param>
-		/// <param name="graph">The object graph to serialize.</param>
-		/// <returns>A byte array containing the serialized data.</returns>
-		public static byte[] Serialize(this ISerializer serializer, object graph)
-		{
-			var stream = new MemoryStream();
-			serializer.CheckOnNull(nameof(serializer)).Serialize(graph, stream);
-			return stream.To<byte[]>();
-		}
-
-		/// <summary>
-		/// Serializes the specified object graph and writes the output to the provided stream.
-		/// </summary>
-		/// <param name="serializer">The serializer instance.</param>
-		/// <param name="graph">The object graph to serialize.</param>
-		/// <param name="stream">The stream to which to write the serialized data.</param>
-		public static void Serialize(this ISerializer serializer, object graph, Stream stream)
-			=> AsyncHelper.Run(() => serializer.CheckOnNull(nameof(serializer)).SerializeAsync(graph, stream, default));
+	/// <summary>
+	/// Serializes the specified object graph and returns the result as a byte array.
+	/// </summary>
+	/// <param name="serializer">The serializer instance.</param>
+	/// <param name="graph">The object graph to serialize.</param>
+	/// <returns>A byte array containing the serialized data.</returns>
+	public static byte[] Serialize(this ISerializer serializer, object graph)
+	{
+		var stream = new MemoryStream();
+		serializer.CheckOnNull(nameof(serializer)).Serialize(graph, stream);
+		return stream.To<byte[]>();
+	}
 
-		/// <summary>
-		/// Deserializes the data from the specified file into an object of type T.
-		/// </summary>
-		/// <typeparam name="T">The type of object to deserialize.</typeparam>
-		/// <param name="serializer">The serializer instance.</param>
-		/// <param name="fileName">The path of the file to read from.</param>
-		/// <returns>An object of type T.</returns>
-		public static T Deserialize<T>(this ISerializer<T> serializer, string fileName)
-		{
-			using var stream = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.Read);
-			return serializer.CheckOnNull(nameof(serializer)).Deserialize(stream);
-		}
+	/// <summary>
+	/// Serializes the specified object graph and writes the output to the provided stream.
+	/// </summary>
+	/// <param name="serializer">The serializer instance.</param>
+	/// <param name="graph">The object graph to serialize.</param>
+	/// <param name="stream">The stream to which to write the serialized data.</param>
+	public static void Serialize(this ISerializer serializer, object graph, Stream stream)
+		=> AsyncHelper.Run(() => serializer.CheckOnNull(nameof(serializer)).SerializeAsync(graph, stream, default));
 
-		/// <summary>
-		/// Deserializes the specified byte array into an object of type T.
-		/// </summary>
-		/// <typeparam name="T">The type of object to deserialize.</typeparam>
-		/// <param name="serializer">The serializer instance.</param>
-		/// <param name="data">The byte array containing the serialized data.</param>
-		/// <returns>An object of type T.</returns>
-		public static T Deserialize<T>(this ISerializer<T> serializer, byte[] data)
-		{
-			var stream = new MemoryStream(data);
-			return serializer.CheckOnNull(nameof(serializer)).Deserialize(stream);
-		}
+	/// <summary>
+	/// Deserializes the data from the specified file into an object of type T.
+	/// </summary>
+	/// <typeparam name="T">The type of object to deserialize.</typeparam>
+	/// <param name="serializer">The serializer instance.</param>
+	/// <param name="fileName">The path of the file to read from.</param>
+	/// <returns>An object of type T.</returns>
+	public static T Deserialize<T>(this ISerializer<T> serializer, string fileName)
+	{
+		using var stream = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.Read);
+		return serializer.CheckOnNull(nameof(serializer)).Deserialize(stream);
+	}
 
-		/// <summary>
-		/// Deserializes the data from the given stream into an object of type T.
-		/// </summary>
-		/// <typeparam name="T">The type of object to deserialize.</typeparam>
-		/// <param name="serializer">The serializer instance.</param>
-		/// <param name="stream">The stream containing the serialized data.</param>
-		/// <returns>An object of type T.</returns>
-		public static T Deserialize<T>(this ISerializer<T> serializer, Stream stream)
-			=> AsyncHelper.Run(() => serializer.CheckOnNull(nameof(serializer)).DeserializeAsync(stream, default));
+	/// <summary>
+	/// Deserializes the specified byte array into an object of type T.
+	/// </summary>
+	/// <typeparam name="T">The type of object to deserialize.</typeparam>
+	/// <param name="serializer">The serializer instance.</param>
+	/// <param name="data">The byte array containing the serialized data.</param>
+	/// <returns>An object of type T.</returns>
+	public static T Deserialize<T>(this ISerializer<T> serializer, byte[] data)
+	{
+		var stream = new MemoryStream(data);
+		return serializer.CheckOnNull(nameof(serializer)).Deserialize(stream);
+	}
 
-		/// <summary>
-		/// Deserializes the specified byte array into an object.
-		/// </summary>
-		/// <param name="serializer">The serializer instance.</param>
-		/// <param name="data">The byte array containing the serialized data.</param>
-		/// <returns>The deserialized object.</returns>
-		public static object Deserialize(this ISerializer serializer, byte[] data)
-		{
-			var stream = new MemoryStream(data);
-			return serializer.CheckOnNull(nameof(serializer)).Deserialize(stream);
-		}
+	/// <summary>
+	/// Deserializes the data from the given stream into an object of type T.
+	/// </summary>
+	/// <typeparam name="T">The type of object to deserialize.</typeparam>
+	/// <param name="serializer">The serializer instance.</param>
+	/// <param name="stream">The stream containing the serialized data.</param>
+	/// <returns>An object of type T.</returns>
+	public static T Deserialize<T>(this ISerializer<T> serializer, Stream stream)
+		=> AsyncHelper.Run(() => serializer.CheckOnNull(nameof(serializer)).DeserializeAsync(stream, default));
 
-		/// <summary>
-		/// Deserializes the data from the given stream into an object.
-		/// </summary>
-		/// <param name="serializer">The serializer instance.</param>
-		/// <param name="stream">The stream containing the serialized data.</param>
-		/// <returns>The deserialized object.</returns>
-		public static object Deserialize(this ISerializer serializer, Stream stream)
-			=> AsyncHelper.Run(() => serializer.CheckOnNull(nameof(serializer)).DeserializeAsync(stream, default));
+	/// <summary>
+	/// Deserializes the specified byte array into an object.
+	/// </summary>
+	/// <param name="serializer">The serializer instance.</param>
+	/// <param name="data">The byte array containing the serialized data.</param>
+	/// <returns>The deserialized object.</returns>
+	public static object Deserialize(this ISerializer serializer, byte[] data)
+	{
+		var stream = new MemoryStream(data);
+		return serializer.CheckOnNull(nameof(serializer)).Deserialize(stream);
 	}
+
+	/// <summary>
+	/// Deserializes the data from the given stream into an object.
+	/// </summary>
+	/// <param name="serializer">The serializer instance.</param>
+	/// <param name="stream">The stream containing the serialized data.</param>
+	/// <returns>The deserialized object.</returns>
+	public static object Deserialize(this ISerializer serializer, Stream stream)
+		=> AsyncHelper.Run(() => serializer.CheckOnNull(nameof(serializer)).DeserializeAsync(stream, default));
 }
\ No newline at end of file
diff --git a/Serialization/JsonBoolConverter.cs b/Serialization/JsonBoolConverter.cs
index bea64cbf..1e03e063 100644
--- a/Serialization/JsonBoolConverter.cs
+++ b/Serialization/JsonBoolConverter.cs
@@ -1,39 +1,38 @@
-namespace Ecng.Serialization
-{
-	using System;
+namespace Ecng.Serialization;
+
+using System;
 
-	using Newtonsoft.Json;
+using Newtonsoft.Json;
 
+/// <summary>
+/// Converts boolean values to and from JSON numeric representations (1 or 0).
+/// </summary>
+public class JsonBoolConverter : JsonConverter
+{
 	/// <summary>
-	/// Converts boolean values to and from JSON numeric representations (1 or 0).
+	/// Writes a boolean value as 1 (true) or 0 (false) to the JSON output.
 	/// </summary>
-	public class JsonBoolConverter : JsonConverter
-	{
-		/// <summary>
-		/// Writes a boolean value as 1 (true) or 0 (false) to the JSON output.
-		/// </summary>
-		/// <param name="writer">The <see cref="JsonWriter"/> to write to.</param>
-		/// <param name="value">The boolean value to be converted and written.</param>
-		/// <param name="serializer">The calling serializer.</param>
-		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-			=> writer.WriteValue((bool)value ? 1 : 0);
+	/// <param name="writer">The <see cref="JsonWriter"/> to write to.</param>
+	/// <param name="value">The boolean value to be converted and written.</param>
+	/// <param name="serializer">The calling serializer.</param>
+	public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+		=> writer.WriteValue((bool)value ? 1 : 0);
 
-		/// <summary>
-		/// Reads a JSON value and converts it to a boolean value where "1" represents true.
-		/// </summary>
-		/// <param name="reader">The <see cref="JsonReader"/> to read from.</param>
-		/// <param name="objectType">The type of the object to convert to.</param>
-		/// <param name="existingValue">The existing value of the object being read.</param>
-		/// <param name="serializer">The calling serializer.</param>
-		/// <returns>A boolean value where "1" evaluates to true, and any other value to false.</returns>
-		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-			=> reader.Value.ToString() == "1";
+	/// <summary>
+	/// Reads a JSON value and converts it to a boolean value where "1" represents true.
+	/// </summary>
+	/// <param name="reader">The <see cref="JsonReader"/> to read from.</param>
+	/// <param name="objectType">The type of the object to convert to.</param>
+	/// <param name="existingValue">The existing value of the object being read.</param>
+	/// <param name="serializer">The calling serializer.</param>
+	/// <returns>A boolean value where "1" evaluates to true, and any other value to false.</returns>
+	public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+		=> reader.Value.ToString() == "1";
 
-		/// <summary>
-		/// Determines whether this converter can convert the specified object type.
-		/// </summary>
-		/// <param name="objectType">The type of object to check.</param>
-		/// <returns><c>true</c> if the object type is <see cref="System.Boolean"/>; otherwise, <c>false</c>.</returns>
-		public override bool CanConvert(Type objectType) => objectType == typeof(bool);
-	}
+	/// <summary>
+	/// Determines whether this converter can convert the specified object type.
+	/// </summary>
+	/// <param name="objectType">The type of object to check.</param>
+	/// <returns><c>true</c> if the object type is <see cref="System.Boolean"/>; otherwise, <c>false</c>.</returns>
+	public override bool CanConvert(Type objectType) => objectType == typeof(bool);
 }
\ No newline at end of file
diff --git a/Serialization/JsonDateTimeConverter.cs b/Serialization/JsonDateTimeConverter.cs
index 4daad846..4bc9bcb6 100644
--- a/Serialization/JsonDateTimeConverter.cs
+++ b/Serialization/JsonDateTimeConverter.cs
@@ -1,149 +1,148 @@
-namespace Ecng.Serialization
+namespace Ecng.Serialization;
+
+using System;
+
+using Ecng.Common;
+
+using Newtonsoft.Json;
+
+/// <summary>
+/// Provides a JSON converter for converting DateTime values from Unix timestamps.
+/// </summary>
+/// <param name="isSeconds">Determines whether the Unix timestamp is in seconds (true) or another resolution (false).</param>
+public class JsonDateTimeConverter(bool isSeconds) : JsonConverter
 {
-	using System;
+	private readonly bool _isSeconds = isSeconds;
 
-	using Ecng.Common;
+	/// <summary>
+	/// Initializes a new instance of the <see cref="JsonDateTimeConverter"/> class using seconds as the default resolution.
+	/// </summary>
+	public JsonDateTimeConverter()
+		: this(true)
+	{
+	}
 
-	using Newtonsoft.Json;
+	/// <summary>
+	/// Determines whether this converter can convert the specified object type.
+	/// </summary>
+	/// <param name="objectType">The type of the object to check.</param>
+	/// <returns><c>true</c> if the objectType is DateTime; otherwise, <c>false</c>.</returns>
+	public override bool CanConvert(Type objectType)
+	{
+		return typeof(DateTime) == objectType;
+	}
 
 	/// <summary>
-	/// Provides a JSON converter for converting DateTime values from Unix timestamps.
+	/// Reads the JSON representation of the object and converts it to a <see cref="DateTime"/>.
 	/// </summary>
-	/// <param name="isSeconds">Determines whether the Unix timestamp is in seconds (true) or another resolution (false).</param>
-	public class JsonDateTimeConverter(bool isSeconds) : JsonConverter
+	/// <param name="reader">The <see cref="JsonReader"/> to read from.</param>
+	/// <param name="objectType">The type of the object to convert.</param>
+	/// <param name="existingValue">The existing value of the object being read.</param>
+	/// <param name="serializer">The calling serializer.</param>
+	/// <returns>The converted <see cref="DateTime"/> value or null if conversion is not possible.</returns>
+	/// <exception cref="JsonReaderException">Thrown when an error occurs during conversion.</exception>
+	public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 	{
-		private readonly bool _isSeconds = isSeconds;
+		//if (reader.TokenType != JsonToken.String)
+		//	throw new JsonReaderException("Unexcepted token '{0}'.".Put(reader.TokenType));
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="JsonDateTimeConverter"/> class using seconds as the default resolution.
-		/// </summary>
-		public JsonDateTimeConverter()
-			: this(true)
+		try
 		{
-		}
+			var value = reader.Value.To<double?>();
 
-		/// <summary>
-		/// Determines whether this converter can convert the specified object type.
-		/// </summary>
-		/// <param name="objectType">The type of the object to check.</param>
-		/// <returns><c>true</c> if the objectType is DateTime; otherwise, <c>false</c>.</returns>
-		public override bool CanConvert(Type objectType)
-		{
-			return typeof(DateTime) == objectType;
-		}
+			if (value is not double d || (int)d == 0)
+				return null;
 
-		/// <summary>
-		/// Reads the JSON representation of the object and converts it to a <see cref="DateTime"/>.
-		/// </summary>
-		/// <param name="reader">The <see cref="JsonReader"/> to read from.</param>
-		/// <param name="objectType">The type of the object to convert.</param>
-		/// <param name="existingValue">The existing value of the object being read.</param>
-		/// <param name="serializer">The calling serializer.</param>
-		/// <returns>The converted <see cref="DateTime"/> value or null if conversion is not possible.</returns>
-		/// <exception cref="JsonReaderException">Thrown when an error occurs during conversion.</exception>
-		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-		{
-			//if (reader.TokenType != JsonToken.String)
-			//	throw new JsonReaderException("Unexcepted token '{0}'.".Put(reader.TokenType));
-
-			try
-			{
-				var value = reader.Value.To<double?>();
-
-				if (value is not double d || (int)d == 0)
-					return null;
-
-				return Convert(d);
-			}
-			catch (Exception ex)
-			{
-				throw new JsonReaderException(ex.Message, ex);
-			}
+			return Convert(d);
 		}
-
-		/// <summary>
-		/// Converts the specified double value to a <see cref="DateTime"/>.
-		/// </summary>
-		/// <param name="value">The double value representing the Unix timestamp.</param>
-		/// <returns>A <see cref="DateTime"/> corresponding to the Unix timestamp.</returns>
-		protected virtual DateTime Convert(double value)
+		catch (Exception ex)
 		{
-			return value.FromUnix(_isSeconds);
+			throw new JsonReaderException(ex.Message, ex);
 		}
+	}
 
-		/// <summary>
-		/// Writes the JSON representation of the object.
-		/// This method is not supported.
-		/// </summary>
-		/// <param name="writer">The <see cref="JsonWriter"/> to write to.</param>
-		/// <param name="value">The value to convert.</param>
-		/// <param name="serializer">The calling serializer.</param>
-		/// <exception cref="NotSupportedException">Always thrown as this converter does not support writing.</exception>
-		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-		{
-			throw new NotSupportedException();
-		}
+	/// <summary>
+	/// Converts the specified double value to a <see cref="DateTime"/>.
+	/// </summary>
+	/// <param name="value">The double value representing the Unix timestamp.</param>
+	/// <returns>A <see cref="DateTime"/> corresponding to the Unix timestamp.</returns>
+	protected virtual DateTime Convert(double value)
+	{
+		return value.FromUnix(_isSeconds);
 	}
 
 	/// <summary>
-	/// Provides a JSON converter for converting DateTime values from Unix timestamps in milliseconds.
+	/// Writes the JSON representation of the object.
+	/// This method is not supported.
 	/// </summary>
-	public class JsonDateTimeMlsConverter : JsonDateTimeConverter
+	/// <param name="writer">The <see cref="JsonWriter"/> to write to.</param>
+	/// <param name="value">The value to convert.</param>
+	/// <param name="serializer">The calling serializer.</param>
+	/// <exception cref="NotSupportedException">Always thrown as this converter does not support writing.</exception>
+	public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="JsonDateTimeMlsConverter"/> class using milliseconds.
-		/// </summary>
-		public JsonDateTimeMlsConverter()
-			: base(false)
-		{
-		}
+		throw new NotSupportedException();
 	}
+}
 
+/// <summary>
+/// Provides a JSON converter for converting DateTime values from Unix timestamps in milliseconds.
+/// </summary>
+public class JsonDateTimeMlsConverter : JsonDateTimeConverter
+{
 	/// <summary>
-	/// Provides a JSON converter for converting DateTime values from Unix timestamps in microseconds.
+	/// Initializes a new instance of the <see cref="JsonDateTimeMlsConverter"/> class using milliseconds.
 	/// </summary>
-	public class JsonDateTimeMcsConverter : JsonDateTimeConverter
+	public JsonDateTimeMlsConverter()
+		: base(false)
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="JsonDateTimeMcsConverter"/> class using microseconds.
-		/// </summary>
-		public JsonDateTimeMcsConverter()
-			: base(false)
-		{
-		}
+	}
+}
 
-		/// <summary>
-		/// Converts the specified double value to a <see cref="DateTime"/> using microsecond precision.
-		/// </summary>
-		/// <param name="value">The double value representing the Unix timestamp in microseconds.</param>
-		/// <returns>A <see cref="DateTime"/> corresponding to the Unix timestamp.</returns>
-		protected override DateTime Convert(double value)
-		{
-			return value.FromUnixMcs();
-		}
+/// <summary>
+/// Provides a JSON converter for converting DateTime values from Unix timestamps in microseconds.
+/// </summary>
+public class JsonDateTimeMcsConverter : JsonDateTimeConverter
+{
+	/// <summary>
+	/// Initializes a new instance of the <see cref="JsonDateTimeMcsConverter"/> class using microseconds.
+	/// </summary>
+	public JsonDateTimeMcsConverter()
+		: base(false)
+	{
 	}
 
 	/// <summary>
-	/// Provides a JSON converter for converting DateTime values from Unix timestamps in nanoseconds.
+	/// Converts the specified double value to a <see cref="DateTime"/> using microsecond precision.
 	/// </summary>
-	public class JsonDateTimeNanoConverter : JsonDateTimeConverter
+	/// <param name="value">The double value representing the Unix timestamp in microseconds.</param>
+	/// <returns>A <see cref="DateTime"/> corresponding to the Unix timestamp.</returns>
+	protected override DateTime Convert(double value)
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="JsonDateTimeNanoConverter"/> class using nanoseconds.
-		/// </summary>
-		public JsonDateTimeNanoConverter()
-			: base(false)
-		{
-		}
+		return value.FromUnixMcs();
+	}
+}
 
-		/// <summary>
-		/// Converts the specified double value to a <see cref="DateTime"/> using nanosecond precision.
-		/// </summary>
-		/// <param name="value">The double value representing the Unix timestamp in nanoseconds.</param>
-		/// <returns>A <see cref="DateTime"/> corresponding to the Unix timestamp.</returns>
-		protected override DateTime Convert(double value)
-		{
-			return TimeHelper.GregorianStart.AddNanoseconds((long)value);
-		}
+/// <summary>
+/// Provides a JSON converter for converting DateTime values from Unix timestamps in nanoseconds.
+/// </summary>
+public class JsonDateTimeNanoConverter : JsonDateTimeConverter
+{
+	/// <summary>
+	/// Initializes a new instance of the <see cref="JsonDateTimeNanoConverter"/> class using nanoseconds.
+	/// </summary>
+	public JsonDateTimeNanoConverter()
+		: base(false)
+	{
+	}
+
+	/// <summary>
+	/// Converts the specified double value to a <see cref="DateTime"/> using nanosecond precision.
+	/// </summary>
+	/// <param name="value">The double value representing the Unix timestamp in nanoseconds.</param>
+	/// <returns>A <see cref="DateTime"/> corresponding to the Unix timestamp.</returns>
+	protected override DateTime Convert(double value)
+	{
+		return TimeHelper.GregorianStart.AddNanoseconds((long)value);
 	}
 }
\ No newline at end of file
diff --git a/Serialization/JsonHelper.cs b/Serialization/JsonHelper.cs
index d2ed888f..4d6fb192 100644
--- a/Serialization/JsonHelper.cs
+++ b/Serialization/JsonHelper.cs
@@ -1,197 +1,196 @@
-namespace Ecng.Serialization
+namespace Ecng.Serialization;
+
+using System;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Diagnostics;
+using System.Linq;
+
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Serialization;
+
+using Ecng.Common;
+
+/// <summary>
+/// Provides helper methods for JSON serialization and deserialization.
+/// </summary>
+public static class JsonHelper
 {
-	using System;
-	using System.Text;
-	using System.Threading;
-	using System.Threading.Tasks;
-	using System.Diagnostics;
-	using System.Linq;
+	/// <summary>
+	/// Provides a UTF-8 encoding without a byte order mark (BOM).
+	/// </summary>
+	public static readonly Encoding UTF8NoBom = new UTF8Encoding(false);
 
-	using Newtonsoft.Json;
-	using Newtonsoft.Json.Linq;
-	using Newtonsoft.Json.Serialization;
+	/// <summary>
+	/// Checks that the current token of the JSON reader matches the expected token.
+	/// </summary>
+	/// <param name="reader">The JSON reader.</param>
+	/// <param name="token">The expected JSON token.</param>
+	[Conditional("DEBUG")]
+	public static void ChechExpectedToken(this JsonReader reader, JsonToken token)
+	{
+		if (reader.TokenType != token)
+			throw new InvalidOperationException($"{reader.TokenType} != {token}");
+	}
 
-	using Ecng.Common;
+	/// <summary>
+	/// Asynchronously reads the next token from the JSON reader and checks for end-of-file.
+	/// </summary>
+	/// <param name="reader">The JSON reader.</param>
+	/// <param name="cancellationToken">A cancellation token.</param>
+	/// <returns>A task that represents the asynchronous read operation.</returns>
+	public static async Task ReadWithCheckAsync(this JsonReader reader, CancellationToken cancellationToken)
+	{
+		if (!await reader.ReadAsync(cancellationToken))
+			throw new InvalidOperationException("EOF");
+	}
 
 	/// <summary>
-	/// Provides helper methods for JSON serialization and deserialization.
+	/// Deserializes the JSON string into an object of type T.
 	/// </summary>
-	public static class JsonHelper
+	/// <typeparam name="T">The target type.</typeparam>
+	/// <param name="content">The JSON string.</param>
+	/// <returns>The deserialized object.</returns>
+	public static T DeserializeObject<T>(this string content)
 	{
-		/// <summary>
-		/// Provides a UTF-8 encoding without a byte order mark (BOM).
-		/// </summary>
-		public static readonly Encoding UTF8NoBom = new UTF8Encoding(false);
-
-		/// <summary>
-		/// Checks that the current token of the JSON reader matches the expected token.
-		/// </summary>
-		/// <param name="reader">The JSON reader.</param>
-		/// <param name="token">The expected JSON token.</param>
-		[Conditional("DEBUG")]
-		public static void ChechExpectedToken(this JsonReader reader, JsonToken token)
-		{
-			if (reader.TokenType != token)
-				throw new InvalidOperationException($"{reader.TokenType} != {token}");
-		}
+		return (T)content.DeserializeObject(typeof(T));
+	}
 
-		/// <summary>
-		/// Asynchronously reads the next token from the JSON reader and checks for end-of-file.
-		/// </summary>
-		/// <param name="reader">The JSON reader.</param>
-		/// <param name="cancellationToken">A cancellation token.</param>
-		/// <returns>A task that represents the asynchronous read operation.</returns>
-		public static async Task ReadWithCheckAsync(this JsonReader reader, CancellationToken cancellationToken)
-		{
-			if (!await reader.ReadAsync(cancellationToken))
-				throw new InvalidOperationException("EOF");
-		}
+	/// <summary>
+	/// Deserializes the JSON token into an object of type T.
+	/// </summary>
+	/// <typeparam name="T">The target type.</typeparam>
+	/// <param name="token">The JSON token.</param>
+	/// <returns>The deserialized object.</returns>
+	public static T DeserializeObject<T>(this JToken token)
+	{
+		return (T)token.DeserializeObject(typeof(T));
+	}
+
+	/// <summary>
+	/// Deserializes the JSON string into an object of the specified type.
+	/// </summary>
+	/// <param name="content">The JSON string.</param>
+	/// <param name="type">The target type.</param>
+	/// <returns>The deserialized object.</returns>
+	public static object DeserializeObject(this string content, Type type)
+	{
+		if (type is null)
+			throw new ArgumentNullException(nameof(type));
 
-		/// <summary>
-		/// Deserializes the JSON string into an object of type T.
-		/// </summary>
-		/// <typeparam name="T">The target type.</typeparam>
-		/// <param name="content">The JSON string.</param>
-		/// <returns>The deserialized object.</returns>
-		public static T DeserializeObject<T>(this string content)
+		if (content.IsEmpty())
 		{
-			return (T)content.DeserializeObject(typeof(T));
+			if (type.IsClass || type.IsNullable() || type.IsInterface)
+				return null;
+
+			throw new ArgumentNullException(nameof(content), $"Can't null for {type}.");
 		}
 
-		/// <summary>
-		/// Deserializes the JSON token into an object of type T.
-		/// </summary>
-		/// <typeparam name="T">The target type.</typeparam>
-		/// <param name="token">The JSON token.</param>
-		/// <returns>The deserialized object.</returns>
-		public static T DeserializeObject<T>(this JToken token)
+		try
 		{
-			return (T)token.DeserializeObject(typeof(T));
-		}
+			if (content == "null")
+				return null;
 
-		/// <summary>
-		/// Deserializes the JSON string into an object of the specified type.
-		/// </summary>
-		/// <param name="content">The JSON string.</param>
-		/// <param name="type">The target type.</param>
-		/// <returns>The deserialized object.</returns>
-		public static object DeserializeObject(this string content, Type type)
+			return content.FromJson(type);
+		}
+		catch (Exception ex)
 		{
-			if (type is null)
-				throw new ArgumentNullException(nameof(type));
+			throw new InvalidOperationException($"Can't convert {content} to type '{type.Name}'.", ex);
+		}
+	}
 
-			if (content.IsEmpty())
-			{
-				if (type.IsClass || type.IsNullable() || type.IsInterface)
-					return null;
+	/// <summary>
+	/// Deserializes the JSON string into an object using Newtonsoft.Json.
+	/// </summary>
+	/// <param name="json">The JSON string.</param>
+	/// <param name="type">The target type.</param>
+	/// <returns>The deserialized object.</returns>
+	public static object FromJson(this string json, Type type)
+		=> JsonConvert.DeserializeObject(json, type);
 
-				throw new ArgumentNullException(nameof(content), $"Can't null for {type}.");
-			}
+	/// <summary>
+	/// Deserializes the JSON token into an object of the specified type.
+	/// </summary>
+	/// <param name="token">The JSON token.</param>
+	/// <param name="type">The target type.</param>
+	/// <returns>The deserialized object.</returns>
+	public static object DeserializeObject(this JToken token, Type type)
+	{
+		if (type is null)
+			throw new ArgumentNullException(nameof(type));
 
-			try
-			{
-				if (content == "null")
-					return null;
+		if (token is null)
+		{
+			if (type.IsClass || type.IsNullable() || type.IsInterface)
+				return null;
 
-				return content.FromJson(type);
-			}
-			catch (Exception ex)
-			{
-				throw new InvalidOperationException($"Can't convert {content} to type '{type.Name}'.", ex);
-			}
+			throw new ArgumentNullException(nameof(token), $"Can't null for {type}.");
 		}
 
-		/// <summary>
-		/// Deserializes the JSON string into an object using Newtonsoft.Json.
-		/// </summary>
-		/// <param name="json">The JSON string.</param>
-		/// <param name="type">The target type.</param>
-		/// <returns>The deserialized object.</returns>
-		public static object FromJson(this string json, Type type)
-			=> JsonConvert.DeserializeObject(json, type);
-
-		/// <summary>
-		/// Deserializes the JSON token into an object of the specified type.
-		/// </summary>
-		/// <param name="token">The JSON token.</param>
-		/// <param name="type">The target type.</param>
-		/// <returns>The deserialized object.</returns>
-		public static object DeserializeObject(this JToken token, Type type)
+		try
 		{
-			if (type is null)
-				throw new ArgumentNullException(nameof(type));
-
-			if (token is null)
-			{
-				if (type.IsClass || type.IsNullable() || type.IsInterface)
-					return null;
+			if (token.Type == JTokenType.String && (string)token == "null")
+				return null;
 
-				throw new ArgumentNullException(nameof(token), $"Can't null for {type}.");
-			}
+			return token.ToObject(type);
+		}
+		catch (Exception ex)
+		{
+			throw new InvalidOperationException($"Can't convert {token} to type '{type.Name}'.", ex);
+		}
+	}
 
-			try
-			{
-				if (token.Type == JTokenType.String && (string)token == "null")
-					return null;
+	/// <summary>
+	/// Serializes the object into a JSON string with optional indentation.
+	/// </summary>
+	/// <param name="obj">The object to serialize.</param>
+	/// <param name="indent">True to format the JSON string; otherwise, false.</param>
+	/// <returns>The JSON string.</returns>
+	public static string ToJson(this object obj, bool indent = true)
+		=> ToJson(obj, indent, null);
 
-				return token.ToObject(type);
-			}
-			catch (Exception ex)
-			{
-				throw new InvalidOperationException($"Can't convert {token} to type '{type.Name}'.", ex);
-			}
-		}
+	/// <summary>
+	/// Serializes the object into a JSON string with optional indentation and custom serializer settings.
+	/// </summary>
+	/// <param name="obj">The object to serialize.</param>
+	/// <param name="indent">True to format the JSON string; otherwise, false.</param>
+	/// <param name="settings">The JSON serializer settings.</param>
+	/// <returns>The JSON string.</returns>
+	public static string ToJson(this object obj, bool indent, JsonSerializerSettings settings)
+		=> JsonConvert.SerializeObject(obj, indent ? Formatting.Indented : Formatting.None, settings);
 
-		/// <summary>
-		/// Serializes the object into a JSON string with optional indentation.
-		/// </summary>
-		/// <param name="obj">The object to serialize.</param>
-		/// <param name="indent">True to format the JSON string; otherwise, false.</param>
-		/// <returns>The JSON string.</returns>
-		public static string ToJson(this object obj, bool indent = true)
-			=> ToJson(obj, indent, null);
-
-		/// <summary>
-		/// Serializes the object into a JSON string with optional indentation and custom serializer settings.
-		/// </summary>
-		/// <param name="obj">The object to serialize.</param>
-		/// <param name="indent">True to format the JSON string; otherwise, false.</param>
-		/// <param name="settings">The JSON serializer settings.</param>
-		/// <returns>The JSON string.</returns>
-		public static string ToJson(this object obj, bool indent, JsonSerializerSettings settings)
-			=> JsonConvert.SerializeObject(obj, indent ? Formatting.Indented : Formatting.None, settings);
-
-		/// <summary>
-		/// Creates and configures a new instance of JsonSerializerSettings.
-		/// </summary>
-		/// <returns>The configured JsonSerializerSettings instance.</returns>
-		public static JsonSerializerSettings CreateJsonSerializerSettings()
+	/// <summary>
+	/// Creates and configures a new instance of JsonSerializerSettings.
+	/// </summary>
+	/// <returns>The configured JsonSerializerSettings instance.</returns>
+	public static JsonSerializerSettings CreateJsonSerializerSettings()
+	{
+		return new()
 		{
-			return new()
+			FloatParseHandling = FloatParseHandling.Decimal,
+			NullValueHandling = NullValueHandling.Ignore,
+			ContractResolver = new DefaultContractResolver
 			{
-				FloatParseHandling = FloatParseHandling.Decimal,
-				NullValueHandling = NullValueHandling.Ignore,
-				ContractResolver = new DefaultContractResolver
-				{
-					NamingStrategy = new SnakeCaseNamingStrategy()
-				}
-			};
-		}
+				NamingStrategy = new SnakeCaseNamingStrategy()
+			}
+		};
+	}
 
-		/// <summary>
-		/// Skips the Byte Order Mark (BOM) from the beginning of a byte array if present.
-		/// </summary>
-		/// <param name="array">The byte array.</param>
-		/// <returns>The byte array without the BOM.</returns>
-		public static byte[] SkipBom(this byte[] array)
-		{
-			if (array is null)
-				throw new ArgumentNullException(nameof(array));
+	/// <summary>
+	/// Skips the Byte Order Mark (BOM) from the beginning of a byte array if present.
+	/// </summary>
+	/// <param name="array">The byte array.</param>
+	/// <returns>The byte array without the BOM.</returns>
+	public static byte[] SkipBom(this byte[] array)
+	{
+		if (array is null)
+			throw new ArgumentNullException(nameof(array));
 
-			if (array.Length >= 3 && array[0] == 239 && array[1] == 187 && array[2] == 191)
-				array = [.. array.Skip(3)];
+		if (array.Length >= 3 && array[0] == 239 && array[1] == 187 && array[2] == 191)
+			array = [.. array.Skip(3)];
 
-			return array;
-		}
+		return array;
 	}
 }
\ No newline at end of file
diff --git a/Serialization/JsonSerializer.cs b/Serialization/JsonSerializer.cs
index 261132e9..d2826dce 100644
--- a/Serialization/JsonSerializer.cs
+++ b/Serialization/JsonSerializer.cs
@@ -1,239 +1,212 @@
-namespace Ecng.Serialization
+namespace Ecng.Serialization;
+
+using System;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Security;
+using System.Linq;
+
+using Ecng.Common;
+using Ecng.Reflection;
+
+using Newtonsoft.Json;
+
+/// <summary>
+/// Contains custom JSON conversion logic.
+/// </summary>
+static class JsonConversions
 {
-	using System;
-	using System.Text;
-	using System.Collections;
-	using System.Collections.Generic;
-	using System.IO;
-	using System.Threading;
-	using System.Threading.Tasks;
-	using System.Security;
-	using System.Linq;
+	static JsonConversions()
+	{
+		Converter.AddTypedConverter<object[], SecureString>(val => SecureStringEncryptor.Instance.Decrypt([.. val.Select(i => i.To<byte>())]));
+	}
+}
 
-	using Ecng.Common;
-	using Ecng.Reflection;
+/// <summary>
+/// Provides JSON serialization settings.
+/// </summary>
+public interface IJsonSerializer
+{
+	/// <summary>
+	/// Gets or sets a value indicating whether the JSON output should be indented.
+	/// </summary>
+	bool Indent { get; set; }
 
-	using Newtonsoft.Json;
+	/// <summary>
+	/// Gets or sets the text encoding used for serialization.
+	/// </summary>
+	Encoding Encoding { get; set; }
 
 	/// <summary>
-	/// Contains custom JSON conversion logic.
+	/// Gets or sets a value indicating whether the fill mode is enabled.
 	/// </summary>
-	static class JsonConversions
-	{
-		static JsonConversions()
-		{
-			Converter.AddTypedConverter<object[], SecureString>(val => SecureStringEncryptor.Instance.Decrypt([.. val.Select(i => i.To<byte>())]));
-		}
-	}
+	bool FillMode { get; set; }
 
 	/// <summary>
-	/// Provides JSON serialization settings.
+	/// Gets or sets a value indicating whether enums should be serialized as strings.
 	/// </summary>
-	public interface IJsonSerializer
-	{
-		/// <summary>
-		/// Gets or sets a value indicating whether the JSON output should be indented.
-		/// </summary>
-		bool Indent { get; set; }
-
-		/// <summary>
-		/// Gets or sets the text encoding used for serialization.
-		/// </summary>
-		Encoding Encoding { get; set; }
-
-		/// <summary>
-		/// Gets or sets a value indicating whether the fill mode is enabled.
-		/// </summary>
-		bool FillMode { get; set; }
-
-		/// <summary>
-		/// Gets or sets a value indicating whether enums should be serialized as strings.
-		/// </summary>
-		bool EnumAsString { get; set; }
-
-		/// <summary>
-		/// Gets or sets a value indicating whether encrypted values are handled as byte arrays.
-		/// </summary>
-		bool EncryptedAsByteArray { get; set; }
-
-		/// <summary>
-		/// Gets or sets the buffer size used during serialization and deserialization.
-		/// </summary>
-		int BufferSize { get; set; }
-
-		/// <summary>
-		/// Gets or sets the null value handling option for JSON serialization.
-		/// </summary>
-		NullValueHandling NullValueHandling { get; set; }
-	}
+	bool EnumAsString { get; set; }
+
+	/// <summary>
+	/// Gets or sets a value indicating whether encrypted values are handled as byte arrays.
+	/// </summary>
+	bool EncryptedAsByteArray { get; set; }
+
+	/// <summary>
+	/// Gets or sets the buffer size used during serialization and deserialization.
+	/// </summary>
+	int BufferSize { get; set; }
 
 	/// <summary>
-	/// Provides JSON serialization and deserialization for a given type.
+	/// Gets or sets the null value handling option for JSON serialization.
 	/// </summary>
-	/// <typeparam name="T">The type of the graph to serialize and deserialize.</typeparam>
-	public class JsonSerializer<T> : Serializer<T>, IJsonSerializer
+	NullValueHandling NullValueHandling { get; set; }
+}
+
+/// <summary>
+/// Provides JSON serialization and deserialization for a given type.
+/// </summary>
+/// <typeparam name="T">The type of the graph to serialize and deserialize.</typeparam>
+public class JsonSerializer<T> : Serializer<T>, IJsonSerializer
+{
+	static JsonSerializer()
 	{
-		static JsonSerializer()
-		{
-			typeof(JsonConversions).EnsureRunClass();
-		}
+		typeof(JsonConversions).EnsureRunClass();
+	}
 
-		/// <summary>
-		/// Gets or sets a value indicating whether the JSON output should be indented.
-		/// </summary>
-		public bool Indent { get; set; }
-
-		/// <summary>
-		/// Gets or sets the text encoding used for serialization. Defaults to UTF8.
-		/// </summary>
-		public Encoding Encoding { get; set; } = Encoding.UTF8;
-
-		/// <summary>
-		/// Gets or sets a value indicating whether the fill mode is enabled.
-		/// </summary>
-		public bool FillMode { get; set; } = true;
-
-		/// <summary>
-		/// Gets or sets a value indicating whether enums should be serialized as strings.
-		/// </summary>
-		public bool EnumAsString { get; set; }
-
-		/// <summary>
-		/// Gets or sets a value indicating whether encrypted values are handled as byte arrays.
-		/// </summary>
-		public bool EncryptedAsByteArray { get; set; }
-
-		/// <summary>
-		/// Gets or sets the buffer size used during serialization and deserialization.
-		/// </summary>
-		public int BufferSize { get; set; } = FileSizes.KB;
-
-		/// <summary>
-		/// Gets or sets the null value handling option for JSON serialization.
-		/// </summary>
-		public NullValueHandling NullValueHandling { get; set; } = NullValueHandling.Include;
-
-		/// <summary>
-		/// Gets the file extension associated with the JSON serializer.
-		/// </summary>
-		public override string FileExtension => "json";
-
-		/// <summary>
-		/// Creates a default instance of the JSON serializer with preconfigured settings.
-		/// </summary>
-		/// <returns>A default <see cref="JsonSerializer{T}"/> instance.</returns>
-		public static JsonSerializer<T> CreateDefault()
-			=> new()
-			{
-				Indent = true,
-				EnumAsString = true,
-				NullValueHandling = NullValueHandling.Ignore,
-			};
-
-		private static bool IsJsonPrimitive() => typeof(T).IsSerializablePrimitive() && typeof(T) != typeof(byte[]);
-
-		/// <summary>
-		/// Asynchronously serializes the specified object graph to the provided stream as JSON.
-		/// </summary>
-		/// <param name="graph">The object graph to serialize.</param>
-		/// <param name="stream">The stream to which the graph is serialized.</param>
-		/// <param name="cancellationToken">A token that can be used to cancel the serialization operation.</param>
-		/// <returns>A task representing the asynchronous serialization operation.</returns>
-		public override async ValueTask SerializeAsync(T graph, Stream stream, CancellationToken cancellationToken)
-		{
-			var isPrimitive = IsJsonPrimitive();
+	/// <summary>
+	/// Gets or sets a value indicating whether the JSON output should be indented.
+	/// </summary>
+	public bool Indent { get; set; }
 
-			using var writer = new JsonTextWriter(new StreamWriter(stream, Encoding, BufferSize, true))
-			{
-				Formatting = Indent ? Formatting.Indented : Formatting.None
-			};
+	/// <summary>
+	/// Gets or sets the text encoding used for serialization. Defaults to UTF8.
+	/// </summary>
+	public Encoding Encoding { get; set; } = Encoding.UTF8;
 
-			if (isPrimitive)
-				await writer.WriteStartArrayAsync(cancellationToken);
+	/// <summary>
+	/// Gets or sets a value indicating whether the fill mode is enabled.
+	/// </summary>
+	public bool FillMode { get; set; } = true;
 
-			await WriteAsync(writer, graph, cancellationToken);
+	/// <summary>
+	/// Gets or sets a value indicating whether enums should be serialized as strings.
+	/// </summary>
+	public bool EnumAsString { get; set; }
 
-			if (isPrimitive)
-				await writer.WriteEndArrayAsync(cancellationToken);
-		}
+	/// <summary>
+	/// Gets or sets a value indicating whether encrypted values are handled as byte arrays.
+	/// </summary>
+	public bool EncryptedAsByteArray { get; set; }
 
-		/// <summary>
-		/// Asynchronously deserializes an object graph from the provided JSON stream.
-		/// </summary>
-		/// <param name="stream">The stream from which the object graph is deserialized.</param>
-		/// <param name="cancellationToken">A token that can be used to cancel the deserialization operation.</param>
-		/// <returns>A task representing the asynchronous deserialization operation. The task result contains the deserialized object graph.</returns>
-		public override async ValueTask<T> DeserializeAsync(Stream stream, CancellationToken cancellationToken)
-		{
-			var isPrimitive = IsJsonPrimitive();
+	/// <summary>
+	/// Gets or sets the buffer size used during serialization and deserialization.
+	/// </summary>
+	public int BufferSize { get; set; } = FileSizes.KB;
 
-			using var reader = new JsonTextReader(new StreamReader(stream, Encoding, true, BufferSize, true))
-			{
-				FloatParseHandling = FloatParseHandling.Decimal
-			};
+	/// <summary>
+	/// Gets or sets the null value handling option for JSON serialization.
+	/// </summary>
+	public NullValueHandling NullValueHandling { get; set; } = NullValueHandling.Include;
 
-			if (isPrimitive)
-			{
-				if (!await reader.ReadAsync(cancellationToken))
-					return default;
-			}
+	/// <summary>
+	/// Gets the file extension associated with the JSON serializer.
+	/// </summary>
+	public override string FileExtension => "json";
 
-			var retVal = (T)await ReadAsync(reader, typeof(T), cancellationToken);
+	/// <summary>
+	/// Creates a default instance of the JSON serializer with preconfigured settings.
+	/// </summary>
+	/// <returns>A default <see cref="JsonSerializer{T}"/> instance.</returns>
+	public static JsonSerializer<T> CreateDefault()
+		=> new()
+		{
+			Indent = true,
+			EnumAsString = true,
+			NullValueHandling = NullValueHandling.Ignore,
+		};
 
-			if (isPrimitive)
-				await reader.ReadAsync(cancellationToken);
+	private static bool IsJsonPrimitive() => typeof(T).IsSerializablePrimitive() && typeof(T) != typeof(byte[]);
 
-			return retVal;
-		}
+	/// <summary>
+	/// Asynchronously serializes the specified object graph to the provided stream as JSON.
+	/// </summary>
+	/// <param name="graph">The object graph to serialize.</param>
+	/// <param name="stream">The stream to which the graph is serialized.</param>
+	/// <param name="cancellationToken">A token that can be used to cancel the serialization operation.</param>
+	/// <returns>A task representing the asynchronous serialization operation.</returns>
+	public override async ValueTask SerializeAsync(T graph, Stream stream, CancellationToken cancellationToken)
+	{
+		var isPrimitive = IsJsonPrimitive();
 
-		private async ValueTask<object> ReadAsync(JsonReader reader, Type type, CancellationToken cancellationToken)
+		using var writer = new JsonTextWriter(new StreamWriter(stream, Encoding, BufferSize, true))
 		{
-			if (type.IsPersistable())
-			{
-				if (FillMode)
-				{
-					var storage = (SettingsStorage)await ReadAsync(reader, typeof(SettingsStorage), cancellationToken);
+			Formatting = Indent ? Formatting.Indented : Formatting.None
+		};
 
-					if (storage is null)
-						return null;
+		if (isPrimitive)
+			await writer.WriteStartArrayAsync(cancellationToken);
 
-					var per = type.CreateInstance();
+		await WriteAsync(writer, graph, cancellationToken);
 
-					if (per is IAsyncPersistable asyncPer)
-						await asyncPer.LoadAsync(storage, default);
-					else
-						((IPersistable)per).Load(storage);
+		if (isPrimitive)
+			await writer.WriteEndArrayAsync(cancellationToken);
+	}
 
-					return per;
-				}
-				else
-				{
-					await reader.ReadWithCheckAsync(cancellationToken);
+	/// <summary>
+	/// Asynchronously deserializes an object graph from the provided JSON stream.
+	/// </summary>
+	/// <param name="stream">The stream from which the object graph is deserialized.</param>
+	/// <param name="cancellationToken">A token that can be used to cancel the deserialization operation.</param>
+	/// <returns>A task representing the asynchronous deserialization operation. The task result contains the deserialized object graph.</returns>
+	public override async ValueTask<T> DeserializeAsync(Stream stream, CancellationToken cancellationToken)
+	{
+		var isPrimitive = IsJsonPrimitive();
 
-					if (reader.TokenType == JsonToken.EndArray || reader.TokenType == JsonToken.Null)
-						return null;
+		using var reader = new JsonTextReader(new StreamReader(stream, Encoding, true, BufferSize, true))
+		{
+			FloatParseHandling = FloatParseHandling.Decimal
+		};
 
-					reader.ChechExpectedToken(JsonToken.StartObject);
+		if (isPrimitive)
+		{
+			if (!await reader.ReadAsync(cancellationToken))
+				return default;
+		}
 
-					var per = type.CreateInstance();
+		var retVal = (T)await ReadAsync(reader, typeof(T), cancellationToken);
 
-					var storage = new SettingsStorage(reader, GetValueFromReaderAsync);
+		if (isPrimitive)
+			await reader.ReadAsync(cancellationToken);
 
-					if (per is IAsyncPersistable asyncPer)
-						await asyncPer.LoadAsync(storage, default);
-					else
-						((IPersistable)per).Load(storage);
+		return retVal;
+	}
 
-					await TryClearDeepLevel(reader, storage, cancellationToken);
+	private async ValueTask<object> ReadAsync(JsonReader reader, Type type, CancellationToken cancellationToken)
+	{
+		if (type.IsPersistable())
+		{
+			if (FillMode)
+			{
+				var storage = (SettingsStorage)await ReadAsync(reader, typeof(SettingsStorage), cancellationToken);
 
-					await reader.ReadWithCheckAsync(cancellationToken);
+				if (storage is null)
+					return null;
 
-					reader.ChechExpectedToken(JsonToken.EndObject);
+				var per = type.CreateInstance();
 
-					return per;
-				}
+				if (per is IAsyncPersistable asyncPer)
+					await asyncPer.LoadAsync(storage, default);
+				else
+					((IPersistable)per).Load(storage);
+
+				return per;
 			}
-			else if (type == typeof(SettingsStorage))
+			else
 			{
 				await reader.ReadWithCheckAsync(cancellationToken);
 
@@ -242,241 +215,267 @@ private async ValueTask<object> ReadAsync(JsonReader reader, Type type, Cancella
 
 				reader.ChechExpectedToken(JsonToken.StartObject);
 
-				var storage = new SettingsStorage();
-				await FillAsync(storage, reader, cancellationToken);
+				var per = type.CreateInstance();
 
-				//await reader.ReadWithCheckAsync(cancellationToken);
+				var storage = new SettingsStorage(reader, GetValueFromReaderAsync);
 
-				reader.ChechExpectedToken(JsonToken.EndObject);
+				if (per is IAsyncPersistable asyncPer)
+					await asyncPer.LoadAsync(storage, default);
+				else
+					((IPersistable)per).Load(storage);
+
+				await TryClearDeepLevel(reader, storage, cancellationToken);
 
-				return storage;
-			}
-			else if (type.Is<IEnumerable>() && type != typeof(string))
-			{
 				await reader.ReadWithCheckAsync(cancellationToken);
 
-				if (reader.TokenType == JsonToken.EndArray || reader.TokenType == JsonToken.Null)
-					return null;
+				reader.ChechExpectedToken(JsonToken.EndObject);
 
-				reader.ChechExpectedToken(JsonToken.StartArray);
+				return per;
+			}
+		}
+		else if (type == typeof(SettingsStorage))
+		{
+			await reader.ReadWithCheckAsync(cancellationToken);
 
-				var itemType = type.GetItemType();
+			if (reader.TokenType == JsonToken.EndArray || reader.TokenType == JsonToken.Null)
+				return null;
 
-				var col = new List<object>();
+			reader.ChechExpectedToken(JsonToken.StartObject);
 
-				while (true)
-				{
-					var item = await ReadAsync(reader, itemType, cancellationToken);
+			var storage = new SettingsStorage();
+			await FillAsync(storage, reader, cancellationToken);
 
-					if (item is null && reader.TokenType == JsonToken.EndArray)
-						break;
+			//await reader.ReadWithCheckAsync(cancellationToken);
 
-					col.Add(item);
-				}
+			reader.ChechExpectedToken(JsonToken.EndObject);
+
+			return storage;
+		}
+		else if (type.Is<IEnumerable>() && type != typeof(string))
+		{
+			await reader.ReadWithCheckAsync(cancellationToken);
 
-				reader.ChechExpectedToken(JsonToken.EndArray);
+			if (reader.TokenType == JsonToken.EndArray || reader.TokenType == JsonToken.Null)
+				return null;
 
-				if (!type.IsArray && type != typeof(IEnumerable<>).Make(itemType))
-					return col;
+			reader.ChechExpectedToken(JsonToken.StartArray);
 
-				var arr = Array.CreateInstance(itemType, col.Count);
-				var idx = 0;
+			var itemType = type.GetItemType();
 
-				foreach (var item in col)
-				{
-					arr.SetValue(item, idx++);
-				}
+			var col = new List<object>();
 
-				return arr;
-			}
-			else
+			while (true)
 			{
-				object value;
-
-				if (type == typeof(DateTime))
-					value = await reader.ReadAsDateTimeAsync(cancellationToken);
-				else if (type == typeof(DateTimeOffset))
-					value = await reader.ReadAsDateTimeOffsetAsync(cancellationToken);
-				else if (type == typeof(byte[]))
-					value = await reader.ReadAsBytesAsync(cancellationToken);
-				else if (type == typeof(SecureString))
-				{
-					value = SecureStringEncryptor.Instance.Decrypt(EncryptedAsByteArray
-						? await reader.ReadAsBytesAsync(cancellationToken)
-						: (await reader.ReadAsStringAsync(cancellationToken))?.Base64());
-				}
-				else if (type.TryGetAdapterType(out var adapterType))
-				{
-					value = await ReadAsync(reader, adapterType, cancellationToken);
+				var item = await ReadAsync(reader, itemType, cancellationToken);
 
-					if (value is IPersistableAdapter adapter)
-						value = adapter.UnderlyingValue;
-				}
-				else
-					value = await reader.ReadAsStringAsync(cancellationToken);
+				if (item is null && reader.TokenType == JsonToken.EndArray)
+					break;
 
-				return value?.To(type);
+				col.Add(item);
 			}
-		}
-
-		private async ValueTask WriteAsync(JsonWriter writer, object value, CancellationToken cancellationToken)
-		{
-			async Task WriteSettingsStorageAsync(SettingsStorage storage)
-			{
-				await writer.WriteStartObjectAsync(cancellationToken);
 
-				foreach (var pair in storage)
-				{
-					if (pair.Value is null && NullValueHandling == NullValueHandling.Ignore)
-						continue;
+			reader.ChechExpectedToken(JsonToken.EndArray);
 
-					await writer.WritePropertyNameAsync(pair.Key, cancellationToken);
-					await WriteAsync(writer, pair.Value, cancellationToken);
-				}
+			if (!type.IsArray && type != typeof(IEnumerable<>).Make(itemType))
+				return col;
 
-				await writer.WriteEndObjectAsync(cancellationToken);
-			}
+			var arr = Array.CreateInstance(itemType, col.Count);
+			var idx = 0;
 
-			if (value is IPersistable per)
-			{
-				await WriteSettingsStorageAsync(per.Save());
-			}
-			else if (value is IAsyncPersistable asyncPer)
+			foreach (var item in col)
 			{
-				await WriteSettingsStorageAsync(await asyncPer.SaveAsync(cancellationToken));
+				arr.SetValue(item, idx++);
 			}
-			else if (value is SettingsStorage storage)
+
+			return arr;
+		}
+		else
+		{
+			object value;
+
+			if (type == typeof(DateTime))
+				value = await reader.ReadAsDateTimeAsync(cancellationToken);
+			else if (type == typeof(DateTimeOffset))
+				value = await reader.ReadAsDateTimeOffsetAsync(cancellationToken);
+			else if (type == typeof(byte[]))
+				value = await reader.ReadAsBytesAsync(cancellationToken);
+			else if (type == typeof(SecureString))
 			{
-				await WriteSettingsStorageAsync(storage);
+				value = SecureStringEncryptor.Instance.Decrypt(EncryptedAsByteArray
+					? await reader.ReadAsBytesAsync(cancellationToken)
+					: (await reader.ReadAsStringAsync(cancellationToken))?.Base64());
 			}
-			else if (value is IEnumerable primCol && value is not string)
+			else if (type.TryGetAdapterType(out var adapterType))
 			{
-				await writer.WriteStartArrayAsync(cancellationToken);
+				value = await ReadAsync(reader, adapterType, cancellationToken);
 
-				foreach (var item in primCol)
-					await WriteAsync(writer, item, cancellationToken);
-
-				await writer.WriteEndArrayAsync(cancellationToken);
-			}
-			else if (value is SecureString secStr)
-			{
-				var encrypted = SecureStringEncryptor.Instance.Encrypt(secStr);
-				await WriteAsync(writer, EncryptedAsByteArray ? encrypted : encrypted?.Base64(), cancellationToken);
+				if (value is IPersistableAdapter adapter)
+					value = adapter.UnderlyingValue;
 			}
 			else
+				value = await reader.ReadAsStringAsync(cancellationToken);
+
+			return value?.To(type);
+		}
+	}
+
+	private async ValueTask WriteAsync(JsonWriter writer, object value, CancellationToken cancellationToken)
+	{
+		async Task WriteSettingsStorageAsync(SettingsStorage storage)
+		{
+			await writer.WriteStartObjectAsync(cancellationToken);
+
+			foreach (var pair in storage)
 			{
-				if (value is TimeZoneInfo tz)
-					value = tz.To<string>();
-				else if (value is Enum && EnumAsString)
-					value = value.To<string>();
-				else if (value is Type t)
-					value = t.GetTypeAsString(false);
-				else if (value != null && value.GetType().TryGetAdapterType(out var adapterType))
-				{
-					var adapter = adapterType.CreateInstance<IPersistableAdapter>();
-					adapter.UnderlyingValue = value;
-					await WriteAsync(writer, adapter, cancellationToken);
-					return;
-				}
+				if (pair.Value is null && NullValueHandling == NullValueHandling.Ignore)
+					continue;
 
-				await writer.WriteValueAsync(value, cancellationToken);
+				await writer.WritePropertyNameAsync(pair.Key, cancellationToken);
+				await WriteAsync(writer, pair.Value, cancellationToken);
 			}
+
+			await writer.WriteEndObjectAsync(cancellationToken);
 		}
 
-		private async ValueTask FillAsync(SettingsStorage storage, JsonReader reader, CancellationToken cancellationToken)
+		if (value is IPersistable per)
+		{
+			await WriteSettingsStorageAsync(per.Save());
+		}
+		else if (value is IAsyncPersistable asyncPer)
 		{
-			if (storage is null)
-				throw new ArgumentNullException(nameof(storage));
+			await WriteSettingsStorageAsync(await asyncPer.SaveAsync(cancellationToken));
+		}
+		else if (value is SettingsStorage storage)
+		{
+			await WriteSettingsStorageAsync(storage);
+		}
+		else if (value is IEnumerable primCol && value is not string)
+		{
+			await writer.WriteStartArrayAsync(cancellationToken);
 
-			if (reader is null)
-				throw new ArgumentNullException(nameof(reader));
+			foreach (var item in primCol)
+				await WriteAsync(writer, item, cancellationToken);
 
-			while (true)
+			await writer.WriteEndArrayAsync(cancellationToken);
+		}
+		else if (value is SecureString secStr)
+		{
+			var encrypted = SecureStringEncryptor.Instance.Encrypt(secStr);
+			await WriteAsync(writer, EncryptedAsByteArray ? encrypted : encrypted?.Base64(), cancellationToken);
+		}
+		else
+		{
+			if (value is TimeZoneInfo tz)
+				value = tz.To<string>();
+			else if (value is Enum && EnumAsString)
+				value = value.To<string>();
+			else if (value is Type t)
+				value = t.GetTypeAsString(false);
+			else if (value != null && value.GetType().TryGetAdapterType(out var adapterType))
 			{
-				await reader.ReadWithCheckAsync(cancellationToken);
+				var adapter = adapterType.CreateInstance<IPersistableAdapter>();
+				adapter.UnderlyingValue = value;
+				await WriteAsync(writer, adapter, cancellationToken);
+				return;
+			}
 
-				if (reader.TokenType == JsonToken.EndObject)
-					break;
+			await writer.WriteValueAsync(value, cancellationToken);
+		}
+	}
 
-				reader.ChechExpectedToken(JsonToken.PropertyName);
+	private async ValueTask FillAsync(SettingsStorage storage, JsonReader reader, CancellationToken cancellationToken)
+	{
+		if (storage is null)
+			throw new ArgumentNullException(nameof(storage));
 
-				var propName = (string)reader.Value;
+		if (reader is null)
+			throw new ArgumentNullException(nameof(reader));
 
-				await reader.ReadWithCheckAsync(cancellationToken);
+		while (true)
+		{
+			await reader.ReadWithCheckAsync(cancellationToken);
+
+			if (reader.TokenType == JsonToken.EndObject)
+				break;
 
-				object value;
+			reader.ChechExpectedToken(JsonToken.PropertyName);
+
+			var propName = (string)reader.Value;
+
+			await reader.ReadWithCheckAsync(cancellationToken);
+
+			object value;
 
-				switch (reader.TokenType)
+			switch (reader.TokenType)
+			{
+				case JsonToken.StartObject:
 				{
-					case JsonToken.StartObject:
-					{
-						var inner = new SettingsStorage();
-						await FillAsync(inner, reader, cancellationToken);
-						value = inner;
-						break;
-					}
-					case JsonToken.StartArray:
-					{
-						await reader.ReadWithCheckAsync(cancellationToken);
+					var inner = new SettingsStorage();
+					await FillAsync(inner, reader, cancellationToken);
+					value = inner;
+					break;
+				}
+				case JsonToken.StartArray:
+				{
+					await reader.ReadWithCheckAsync(cancellationToken);
 
-						var list = new List<object>();
+					var list = new List<object>();
 
-						while (reader.TokenType != JsonToken.EndArray)
+					while (reader.TokenType != JsonToken.EndArray)
+					{
+						switch (reader.TokenType)
 						{
-							switch (reader.TokenType)
+							case JsonToken.StartObject:
 							{
-								case JsonToken.StartObject:
-								{
-									var inner = new SettingsStorage();
-									await FillAsync(inner, reader, cancellationToken);
-									list.Add(inner);
-									break;
-								}
-								default:
-									list.Add(reader.Value);
-									break;
+								var inner = new SettingsStorage();
+								await FillAsync(inner, reader, cancellationToken);
+								list.Add(inner);
+								break;
 							}
-
-							await reader.ReadWithCheckAsync(cancellationToken);
+							default:
+								list.Add(reader.Value);
+								break;
 						}
 
-						value = list.ToArray();
-						break;
+						await reader.ReadWithCheckAsync(cancellationToken);
 					}
-					default:
-						value = reader.Value;
-						break;
-				}
 
-				storage.Set(propName, value);
+					value = list.ToArray();
+					break;
+				}
+				default:
+					value = reader.Value;
+					break;
 			}
+
+			storage.Set(propName, value);
 		}
+	}
 
-		private async ValueTask TryClearDeepLevel(JsonReader reader, SettingsStorage storage, CancellationToken cancellationToken)
-		{
-			var lvl = storage.DeepLevel;
+	private async ValueTask TryClearDeepLevel(JsonReader reader, SettingsStorage storage, CancellationToken cancellationToken)
+	{
+		var lvl = storage.DeepLevel;
 
-			if (lvl == 0)
-				return;
+		if (lvl == 0)
+			return;
 
-			for (var i = 1; i <= lvl; i++)
-				await reader.ReadWithCheckAsync(cancellationToken);
+		for (var i = 1; i <= lvl; i++)
+			await reader.ReadWithCheckAsync(cancellationToken);
 
-			storage.DeepLevel = 0;
-		}
+		storage.DeepLevel = 0;
+	}
 
-		private async ValueTask<object> GetValueFromReaderAsync(JsonReader reader, SettingsStorage storage, string name, Type type, CancellationToken cancellationToken)
-		{
-			await TryClearDeepLevel(reader, storage, cancellationToken);
+	private async ValueTask<object> GetValueFromReaderAsync(JsonReader reader, SettingsStorage storage, string name, Type type, CancellationToken cancellationToken)
+	{
+		await TryClearDeepLevel(reader, storage, cancellationToken);
 
-			await reader.ReadWithCheckAsync(cancellationToken);
+		await reader.ReadWithCheckAsync(cancellationToken);
 
-			reader.ChechExpectedToken(JsonToken.PropertyName);
+		reader.ChechExpectedToken(JsonToken.PropertyName);
 
-			if (!((string)reader.Value).EqualsIgnoreCase(name))
-				throw new InvalidOperationException($"{reader.Value} != {name}");
+		if (!((string)reader.Value).EqualsIgnoreCase(name))
+			throw new InvalidOperationException($"{reader.Value} != {name}");
 
-			return await ReadAsync(reader, type, cancellationToken);
-		}
+		return await ReadAsync(reader, type, cancellationToken);
 	}
 }
\ No newline at end of file
diff --git a/Serialization/PersistableHelper.cs b/Serialization/PersistableHelper.cs
index 4be1d641..fb3b6f26 100644
--- a/Serialization/PersistableHelper.cs
+++ b/Serialization/PersistableHelper.cs
@@ -1,663 +1,662 @@
-namespace Ecng.Serialization
+namespace Ecng.Serialization;
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Reflection;
+
+using Ecng.Common;
+using Ecng.Collections;
+using Ecng.Reflection;
+
+/// <summary>
+/// Provides helper methods for persisting, cloning, loading and saving objects.
+/// </summary>
+public static class PersistableHelper
 {
-	using System;
-	using System.Threading;
-	using System.Threading.Tasks;
-	using System.Reflection;
+	private static readonly CachedSynchronizedDictionary<Type, Type> _adapterTypes = [];
+
+	private static Type ValidateAdapterType(Type adapterType)
+	{
+		if (adapterType is null)
+			throw new ArgumentNullException(nameof(adapterType));
+
+		if (!adapterType.IsPersistable())
+			throw new ArgumentException($"Not {typeof(IPersistable)}.", nameof(adapterType));
+
+		if (!adapterType.Is<IPersistableAdapter>())
+			throw new ArgumentException($"Not {typeof(IPersistableAdapter)}.", nameof(adapterType));
 
-	using Ecng.Common;
-	using Ecng.Collections;
-	using Ecng.Reflection;
+		return adapterType;
+	}
 
 	/// <summary>
-	/// Provides helper methods for persisting, cloning, loading and saving objects.
+	/// Registers the adapter type for the given type.
 	/// </summary>
-	public static class PersistableHelper
-	{
-		private static readonly CachedSynchronizedDictionary<Type, Type> _adapterTypes = [];
+	/// <param name="type">The type for which the adapter is registered.</param>
+	/// <param name="adapterType">The adapter type to register.</param>
+	public static void RegisterAdapterType(this Type type, Type adapterType)
+		=> _adapterTypes.Add(type, ValidateAdapterType(adapterType));
 
-		private static Type ValidateAdapterType(Type adapterType)
-		{
-			if (adapterType is null)
-				throw new ArgumentNullException(nameof(adapterType));
+	/// <summary>
+	/// Removes the registered adapter type for the given type.
+	/// </summary>
+	/// <param name="type">The type whose adapter registration is removed.</param>
+	/// <returns><c>true</c> if the adapter was removed; otherwise, <c>false</c>.</returns>
+	public static bool RemoveAdapterType(this Type type)
+		=> _adapterTypes.Remove(type);
 
-			if (!adapterType.IsPersistable())
-				throw new ArgumentException($"Not {typeof(IPersistable)}.", nameof(adapterType));
+	/// <summary>
+	/// Tries to get the registered adapter type for the given type.
+	/// </summary>
+	/// <param name="type">The type to check.</param>
+	/// <param name="adapterType">When this method returns, contains the adapter type if found.</param>
+	/// <returns><c>true</c> if found; otherwise, <c>false</c>.</returns>
+	public static bool TryGetAdapterType(this Type type, out Type adapterType)
+		=> _adapterTypes.TryGetValue(type, out adapterType);
 
-			if (!adapterType.Is<IPersistableAdapter>())
-				throw new ArgumentException($"Not {typeof(IPersistableAdapter)}.", nameof(adapterType));
+	/// <summary>
+	/// Determines whether the specified type is persistable.
+	/// </summary>
+	/// <param name="type">The type to evaluate.</param>
+	/// <returns><c>true</c> if the type implements IPersistable or IAsyncPersistable; otherwise, <c>false</c>.</returns>
+	public static bool IsPersistable(this Type type)
+		=> type.Is<IPersistable>() || type.Is<IAsyncPersistable>();
 
-			return adapterType;
-		}
+	private const string _typeKey = "type";
+	private const string _valueKey = "value";
+	private const string _settingsKey = "settings";
 
-		/// <summary>
-		/// Registers the adapter type for the given type.
-		/// </summary>
-		/// <param name="type">The type for which the adapter is registered.</param>
-		/// <param name="adapterType">The adapter type to register.</param>
-		public static void RegisterAdapterType(this Type type, Type adapterType)
-			=> _adapterTypes.Add(type, ValidateAdapterType(adapterType));
-
-		/// <summary>
-		/// Removes the registered adapter type for the given type.
-		/// </summary>
-		/// <param name="type">The type whose adapter registration is removed.</param>
-		/// <returns><c>true</c> if the adapter was removed; otherwise, <c>false</c>.</returns>
-		public static bool RemoveAdapterType(this Type type)
-			=> _adapterTypes.Remove(type);
-
-		/// <summary>
-		/// Tries to get the registered adapter type for the given type.
-		/// </summary>
-		/// <param name="type">The type to check.</param>
-		/// <param name="adapterType">When this method returns, contains the adapter type if found.</param>
-		/// <returns><c>true</c> if found; otherwise, <c>false</c>.</returns>
-		public static bool TryGetAdapterType(this Type type, out Type adapterType)
-			=> _adapterTypes.TryGetValue(type, out adapterType);
-
-		/// <summary>
-		/// Determines whether the specified type is persistable.
-		/// </summary>
-		/// <param name="type">The type to evaluate.</param>
-		/// <returns><c>true</c> if the type implements IPersistable or IAsyncPersistable; otherwise, <c>false</c>.</returns>
-		public static bool IsPersistable(this Type type)
-			=> type.Is<IPersistable>() || type.Is<IAsyncPersistable>();
-
-		private const string _typeKey = "type";
-		private const string _valueKey = "value";
-		private const string _settingsKey = "settings";
-
-		/// <summary>
-		/// Creates and initializes an object from the specified settings storage.
-		/// </summary>
-		/// <typeparam name="T">The type of the persistable object.</typeparam>
-		/// <param name="storage">The settings storage used to create the object.</param>
-		/// <returns>The created and initialized object.</returns>
-		public static T LoadEntire<T>(this SettingsStorage storage)
-			where T : IPersistable
-		{
-			if (storage is null)
-				throw new ArgumentNullException(nameof(storage));
+	/// <summary>
+	/// Creates and initializes an object from the specified settings storage.
+	/// </summary>
+	/// <typeparam name="T">The type of the persistable object.</typeparam>
+	/// <param name="storage">The settings storage used to create the object.</param>
+	/// <returns>The created and initialized object.</returns>
+	public static T LoadEntire<T>(this SettingsStorage storage)
+		where T : IPersistable
+	{
+		if (storage is null)
+			throw new ArgumentNullException(nameof(storage));
 
-			var instance = storage.GetValue<Type>(_typeKey).CreateInstance<T>();
-			instance.Load(storage, _settingsKey);
-			return instance;
-		}
+		var instance = storage.GetValue<Type>(_typeKey).CreateInstance<T>();
+		instance.Load(storage, _settingsKey);
+		return instance;
+	}
 
-		/// <summary>
-		/// Saves the entire state of the persistable object into a new settings storage.
-		/// </summary>
-		/// <param name="persistable">The persistable object to save.</param>
-		/// <param name="isAssemblyQualifiedName">A value indicating whether the type name should be assembly qualified.</param>
-		/// <returns>A settings storage containing the saved state.</returns>
-		public static SettingsStorage SaveEntire(this IPersistable persistable, bool isAssemblyQualifiedName)
-		{
-			if (persistable is null)
-				throw new ArgumentNullException(nameof(persistable));
+	/// <summary>
+	/// Saves the entire state of the persistable object into a new settings storage.
+	/// </summary>
+	/// <param name="persistable">The persistable object to save.</param>
+	/// <param name="isAssemblyQualifiedName">A value indicating whether the type name should be assembly qualified.</param>
+	/// <returns>A settings storage containing the saved state.</returns>
+	public static SettingsStorage SaveEntire(this IPersistable persistable, bool isAssemblyQualifiedName)
+	{
+		if (persistable is null)
+			throw new ArgumentNullException(nameof(persistable));
 
-			return new SettingsStorage()
-				.Set(_typeKey, persistable.GetType().GetTypeAsString(isAssemblyQualifiedName))
-				.Set(_settingsKey, persistable.Save());
-		}
+		return new SettingsStorage()
+			.Set(_typeKey, persistable.GetType().GetTypeAsString(isAssemblyQualifiedName))
+			.Set(_settingsKey, persistable.Save());
+	}
 
-		/// <summary>
-		/// Clones the specified persistable object.
-		/// </summary>
-		/// <typeparam name="T">The type of the persistable object.</typeparam>
-		/// <param name="obj">The object to clone.</param>
-		/// <returns>A clone of the object.</returns>
-		public static T Clone<T>(this T obj)
-			where T : IPersistable
-		{
-			if (obj.IsNull())
-				return default;
+	/// <summary>
+	/// Clones the specified persistable object.
+	/// </summary>
+	/// <typeparam name="T">The type of the persistable object.</typeparam>
+	/// <param name="obj">The object to clone.</param>
+	/// <returns>A clone of the object.</returns>
+	public static T Clone<T>(this T obj)
+		where T : IPersistable
+	{
+		if (obj.IsNull())
+			return default;
 
-			var clone = obj.GetType().CreateInstance<T>();
-			clone.Load(obj.Save());
-			return clone;
-		}
+		var clone = obj.GetType().CreateInstance<T>();
+		clone.Load(obj.Save());
+		return clone;
+	}
 
-		/// <summary>
-		/// Asynchronously clones the specified asynchronous persistable object.
-		/// </summary>
-		/// <typeparam name="T">The type of the asynchronous persistable object.</typeparam>
-		/// <param name="obj">The object to clone.</param>
-		/// <param name="cancellationToken">A token for cancellation.</param>
-		/// <returns>A ValueTask with the cloned object.</returns>
-		public static async ValueTask<T> CloneAsync<T>(this T obj, CancellationToken cancellationToken = default)
-			where T : IAsyncPersistable
-		{
-			if (obj.IsNull())
-				return default;
+	/// <summary>
+	/// Asynchronously clones the specified asynchronous persistable object.
+	/// </summary>
+	/// <typeparam name="T">The type of the asynchronous persistable object.</typeparam>
+	/// <param name="obj">The object to clone.</param>
+	/// <param name="cancellationToken">A token for cancellation.</param>
+	/// <returns>A ValueTask with the cloned object.</returns>
+	public static async ValueTask<T> CloneAsync<T>(this T obj, CancellationToken cancellationToken = default)
+		where T : IAsyncPersistable
+	{
+		if (obj.IsNull())
+			return default;
 
-			var clone = obj.GetType().CreateInstance<T>();
-			await clone.LoadAsync(await obj.SaveAsync(cancellationToken), cancellationToken);
-			return clone;
-		}
+		var clone = obj.GetType().CreateInstance<T>();
+		await clone.LoadAsync(await obj.SaveAsync(cancellationToken), cancellationToken);
+		return clone;
+	}
 
-		/// <summary>
-		/// Applies the state from the clone to the target persistable object.
-		/// </summary>
-		/// <typeparam name="T">The type of the persistable object.</typeparam>
-		/// <param name="obj">The target object.</param>
-		/// <param name="clone">The object from which to copy the state.</param>
-		public static void Apply<T>(this T obj, T clone)
-			where T : IPersistable
-		{
-			obj.Load(clone.Save());
-		}
+	/// <summary>
+	/// Applies the state from the clone to the target persistable object.
+	/// </summary>
+	/// <typeparam name="T">The type of the persistable object.</typeparam>
+	/// <param name="obj">The target object.</param>
+	/// <param name="clone">The object from which to copy the state.</param>
+	public static void Apply<T>(this T obj, T clone)
+		where T : IPersistable
+	{
+		obj.Load(clone.Save());
+	}
 
-		/// <summary>
-		/// Asynchronously applies the state from the clone to the target asynchronous persistable object.
-		/// </summary>
-		/// <typeparam name="T">The type of the asynchronous persistable object.</typeparam>
-		/// <param name="obj">The target object.</param>
-		/// <param name="clone">The object from which to copy the state.</param>
-		/// <param name="cancellationToken">A token for cancellation.</param>
-		/// <returns>A ValueTask representing the asynchronous operation.</returns>
-		public static async ValueTask ApplyAsync<T>(this T obj, T clone, CancellationToken cancellationToken = default)
-			where T : IAsyncPersistable
-		{
-			await obj.LoadAsync(await clone.SaveAsync(cancellationToken), cancellationToken);
-		}
+	/// <summary>
+	/// Asynchronously applies the state from the clone to the target asynchronous persistable object.
+	/// </summary>
+	/// <typeparam name="T">The type of the asynchronous persistable object.</typeparam>
+	/// <param name="obj">The target object.</param>
+	/// <param name="clone">The object from which to copy the state.</param>
+	/// <param name="cancellationToken">A token for cancellation.</param>
+	/// <returns>A ValueTask representing the asynchronous operation.</returns>
+	public static async ValueTask ApplyAsync<T>(this T obj, T clone, CancellationToken cancellationToken = default)
+		where T : IAsyncPersistable
+	{
+		await obj.LoadAsync(await clone.SaveAsync(cancellationToken), cancellationToken);
+	}
 
-		/// <summary>
-		/// Asynchronously saves the state of the asynchronous persistable object to a settings storage.
-		/// </summary>
-		/// <param name="persistable">The asynchronous persistable object.</param>
-		/// <param name="cancellationToken">A token for cancellation.</param>
-		/// <returns>A ValueTask with the settings storage containing the saved state.</returns>
-		public static async ValueTask<SettingsStorage> SaveAsync(this IAsyncPersistable persistable, CancellationToken cancellationToken = default)
-		{
-			if (persistable is null)
-				throw new ArgumentNullException(nameof(persistable));
+	/// <summary>
+	/// Asynchronously saves the state of the asynchronous persistable object to a settings storage.
+	/// </summary>
+	/// <param name="persistable">The asynchronous persistable object.</param>
+	/// <param name="cancellationToken">A token for cancellation.</param>
+	/// <returns>A ValueTask with the settings storage containing the saved state.</returns>
+	public static async ValueTask<SettingsStorage> SaveAsync(this IAsyncPersistable persistable, CancellationToken cancellationToken = default)
+	{
+		if (persistable is null)
+			throw new ArgumentNullException(nameof(persistable));
 
-			var storage = new SettingsStorage();
-			await persistable.SaveAsync(storage, cancellationToken);
-			return storage;
-		}
+		var storage = new SettingsStorage();
+		await persistable.SaveAsync(storage, cancellationToken);
+		return storage;
+	}
 
-		/// <summary>
-		/// Asynchronously loads an asynchronous persistable object using the specified type.
-		/// </summary>
-		/// <param name="storage">The settings storage to load from.</param>
-		/// <param name="type">The type of the asynchronous persistable object.</param>
-		/// <param name="cancellationToken">A token for cancellation.</param>
-		/// <returns>A ValueTask with the loaded asynchronous persistable object.</returns>
-		public static async ValueTask<IAsyncPersistable> LoadAsync(this SettingsStorage storage, Type type, CancellationToken cancellationToken = default)
-		{
-			if (storage is null)
-				throw new ArgumentNullException(nameof(storage));
+	/// <summary>
+	/// Asynchronously loads an asynchronous persistable object using the specified type.
+	/// </summary>
+	/// <param name="storage">The settings storage to load from.</param>
+	/// <param name="type">The type of the asynchronous persistable object.</param>
+	/// <param name="cancellationToken">A token for cancellation.</param>
+	/// <returns>A ValueTask with the loaded asynchronous persistable object.</returns>
+	public static async ValueTask<IAsyncPersistable> LoadAsync(this SettingsStorage storage, Type type, CancellationToken cancellationToken = default)
+	{
+		if (storage is null)
+			throw new ArgumentNullException(nameof(storage));
 
-			var obj = type.CreateInstance<IAsyncPersistable>();
-			await obj.LoadAsync(storage, cancellationToken);
-			return obj;
-		}
+		var obj = type.CreateInstance<IAsyncPersistable>();
+		await obj.LoadAsync(storage, cancellationToken);
+		return obj;
+	}
 
-		/// <summary>
-		/// Asynchronously loads an asynchronous persistable object of type T.
-		/// </summary>
-		/// <typeparam name="T">The type of the asynchronous persistable object.</typeparam>
-		/// <param name="storage">The settings storage to load from.</param>
-		/// <param name="cancellationToken">A token for cancellation.</param>
-		/// <returns>A ValueTask with the loaded object of type T.</returns>
-		public static async ValueTask<T> LoadAsync<T>(this SettingsStorage storage, CancellationToken cancellationToken = default)
-			where T : IAsyncPersistable, new()
-			=> (T)await storage.LoadAsync(typeof(T), cancellationToken);
-
-		/// <summary>
-		/// Saves the state of the persistable object to a settings storage.
-		/// </summary>
-		/// <param name="persistable">The persistable object to save.</param>
-		/// <returns>A settings storage containing the saved state.</returns>
-		public static SettingsStorage Save(this IPersistable persistable)
-		{
-			if (persistable is null)
-				throw new ArgumentNullException(nameof(persistable));
+	/// <summary>
+	/// Asynchronously loads an asynchronous persistable object of type T.
+	/// </summary>
+	/// <typeparam name="T">The type of the asynchronous persistable object.</typeparam>
+	/// <param name="storage">The settings storage to load from.</param>
+	/// <param name="cancellationToken">A token for cancellation.</param>
+	/// <returns>A ValueTask with the loaded object of type T.</returns>
+	public static async ValueTask<T> LoadAsync<T>(this SettingsStorage storage, CancellationToken cancellationToken = default)
+		where T : IAsyncPersistable, new()
+		=> (T)await storage.LoadAsync(typeof(T), cancellationToken);
 
-			var storage = new SettingsStorage();
-			persistable.Save(storage);
-			return storage;
-		}
+	/// <summary>
+	/// Saves the state of the persistable object to a settings storage.
+	/// </summary>
+	/// <param name="persistable">The persistable object to save.</param>
+	/// <returns>A settings storage containing the saved state.</returns>
+	public static SettingsStorage Save(this IPersistable persistable)
+	{
+		if (persistable is null)
+			throw new ArgumentNullException(nameof(persistable));
 
-		/// <summary>
-		/// Loads an IPersistable object of the specified type from the settings storage.
-		/// </summary>
-		/// <param name="storage">The settings storage to load from.</param>
-		/// <param name="type">The type of the persistable object.</param>
-		/// <returns>The loaded persistable object.</returns>
-		public static IPersistable Load(this SettingsStorage storage, Type type)
-		{
-			if (storage is null)
-				throw new ArgumentNullException(nameof(storage));
+		var storage = new SettingsStorage();
+		persistable.Save(storage);
+		return storage;
+	}
 
-			var obj = type.CreateInstance<IPersistable>();
-			obj.Load(storage);
-			return obj;
-		}
+	/// <summary>
+	/// Loads an IPersistable object of the specified type from the settings storage.
+	/// </summary>
+	/// <param name="storage">The settings storage to load from.</param>
+	/// <param name="type">The type of the persistable object.</param>
+	/// <returns>The loaded persistable object.</returns>
+	public static IPersistable Load(this SettingsStorage storage, Type type)
+	{
+		if (storage is null)
+			throw new ArgumentNullException(nameof(storage));
 
-		/// <summary>
-		/// Loads an IPersistable object of type T from the settings storage.
-		/// </summary>
-		/// <typeparam name="T">The type of the persistable object.</typeparam>
-		/// <param name="storage">The settings storage to load from.</param>
-		/// <returns>The loaded object of type T.</returns>
-		public static T Load<T>(this SettingsStorage storage)
-			where T : IPersistable
-			=> (T)storage.Load(typeof(T));
-
-		/// <summary>
-		/// Forces the persistable object to load its state from the given settings storage.
-		/// </summary>
-		/// <typeparam name="T">The type of the persistable object.</typeparam>
-		/// <param name="t">The target object.</param>
-		/// <param name="storage">The settings storage to load from.</param>
-		public static void ForceLoad<T>(this T t, SettingsStorage storage)
-			where T : IPersistable
-			=> t.Load(storage);
-
-		/// <summary>
-		/// Adds a persistable object's state as a value in the settings storage.
-		/// </summary>
-		/// <param name="storage">The settings storage to update.</param>
-		/// <param name="name">The name of the setting.</param>
-		/// <param name="persistable">The persistable object whose state is added.</param>
-		public static void SetValue(this SettingsStorage storage, string name, IPersistable persistable)
-		{
-			if (storage is null)
-				throw new ArgumentNullException(nameof(storage));
+		var obj = type.CreateInstance<IPersistable>();
+		obj.Load(storage);
+		return obj;
+	}
 
-			storage.SetValue(name, persistable.Save());
-		}
+	/// <summary>
+	/// Loads an IPersistable object of type T from the settings storage.
+	/// </summary>
+	/// <typeparam name="T">The type of the persistable object.</typeparam>
+	/// <param name="storage">The settings storage to load from.</param>
+	/// <returns>The loaded object of type T.</returns>
+	public static T Load<T>(this SettingsStorage storage)
+		where T : IPersistable
+		=> (T)storage.Load(typeof(T));
 
-		/// <summary>
-		/// </summary>
-		[Obsolete("Use overload with serializer param.")]
-		public static void LoadFromString<TSerializer>(this IPersistable persistable, string value)
-			where TSerializer : ISerializer<SettingsStorage>, new()
-			=> new TSerializer().LoadFromString(persistable, value);
-
-		/// <summary>
-		/// </summary>
-		[Obsolete("Use overload with serializer param.")]
-		public static SettingsStorage LoadFromString<TSerializer>(this string value)
-			where TSerializer : ISerializer<SettingsStorage>, new()
-			=> new TSerializer().LoadFromString(value);
-
-		/// <summary>
-		/// Loads the state of the persistable object from a string using the provided serializer.
-		/// </summary>
-		/// <param name="serializer">The serializer to use.</param>
-		/// <param name="persistable">The persistable object to load.</param>
-		/// <param name="value">The string representation of the state.</param>
-		public static void LoadFromString(this ISerializer<SettingsStorage> serializer, IPersistable persistable, string value)
-		{
-			if (persistable is null)
-				throw new ArgumentNullException(nameof(persistable));
+	/// <summary>
+	/// Forces the persistable object to load its state from the given settings storage.
+	/// </summary>
+	/// <typeparam name="T">The type of the persistable object.</typeparam>
+	/// <param name="t">The target object.</param>
+	/// <param name="storage">The settings storage to load from.</param>
+	public static void ForceLoad<T>(this T t, SettingsStorage storage)
+		where T : IPersistable
+		=> t.Load(storage);
 
-			persistable.Load(serializer.LoadFromString(value));
-		}
+	/// <summary>
+	/// Adds a persistable object's state as a value in the settings storage.
+	/// </summary>
+	/// <param name="storage">The settings storage to update.</param>
+	/// <param name="name">The name of the setting.</param>
+	/// <param name="persistable">The persistable object whose state is added.</param>
+	public static void SetValue(this SettingsStorage storage, string name, IPersistable persistable)
+	{
+		if (storage is null)
+			throw new ArgumentNullException(nameof(storage));
 
-		/// <summary>
-		/// Loads a value of type TValue from a string using the provided serializer.
-		/// </summary>
-		/// <typeparam name="TValue">The type of the value to load.</typeparam>
-		/// <param name="serializer">The serializer to use.</param>
-		/// <param name="value">The string representation of the value.</param>
-		/// <returns>The deserialized value.</returns>
-		public static TValue LoadFromString<TValue>(this ISerializer<TValue> serializer, string value)
-		{
-			if (value is null)
-				throw new ArgumentNullException(nameof(value));
+		storage.SetValue(name, persistable.Save());
+	}
 
-			return Do.Invariant(() => serializer.Deserialize(value.UTF8()));
-		}
+	/// <summary>
+	/// </summary>
+	[Obsolete("Use overload with serializer param.")]
+	public static void LoadFromString<TSerializer>(this IPersistable persistable, string value)
+		where TSerializer : ISerializer<SettingsStorage>, new()
+		=> new TSerializer().LoadFromString(persistable, value);
 
-		/// <summary>
-		/// </summary>
-		[Obsolete("Use overload with serializer param.")]
-		public static string SaveToString<TSerializer>(this IPersistable persistable)
-			where TSerializer : ISerializer<SettingsStorage>, new()
-			=> new TSerializer().SaveToString(persistable);
-
-		/// <summary>
-		/// </summary>
-		[Obsolete("Use overload with serializer param.")]
-		public static string SaveToString<TSerializer>(this SettingsStorage settings)
-			where TSerializer : ISerializer<SettingsStorage>, new()
-			=> new TSerializer().SaveToString(settings);
-
-		/// <summary>
-		/// Saves the state of the persistable object to a string using the provided serializer.
-		/// </summary>
-		/// <param name="serializer">The serializer to use.</param>
-		/// <param name="persistable">The persistable object to save.</param>
-		/// <returns>A string representing the saved state.</returns>
-		public static string SaveToString(this ISerializer<SettingsStorage> serializer, IPersistable persistable)
-		{
-			if (persistable is null)
-				throw new ArgumentNullException(nameof(persistable));
+	/// <summary>
+	/// </summary>
+	[Obsolete("Use overload with serializer param.")]
+	public static SettingsStorage LoadFromString<TSerializer>(this string value)
+		where TSerializer : ISerializer<SettingsStorage>, new()
+		=> new TSerializer().LoadFromString(value);
 
-			return serializer.SaveToString(persistable.Save());
-		}
+	/// <summary>
+	/// Loads the state of the persistable object from a string using the provided serializer.
+	/// </summary>
+	/// <param name="serializer">The serializer to use.</param>
+	/// <param name="persistable">The persistable object to load.</param>
+	/// <param name="value">The string representation of the state.</param>
+	public static void LoadFromString(this ISerializer<SettingsStorage> serializer, IPersistable persistable, string value)
+	{
+		if (persistable is null)
+			throw new ArgumentNullException(nameof(persistable));
 
-		/// <summary>
-		/// Saves the settings to a string using the provided serializer.
-		/// </summary>
-		/// <typeparam name="TValue">The type of the settings.</typeparam>
-		/// <param name="serializer">The serializer to use.</param>
-		/// <param name="settings">The settings to save.</param>
-		/// <returns>A string representing the settings.</returns>
-		public static string SaveToString<TValue>(this ISerializer<TValue> serializer, TValue settings)
-		{
-			if (serializer is null)
-				throw new ArgumentNullException(nameof(serializer));
+		persistable.Load(serializer.LoadFromString(value));
+	}
 
-			if (settings is null)
-				throw new ArgumentNullException(nameof(settings));
+	/// <summary>
+	/// Loads a value of type TValue from a string using the provided serializer.
+	/// </summary>
+	/// <typeparam name="TValue">The type of the value to load.</typeparam>
+	/// <param name="serializer">The serializer to use.</param>
+	/// <param name="value">The string representation of the value.</param>
+	/// <returns>The deserialized value.</returns>
+	public static TValue LoadFromString<TValue>(this ISerializer<TValue> serializer, string value)
+	{
+		if (value is null)
+			throw new ArgumentNullException(nameof(value));
 
-			return Do.Invariant(() => serializer.Serialize(settings).UTF8());
-		}
+		return Do.Invariant(() => serializer.Deserialize(value.UTF8()));
+	}
 
-		/// <summary>
-		/// Determines whether the specified type is a serializable primitive.
-		/// </summary>
-		/// <param name="type">The type to examine.</param>
-		/// <returns><c>true</c> if the type is a primitive or Uri; otherwise, <c>false</c>.</returns>
-		public static bool IsSerializablePrimitive(this Type type)
-			=> type.IsPrimitive() || type == typeof(Uri);
-
-		/// <summary>
-		/// Converts a tuple implementing IRefTuple to a settings storage.
-		/// </summary>
-		/// <param name="tuple">The tuple to convert.</param>
-		/// <returns>A settings storage representing the tuple.</returns>
-		public static SettingsStorage ToStorage(this IRefTuple tuple)
-		{
-			if (tuple is null)
-				throw new ArgumentNullException(nameof(tuple));
+	/// <summary>
+	/// </summary>
+	[Obsolete("Use overload with serializer param.")]
+	public static string SaveToString<TSerializer>(this IPersistable persistable)
+		where TSerializer : ISerializer<SettingsStorage>, new()
+		=> new TSerializer().SaveToString(persistable);
 
-			var storage = new SettingsStorage();
-			var idx = 0;
+	/// <summary>
+	/// </summary>
+	[Obsolete("Use overload with serializer param.")]
+	public static string SaveToString<TSerializer>(this SettingsStorage settings)
+		where TSerializer : ISerializer<SettingsStorage>, new()
+		=> new TSerializer().SaveToString(settings);
 
-			foreach (var value in tuple.Values)
-			{
-				storage.Set(RefTuple.GetName(idx++), value);
-			}
+	/// <summary>
+	/// Saves the state of the persistable object to a string using the provided serializer.
+	/// </summary>
+	/// <param name="serializer">The serializer to use.</param>
+	/// <param name="persistable">The persistable object to save.</param>
+	/// <returns>A string representing the saved state.</returns>
+	public static string SaveToString(this ISerializer<SettingsStorage> serializer, IPersistable persistable)
+	{
+		if (persistable is null)
+			throw new ArgumentNullException(nameof(persistable));
 
-			return storage;
-		}
+		return serializer.SaveToString(persistable.Save());
+	}
 
-		/// <summary>
-		/// Converts the settings storage to a RefPair of the specified types.
-		/// </summary>
-		/// <typeparam name="T1">The type of the first element.</typeparam>
-		/// <typeparam name="T2">The type of the second element.</typeparam>
-		/// <param name="storage">The settings storage to convert.</param>
-		/// <returns>A RefPair containing the converted values.</returns>
-		public static RefPair<T1, T2> ToRefPair<T1, T2>(this SettingsStorage storage)
-		{
-			if (storage is null)
-				throw new ArgumentNullException(nameof(storage));
+	/// <summary>
+	/// Saves the settings to a string using the provided serializer.
+	/// </summary>
+	/// <typeparam name="TValue">The type of the settings.</typeparam>
+	/// <param name="serializer">The serializer to use.</param>
+	/// <param name="settings">The settings to save.</param>
+	/// <returns>A string representing the settings.</returns>
+	public static string SaveToString<TValue>(this ISerializer<TValue> serializer, TValue settings)
+	{
+		if (serializer is null)
+			throw new ArgumentNullException(nameof(serializer));
 
-			var tuple = new RefPair<T1, T2>();
-			tuple.First = storage.GetValue<T1>(nameof(tuple.First));
-			tuple.Second = storage.GetValue<T2>(nameof(tuple.Second));
-			return tuple;
-		}
+		if (settings is null)
+			throw new ArgumentNullException(nameof(settings));
 
-		/// <summary>
-		/// Converts the settings storage to a RefTriple of the specified types.
-		/// </summary>
-		/// <typeparam name="T1">The type of the first element.</typeparam>
-		/// <typeparam name="T2">The type of the second element.</typeparam>
-		/// <typeparam name="T3">The type of the third element.</typeparam>
-		/// <param name="storage">The settings storage to convert.</param>
-		/// <returns>A RefTriple containing the converted values.</returns>
-		public static RefTriple<T1, T2, T3> ToRefTriple<T1, T2, T3>(this SettingsStorage storage)
-		{
-			if (storage is null)
-				throw new ArgumentNullException(nameof(storage));
-
-			var tuple = new RefTriple<T1, T2, T3>();
-			tuple.First = storage.GetValue<T1>(nameof(tuple.First));
-			tuple.Second = storage.GetValue<T2>(nameof(tuple.Second));
-			tuple.Third = storage.GetValue<T3>(nameof(tuple.Third));
-			return tuple;
-		}
+		return Do.Invariant(() => serializer.Serialize(settings).UTF8());
+	}
 
-		/// <summary>
-		/// Converts the settings storage to a RefQuadruple of the specified types.
-		/// </summary>
-		/// <typeparam name="T1">The type of the first element.</typeparam>
-		/// <typeparam name="T2">The type of the second element.</typeparam>
-		/// <typeparam name="T3">The type of the third element.</typeparam>
-		/// <typeparam name="T4">The type of the fourth element.</typeparam>
-		/// <param name="storage">The settings storage to convert.</param>
-		/// <returns>A RefQuadruple containing the converted values.</returns>
-		public static RefQuadruple<T1, T2, T3, T4> ToRefQuadruple<T1, T2, T3, T4>(this SettingsStorage storage)
-		{
-			if (storage is null)
-				throw new ArgumentNullException(nameof(storage));
-
-			var tuple = new RefQuadruple<T1, T2, T3, T4>();
-			tuple.First = storage.GetValue<T1>(nameof(tuple.First));
-			tuple.Second = storage.GetValue<T2>(nameof(tuple.Second));
-			tuple.Third = storage.GetValue<T3>(nameof(tuple.Third));
-			tuple.Fourth = storage.GetValue<T4>(nameof(tuple.Fourth));
-			return tuple;
-		}
+	/// <summary>
+	/// Determines whether the specified type is a serializable primitive.
+	/// </summary>
+	/// <param name="type">The type to examine.</param>
+	/// <returns><c>true</c> if the type is a primitive or Uri; otherwise, <c>false</c>.</returns>
+	public static bool IsSerializablePrimitive(this Type type)
+		=> type.IsPrimitive() || type == typeof(Uri);
+
+	/// <summary>
+	/// Converts a tuple implementing IRefTuple to a settings storage.
+	/// </summary>
+	/// <param name="tuple">The tuple to convert.</param>
+	/// <returns>A settings storage representing the tuple.</returns>
+	public static SettingsStorage ToStorage(this IRefTuple tuple)
+	{
+		if (tuple is null)
+			throw new ArgumentNullException(nameof(tuple));
+
+		var storage = new SettingsStorage();
+		var idx = 0;
 
-		/// <summary>
-		/// Converts the settings storage to a RefFive tuple of the specified types.
-		/// </summary>
-		/// <typeparam name="T1">The type of the first element.</typeparam>
-		/// <typeparam name="T2">The type of the second element.</typeparam>
-		/// <typeparam name="T3">The type of the third element.</typeparam>
-		/// <typeparam name="T4">The type of the fourth element.</typeparam>
-		/// <typeparam name="T5">The type of the fifth element.</typeparam>
-		/// <param name="storage">The settings storage to convert.</param>
-		/// <returns>A RefFive tuple containing the converted values.</returns>
-		public static RefFive<T1, T2, T3, T4, T5> ToRefFive<T1, T2, T3, T4, T5>(this SettingsStorage storage)
+		foreach (var value in tuple.Values)
 		{
-			if (storage is null)
-				throw new ArgumentNullException(nameof(storage));
-
-			var tuple = new RefFive<T1, T2, T3, T4, T5>();
-			tuple.First = storage.GetValue<T1>(nameof(tuple.First));
-			tuple.Second = storage.GetValue<T2>(nameof(tuple.Second));
-			tuple.Third = storage.GetValue<T3>(nameof(tuple.Third));
-			tuple.Fourth = storage.GetValue<T4>(nameof(tuple.Fourth));
-			tuple.Fifth = storage.GetValue<T5>(nameof(tuple.Fifth));
-			return tuple;
+			storage.Set(RefTuple.GetName(idx++), value);
 		}
 
-		/// <summary>
-		/// Converts the settings storage to a MemberInfo.
-		/// </summary>
-		/// <param name="storage">The settings storage to convert.</param>
-		/// <returns>The converted MemberInfo.</returns>
-		public static MemberInfo ToMember(this SettingsStorage storage)
-			=> storage.ToMember<MemberInfo>();
-
-		/// <summary>
-		/// Converts the settings storage to a member of type T.
-		/// </summary>
-		/// <typeparam name="T">The expected type of the member.</typeparam>
-		/// <param name="storage">The settings storage to convert.</param>
-		/// <returns>The converted member of type T.</returns>
-		public static T ToMember<T>(this SettingsStorage storage)
-			where T : MemberInfo
-		{
-			if (storage is null)
-				throw new ArgumentNullException(nameof(storage));
+		return storage;
+	}
 
-			var type = storage.GetValue<Type>(_typeKey);
-			var member = storage.GetValue(_valueKey, storage.GetValue("name", string.Empty));
+	/// <summary>
+	/// Converts the settings storage to a RefPair of the specified types.
+	/// </summary>
+	/// <typeparam name="T1">The type of the first element.</typeparam>
+	/// <typeparam name="T2">The type of the second element.</typeparam>
+	/// <param name="storage">The settings storage to convert.</param>
+	/// <returns>A RefPair containing the converted values.</returns>
+	public static RefPair<T1, T2> ToRefPair<T1, T2>(this SettingsStorage storage)
+	{
+		if (storage is null)
+			throw new ArgumentNullException(nameof(storage));
 
-			return member.IsEmpty() ? type.To<T>() : type.GetMember<T>(member);
-		}
+		var tuple = new RefPair<T1, T2>();
+		tuple.First = storage.GetValue<T1>(nameof(tuple.First));
+		tuple.Second = storage.GetValue<T2>(nameof(tuple.Second));
+		return tuple;
+	}
 
-		/// <summary>
-		/// Converts the specified member to a settings storage.
-		/// </summary>
-		/// <typeparam name="T">The type of the member.</typeparam>
-		/// <param name="member">The member to convert.</param>
-		/// <param name="isAssemblyQualifiedName">A value indicating whether the type name should be assembly qualified.</param>
-		/// <returns>A settings storage representing the member.</returns>
-		public static SettingsStorage ToStorage<T>(this T member, bool isAssemblyQualifiedName = default)
-			where T : MemberInfo
-		{
-			if (member is null)
-				throw new ArgumentNullException(nameof(member));
+	/// <summary>
+	/// Converts the settings storage to a RefTriple of the specified types.
+	/// </summary>
+	/// <typeparam name="T1">The type of the first element.</typeparam>
+	/// <typeparam name="T2">The type of the second element.</typeparam>
+	/// <typeparam name="T3">The type of the third element.</typeparam>
+	/// <param name="storage">The settings storage to convert.</param>
+	/// <returns>A RefTriple containing the converted values.</returns>
+	public static RefTriple<T1, T2, T3> ToRefTriple<T1, T2, T3>(this SettingsStorage storage)
+	{
+		if (storage is null)
+			throw new ArgumentNullException(nameof(storage));
+
+		var tuple = new RefTriple<T1, T2, T3>();
+		tuple.First = storage.GetValue<T1>(nameof(tuple.First));
+		tuple.Second = storage.GetValue<T2>(nameof(tuple.Second));
+		tuple.Third = storage.GetValue<T3>(nameof(tuple.Third));
+		return tuple;
+	}
 
-			var storage = new SettingsStorage();
+	/// <summary>
+	/// Converts the settings storage to a RefQuadruple of the specified types.
+	/// </summary>
+	/// <typeparam name="T1">The type of the first element.</typeparam>
+	/// <typeparam name="T2">The type of the second element.</typeparam>
+	/// <typeparam name="T3">The type of the third element.</typeparam>
+	/// <typeparam name="T4">The type of the fourth element.</typeparam>
+	/// <param name="storage">The settings storage to convert.</param>
+	/// <returns>A RefQuadruple containing the converted values.</returns>
+	public static RefQuadruple<T1, T2, T3, T4> ToRefQuadruple<T1, T2, T3, T4>(this SettingsStorage storage)
+	{
+		if (storage is null)
+			throw new ArgumentNullException(nameof(storage));
+
+		var tuple = new RefQuadruple<T1, T2, T3, T4>();
+		tuple.First = storage.GetValue<T1>(nameof(tuple.First));
+		tuple.Second = storage.GetValue<T2>(nameof(tuple.Second));
+		tuple.Third = storage.GetValue<T3>(nameof(tuple.Third));
+		tuple.Fourth = storage.GetValue<T4>(nameof(tuple.Fourth));
+		return tuple;
+	}
 
-			storage.Set(_typeKey, (member as Type ?? member.ReflectedType).GetTypeAsString(isAssemblyQualifiedName));
+	/// <summary>
+	/// Converts the settings storage to a RefFive tuple of the specified types.
+	/// </summary>
+	/// <typeparam name="T1">The type of the first element.</typeparam>
+	/// <typeparam name="T2">The type of the second element.</typeparam>
+	/// <typeparam name="T3">The type of the third element.</typeparam>
+	/// <typeparam name="T4">The type of the fourth element.</typeparam>
+	/// <typeparam name="T5">The type of the fifth element.</typeparam>
+	/// <param name="storage">The settings storage to convert.</param>
+	/// <returns>A RefFive tuple containing the converted values.</returns>
+	public static RefFive<T1, T2, T3, T4, T5> ToRefFive<T1, T2, T3, T4, T5>(this SettingsStorage storage)
+	{
+		if (storage is null)
+			throw new ArgumentNullException(nameof(storage));
+
+		var tuple = new RefFive<T1, T2, T3, T4, T5>();
+		tuple.First = storage.GetValue<T1>(nameof(tuple.First));
+		tuple.Second = storage.GetValue<T2>(nameof(tuple.Second));
+		tuple.Third = storage.GetValue<T3>(nameof(tuple.Third));
+		tuple.Fourth = storage.GetValue<T4>(nameof(tuple.Fourth));
+		tuple.Fifth = storage.GetValue<T5>(nameof(tuple.Fifth));
+		return tuple;
+	}
 
-			if (member.ReflectedType != null)
-				storage.Set(_valueKey, member.Name);
-			
-			return storage;
-		}
+	/// <summary>
+	/// Converts the settings storage to a MemberInfo.
+	/// </summary>
+	/// <param name="storage">The settings storage to convert.</param>
+	/// <returns>The converted MemberInfo.</returns>
+	public static MemberInfo ToMember(this SettingsStorage storage)
+		=> storage.ToMember<MemberInfo>();
 
-		/// <summary>
-		/// Loads the state of the persistable object from the specified settings storage using the given key.
-		/// </summary>
-		/// <param name="persistable">The persistable object to load.</param>
-		/// <param name="settings">The settings storage.</param>
-		/// <param name="name">The name of the value within the storage.</param>
-		public static void Load(this IPersistable persistable, SettingsStorage settings, string name)
-		{
-			if (persistable is null)
-				throw new ArgumentNullException(nameof(persistable));
+	/// <summary>
+	/// Converts the settings storage to a member of type T.
+	/// </summary>
+	/// <typeparam name="T">The expected type of the member.</typeparam>
+	/// <param name="storage">The settings storage to convert.</param>
+	/// <returns>The converted member of type T.</returns>
+	public static T ToMember<T>(this SettingsStorage storage)
+		where T : MemberInfo
+	{
+		if (storage is null)
+			throw new ArgumentNullException(nameof(storage));
 
-			if (settings is null)
-				throw new ArgumentNullException(nameof(settings));
+		var type = storage.GetValue<Type>(_typeKey);
+		var member = storage.GetValue(_valueKey, storage.GetValue("name", string.Empty));
 
-			persistable.Load(settings.GetValue<SettingsStorage>(name));
-		}
+		return member.IsEmpty() ? type.To<T>() : type.GetMember<T>(member);
+	}
 
-		/// <summary>
-		/// Loads the state of the persistable object from the specified settings storage using the given key if it is not null.
-		/// </summary>
-		/// <param name="persistable">The persistable object to load.</param>
-		/// <param name="settings">The settings storage.</param>
-		/// <param name="name">The name of the value within the storage.</param>
-		/// <returns><c>true</c> if the state was loaded; otherwise, <c>false</c>.</returns>
-		public static bool LoadIfNotNull(this IPersistable persistable, SettingsStorage settings, string name)
-		{
-			if (settings is null)
-				throw new ArgumentNullException(nameof(settings));
+	/// <summary>
+	/// Converts the specified member to a settings storage.
+	/// </summary>
+	/// <typeparam name="T">The type of the member.</typeparam>
+	/// <param name="member">The member to convert.</param>
+	/// <param name="isAssemblyQualifiedName">A value indicating whether the type name should be assembly qualified.</param>
+	/// <returns>A settings storage representing the member.</returns>
+	public static SettingsStorage ToStorage<T>(this T member, bool isAssemblyQualifiedName = default)
+		where T : MemberInfo
+	{
+		if (member is null)
+			throw new ArgumentNullException(nameof(member));
 
-			return persistable.LoadIfNotNull(settings.GetValue<SettingsStorage>(name));
-		}
+		var storage = new SettingsStorage();
 
-		/// <summary>
-		/// Loads the state of the persistable object from the specified settings storage if the storage is not null.
-		/// </summary>
-		/// <param name="persistable">The persistable object to load.</param>
-		/// <param name="storage">The settings storage.</param>
-		/// <returns><c>true</c> if the state was loaded; otherwise, <c>false</c>.</returns>
-		public static bool LoadIfNotNull(this IPersistable persistable, SettingsStorage storage)
-		{
-			if (persistable is null)
-				throw new ArgumentNullException(nameof(persistable));
+		storage.Set(_typeKey, (member as Type ?? member.ReflectedType).GetTypeAsString(isAssemblyQualifiedName));
 
-			if (storage is null)
-				return false;
+		if (member.ReflectedType != null)
+			storage.Set(_valueKey, member.Name);
+		
+		return storage;
+	}
 
-			persistable.Load(storage);
-			return true;
-		}
+	/// <summary>
+	/// Loads the state of the persistable object from the specified settings storage using the given key.
+	/// </summary>
+	/// <param name="persistable">The persistable object to load.</param>
+	/// <param name="settings">The settings storage.</param>
+	/// <param name="name">The name of the value within the storage.</param>
+	public static void Load(this IPersistable persistable, SettingsStorage settings, string name)
+	{
+		if (persistable is null)
+			throw new ArgumentNullException(nameof(persistable));
 
-		/// <summary>
-		/// Converts an object to a settings storage with type and value.
-		/// </summary>
-		/// <param name="value">The object to convert.</param>
-		/// <param name="isAssemblyQualifiedName">A value indicating whether the type name should be assembly qualified.</param>
-		/// <returns>A settings storage representing the object.</returns>
-		public static SettingsStorage ToStorage(this object value, bool isAssemblyQualifiedName = default)
-			=> new SettingsStorage()
-				.Set(_typeKey, value.CheckOnNull().GetType().GetTypeAsString(isAssemblyQualifiedName))
-				.Set(_valueKey, value.To<string>())
-			;
-
-		/// <summary>
-		/// Converts the settings storage back to an object.
-		/// </summary>
-		/// <param name="storage">The settings storage.</param>
-		/// <returns>The object represented by the settings storage.</returns>
-		public static object FromStorage(this SettingsStorage storage)
-		{
-			if (storage is null)
-				throw new ArgumentNullException(nameof(storage));
+		if (settings is null)
+			throw new ArgumentNullException(nameof(settings));
 
-			var value = storage.GetValue<string>(_valueKey).To(storage.GetValue<Type>(_typeKey));
+		persistable.Load(settings.GetValue<SettingsStorage>(name));
+	}
 
-			if (value is DateTime dt)
-				value = dt.ToUniversalTime();
+	/// <summary>
+	/// Loads the state of the persistable object from the specified settings storage using the given key if it is not null.
+	/// </summary>
+	/// <param name="persistable">The persistable object to load.</param>
+	/// <param name="settings">The settings storage.</param>
+	/// <param name="name">The name of the value within the storage.</param>
+	/// <returns><c>true</c> if the state was loaded; otherwise, <c>false</c>.</returns>
+	public static bool LoadIfNotNull(this IPersistable persistable, SettingsStorage settings, string name)
+	{
+		if (settings is null)
+			throw new ArgumentNullException(nameof(settings));
 
-			return value;
-		}
+		return persistable.LoadIfNotNull(settings.GetValue<SettingsStorage>(name));
+	}
 
-		private static readonly SynchronizedDictionary<Type, (Func<object, SettingsStorage> serialize, Func<SettingsStorage, object> deserialize)> _customSerializers = new();
+	/// <summary>
+	/// Loads the state of the persistable object from the specified settings storage if the storage is not null.
+	/// </summary>
+	/// <param name="persistable">The persistable object to load.</param>
+	/// <param name="storage">The settings storage.</param>
+	/// <returns><c>true</c> if the state was loaded; otherwise, <c>false</c>.</returns>
+	public static bool LoadIfNotNull(this IPersistable persistable, SettingsStorage storage)
+	{
+		if (persistable is null)
+			throw new ArgumentNullException(nameof(persistable));
 
-		/// <summary>
-		/// Registers a custom serializer for a specific type.
-		/// </summary>
-		/// <typeparam name="T">The type for which to register the serializer.</typeparam>
-		/// <param name="serialize">A function to serialize the object to a settings storage.</param>
-		/// <param name="deserialize">A function to deserialize from a settings storage to the object.</param>
-		public static void RegisterCustomSerializer<T>(Func<T, SettingsStorage> serialize, Func<SettingsStorage, T> deserialize)
-		{
-			if (serialize is null)		throw new ArgumentNullException(nameof(serialize));
-			if (deserialize is null)	throw new ArgumentNullException(nameof(deserialize));
+		if (storage is null)
+			return false;
 
-			_customSerializers[typeof(T)] = (o => serialize((T)o), s => deserialize(s));
-		}
+		persistable.Load(storage);
+		return true;
+	}
 
-		/// <summary>
-		/// Unregisters the custom serializer for a specific type.
-		/// </summary>
-		/// <typeparam name="T">The type for which to unregister the serializer.</typeparam>
-		public static void UnRegisterCustomSerializer<T>()
-			=> _customSerializers.Remove(typeof(T));
-
-		/// <summary>
-		/// Tries to serialize an object using a registered custom serializer.
-		/// </summary>
-		/// <typeparam name="T">The type of the object to serialize.</typeparam>
-		/// <param name="value">The object to serialize.</param>
-		/// <param name="storage">When this method returns, contains the resulting settings storage if serialization was successful.</param>
-		/// <returns><c>true</c> if serialization was successful; otherwise, <c>false</c>.</returns>
-		public static bool TrySerialize<T>(this T value, out SettingsStorage storage)
-		{
-			storage = default;
+	/// <summary>
+	/// Converts an object to a settings storage with type and value.
+	/// </summary>
+	/// <param name="value">The object to convert.</param>
+	/// <param name="isAssemblyQualifiedName">A value indicating whether the type name should be assembly qualified.</param>
+	/// <returns>A settings storage representing the object.</returns>
+	public static SettingsStorage ToStorage(this object value, bool isAssemblyQualifiedName = default)
+		=> new SettingsStorage()
+			.Set(_typeKey, value.CheckOnNull().GetType().GetTypeAsString(isAssemblyQualifiedName))
+			.Set(_valueKey, value.To<string>())
+		;
 
-			if (!_customSerializers.TryGetValue(typeof(T), out var serializer))
-				return false;
+	/// <summary>
+	/// Converts the settings storage back to an object.
+	/// </summary>
+	/// <param name="storage">The settings storage.</param>
+	/// <returns>The object represented by the settings storage.</returns>
+	public static object FromStorage(this SettingsStorage storage)
+	{
+		if (storage is null)
+			throw new ArgumentNullException(nameof(storage));
 
-			storage = serializer.serialize(value);
-			return true;
-		}
+		var value = storage.GetValue<string>(_valueKey).To(storage.GetValue<Type>(_typeKey));
 
-		/// <summary>
-		/// Tries to deserialize a settings storage into an object of type T using a registered custom serializer.
-		/// </summary>
-		/// <typeparam name="T">The type to deserialize.</typeparam>
-		/// <param name="storage">The settings storage containing serialized data.</param>
-		/// <param name="value">When this method returns, contains the deserialized object if successful.</param>
-		/// <returns><c>true</c> if deserialization was successful; otherwise, <c>false</c>.</returns>
-		public static bool TryDeserialize<T>(this SettingsStorage storage, out T value)
-		{
-			value = default;
+		if (value is DateTime dt)
+			value = dt.ToUniversalTime();
 
-			if (!_customSerializers.TryGetValue(typeof(T), out var serializer))
-				return false;
+		return value;
+	}
 
-			value = (T)serializer.deserialize(storage);
-			return true;
-		}
+	private static readonly SynchronizedDictionary<Type, (Func<object, SettingsStorage> serialize, Func<SettingsStorage, object> deserialize)> _customSerializers = new();
+
+	/// <summary>
+	/// Registers a custom serializer for a specific type.
+	/// </summary>
+	/// <typeparam name="T">The type for which to register the serializer.</typeparam>
+	/// <param name="serialize">A function to serialize the object to a settings storage.</param>
+	/// <param name="deserialize">A function to deserialize from a settings storage to the object.</param>
+	public static void RegisterCustomSerializer<T>(Func<T, SettingsStorage> serialize, Func<SettingsStorage, T> deserialize)
+	{
+		if (serialize is null)		throw new ArgumentNullException(nameof(serialize));
+		if (deserialize is null)	throw new ArgumentNullException(nameof(deserialize));
+
+		_customSerializers[typeof(T)] = (o => serialize((T)o), s => deserialize(s));
+	}
+
+	/// <summary>
+	/// Unregisters the custom serializer for a specific type.
+	/// </summary>
+	/// <typeparam name="T">The type for which to unregister the serializer.</typeparam>
+	public static void UnRegisterCustomSerializer<T>()
+		=> _customSerializers.Remove(typeof(T));
+
+	/// <summary>
+	/// Tries to serialize an object using a registered custom serializer.
+	/// </summary>
+	/// <typeparam name="T">The type of the object to serialize.</typeparam>
+	/// <param name="value">The object to serialize.</param>
+	/// <param name="storage">When this method returns, contains the resulting settings storage if serialization was successful.</param>
+	/// <returns><c>true</c> if serialization was successful; otherwise, <c>false</c>.</returns>
+	public static bool TrySerialize<T>(this T value, out SettingsStorage storage)
+	{
+		storage = default;
+
+		if (!_customSerializers.TryGetValue(typeof(T), out var serializer))
+			return false;
+
+		storage = serializer.serialize(value);
+		return true;
+	}
+
+	/// <summary>
+	/// Tries to deserialize a settings storage into an object of type T using a registered custom serializer.
+	/// </summary>
+	/// <typeparam name="T">The type to deserialize.</typeparam>
+	/// <param name="storage">The settings storage containing serialized data.</param>
+	/// <param name="value">When this method returns, contains the deserialized object if successful.</param>
+	/// <returns><c>true</c> if deserialization was successful; otherwise, <c>false</c>.</returns>
+	public static bool TryDeserialize<T>(this SettingsStorage storage, out T value)
+	{
+		value = default;
+
+		if (!_customSerializers.TryGetValue(typeof(T), out var serializer))
+			return false;
+
+		value = (T)serializer.deserialize(storage);
+		return true;
 	}
 }
\ No newline at end of file
diff --git a/Serialization/SecureStringEncryptor.cs b/Serialization/SecureStringEncryptor.cs
index f6925a13..b1cd127f 100644
--- a/Serialization/SecureStringEncryptor.cs
+++ b/Serialization/SecureStringEncryptor.cs
@@ -1,55 +1,54 @@
-namespace Ecng.Serialization
-{
-	using System;
-	using System.Security;
-	using System.Security.Cryptography;
+namespace Ecng.Serialization;
 
-	using Ecng.Common;
-	using Ecng.Security;
+using System;
+using System.Security;
+using System.Security.Cryptography;
 
-	class SecureStringEncryptor
-	{
-		private static readonly Lazy<SecureStringEncryptor> _instance = new(() => new());
-		public static SecureStringEncryptor Instance => _instance.Value;
+using Ecng.Common;
+using Ecng.Security;
 
-		private readonly SecureString _key = "RClVEDn0O3EUsKqym1qd".Secure();
-		private readonly byte[] _salt = "3hj67-!3".To<byte[]>();
+class SecureStringEncryptor
+{
+	private static readonly Lazy<SecureStringEncryptor> _instance = new(() => new());
+	public static SecureStringEncryptor Instance => _instance.Value;
 
-		public SecureString Key { get; set; }
-		public byte[] Entropy { get; set; }
+	private readonly SecureString _key = "RClVEDn0O3EUsKqym1qd".Secure();
+	private readonly byte[] _salt = "3hj67-!3".To<byte[]>();
 
-		public SecureString Decrypt(byte[] source)
-		{
-			if (source is null)
-				return null;
+	public SecureString Key { get; set; }
+	public byte[] Entropy { get; set; }
 
-			try
-			{
-				if (Scope<ContinueOnExceptionContext>.Current?.Value.DoNotEncrypt != true)
-					source = source.DecryptAes(_key.UnSecure(), _salt, _salt);
+	public SecureString Decrypt(byte[] source)
+	{
+		if (source is null)
+			return null;
 
-				return source.To<string>().Secure();
-			}
-			catch (CryptographicException ex)
-			{
-				if (ContinueOnExceptionContext.TryProcess(ex))
-					return null;
+		try
+		{
+			if (Scope<ContinueOnExceptionContext>.Current?.Value.DoNotEncrypt != true)
+				source = source.DecryptAes(_key.UnSecure(), _salt, _salt);
 
-				throw;
-			}
+			return source.To<string>().Secure();
 		}
-
-		public byte[] Encrypt(SecureString instance)
+		catch (CryptographicException ex)
 		{
-			if (instance is null)
+			if (ContinueOnExceptionContext.TryProcess(ex))
 				return null;
 
-			var plainText = instance.UnSecure().To<byte[]>();
+			throw;
+		}
+	}
 
-			if (Scope<ContinueOnExceptionContext>.Current?.Value.DoNotEncrypt == true)
-				return plainText;
+	public byte[] Encrypt(SecureString instance)
+	{
+		if (instance is null)
+			return null;
 
-			return plainText.EncryptAes(_key.UnSecure(), _salt, _salt);
-		}
+		var plainText = instance.UnSecure().To<byte[]>();
+
+		if (Scope<ContinueOnExceptionContext>.Current?.Value.DoNotEncrypt == true)
+			return plainText;
+
+		return plainText.EncryptAes(_key.UnSecure(), _salt, _salt);
 	}
 }
\ No newline at end of file
diff --git a/Serialization/Serializer.cs b/Serialization/Serializer.cs
index 80799bfe..b0b1a660 100644
--- a/Serialization/Serializer.cs
+++ b/Serialization/Serializer.cs
@@ -1,54 +1,53 @@
-namespace Ecng.Serialization
-{
-	using System.IO;
-	using System.Threading;
-	using System.Threading.Tasks;
+namespace Ecng.Serialization;
+
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
 
+/// <summary>
+/// Provides an abstract base class for type-specific serializers.
+/// </summary>
+/// <typeparam name="T">The type of the graph to serialize and deserialize.</typeparam>
+public abstract class Serializer<T> : ISerializer<T>
+{
 	/// <summary>
-	/// Provides an abstract base class for type-specific serializers.
+	/// Gets the file extension associated with this serializer.
 	/// </summary>
-	/// <typeparam name="T">The type of the graph to serialize and deserialize.</typeparam>
-	public abstract class Serializer<T> : ISerializer<T>
-	{
-		/// <summary>
-		/// Gets the file extension associated with this serializer.
-		/// </summary>
-		public abstract string FileExtension { get; }
+	public abstract string FileExtension { get; }
 
-		/// <summary>
-		/// Serializes the specified object graph to the provided stream asynchronously.
-		/// </summary>
-		/// <param name="graph">The object graph to serialize.</param>
-		/// <param name="stream">The stream to which the graph is serialized.</param>
-		/// <param name="cancellationToken">A token that can be used to cancel the serialization operation.</param>
-		/// <returns>A task representing the asynchronous serialize operation.</returns>
-		public abstract ValueTask SerializeAsync(T graph, Stream stream, CancellationToken cancellationToken);
+	/// <summary>
+	/// Serializes the specified object graph to the provided stream asynchronously.
+	/// </summary>
+	/// <param name="graph">The object graph to serialize.</param>
+	/// <param name="stream">The stream to which the graph is serialized.</param>
+	/// <param name="cancellationToken">A token that can be used to cancel the serialization operation.</param>
+	/// <returns>A task representing the asynchronous serialize operation.</returns>
+	public abstract ValueTask SerializeAsync(T graph, Stream stream, CancellationToken cancellationToken);
 
-		/// <summary>
-		/// Deserializes an object graph from the provided stream asynchronously.
-		/// </summary>
-		/// <param name="stream">The stream from which the object graph is deserialized.</param>
-		/// <param name="cancellationToken">A token that can be used to cancel the deserialization operation.</param>
-		/// <returns>A task that represents the asynchronous deserialize operation. The task result contains the deserialized object graph.</returns>
-		public abstract ValueTask<T> DeserializeAsync(Stream stream, CancellationToken cancellationToken);
+	/// <summary>
+	/// Deserializes an object graph from the provided stream asynchronously.
+	/// </summary>
+	/// <param name="stream">The stream from which the object graph is deserialized.</param>
+	/// <param name="cancellationToken">A token that can be used to cancel the deserialization operation.</param>
+	/// <returns>A task that represents the asynchronous deserialize operation. The task result contains the deserialized object graph.</returns>
+	public abstract ValueTask<T> DeserializeAsync(Stream stream, CancellationToken cancellationToken);
 
-		/// <summary>
-		/// Non-generic implementation of the serialize method.
-		/// </summary>
-		/// <param name="graph">The object graph to serialize.</param>
-		/// <param name="stream">The stream to which the graph is serialized.</param>
-		/// <param name="cancellationToken">A token that can be used to cancel the serialization operation.</param>
-		/// <returns>A task representing the asynchronous serialize operation.</returns>
-		ValueTask ISerializer.SerializeAsync(object graph, Stream stream, CancellationToken cancellationToken)
-			=> SerializeAsync((T)graph, stream, cancellationToken);
+	/// <summary>
+	/// Non-generic implementation of the serialize method.
+	/// </summary>
+	/// <param name="graph">The object graph to serialize.</param>
+	/// <param name="stream">The stream to which the graph is serialized.</param>
+	/// <param name="cancellationToken">A token that can be used to cancel the serialization operation.</param>
+	/// <returns>A task representing the asynchronous serialize operation.</returns>
+	ValueTask ISerializer.SerializeAsync(object graph, Stream stream, CancellationToken cancellationToken)
+		=> SerializeAsync((T)graph, stream, cancellationToken);
 
-		/// <summary>
-		/// Non-generic implementation of the deserialize method.
-		/// </summary>
-		/// <param name="stream">The stream from which the object graph is deserialized.</param>
-		/// <param name="cancellationToken">A token that can be used to cancel the deserialization operation.</param>
-		/// <returns>A task that represents the asynchronous deserialize operation. The task result contains the deserialized object graph.</returns>
-		async ValueTask<object> ISerializer.DeserializeAsync(Stream stream, CancellationToken cancellationToken)
-			=> await DeserializeAsync(stream, cancellationToken);
-	}
+	/// <summary>
+	/// Non-generic implementation of the deserialize method.
+	/// </summary>
+	/// <param name="stream">The stream from which the object graph is deserialized.</param>
+	/// <param name="cancellationToken">A token that can be used to cancel the deserialization operation.</param>
+	/// <returns>A task that represents the asynchronous deserialize operation. The task result contains the deserialized object graph.</returns>
+	async ValueTask<object> ISerializer.DeserializeAsync(Stream stream, CancellationToken cancellationToken)
+		=> await DeserializeAsync(stream, cancellationToken);
 }
\ No newline at end of file
diff --git a/Serialization/SettingsStorage.cs b/Serialization/SettingsStorage.cs
index 1eb6651c..ba161cd7 100644
--- a/Serialization/SettingsStorage.cs
+++ b/Serialization/SettingsStorage.cs
@@ -1,262 +1,261 @@
-namespace Ecng.Serialization
+namespace Ecng.Serialization;
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Ecng.Collections;
+using Ecng.Common;
+using Ecng.Reflection;
+
+using Newtonsoft.Json;
+
+using Nito.AsyncEx;
+
+/// <summary>
+/// Provides a synchronized storage for application settings with support for XML serialization.
+/// </summary>
+public class SettingsStorage : SynchronizedDictionary<string, object>
 {
-	using System;
-	using System.Collections;
-	using System.Collections.Generic;
-	using System.Linq;
-	using System.Security;
-	using System.Threading;
-	using System.Threading.Tasks;
+	private readonly JsonReader _reader;
+	private readonly Func<JsonReader, SettingsStorage, string, Type, CancellationToken, ValueTask<object>> _readJson;
 
-	using Ecng.Collections;
-	using Ecng.Common;
-	using Ecng.Reflection;
+	/// <summary>
+	/// Initializes a new instance of the <see cref="SettingsStorage"/> class.
+	/// </summary>
+	public SettingsStorage()
+		: base(StringComparer.InvariantCultureIgnoreCase)
+	{
+	}
 
-	using Newtonsoft.Json;
+	/// <summary>
+	/// Initializes a new instance of the <see cref="SettingsStorage"/> class using the specified JSON reader and delegate for reading JSON.
+	/// </summary>
+	/// <param name="reader">The JSON reader used for deserialization.</param>
+	/// <param name="readJson">The delegate to read JSON values.</param>
+	internal SettingsStorage(JsonReader reader, Func<JsonReader, SettingsStorage, string, Type, CancellationToken, ValueTask<object>> readJson)
+		: this()
+	{
+		_reader = reader ?? throw new ArgumentNullException(nameof(reader));
+		_readJson = readJson ?? throw new ArgumentNullException(nameof(readJson));
+	}
 
-	using Nito.AsyncEx;
+	/// <summary>
+	/// Gets the names of all stored settings.
+	/// </summary>
+	public IEnumerable<string> Names => this.SyncGet(d => d.Keys.ToArray());
 
 	/// <summary>
-	/// Provides a synchronized storage for application settings with support for XML serialization.
+	/// Sets the value for a specified setting name.
 	/// </summary>
-	public class SettingsStorage : SynchronizedDictionary<string, object>
+	/// <typeparam name="T">The type of the value to set.</typeparam>
+	/// <param name="name">The name of the setting.</param>
+	/// <param name="value">The value to set.</param>
+	/// <returns>The current instance of <see cref="SettingsStorage"/>.</returns>
+	public SettingsStorage Set<T>(string name, T value)
 	{
-		private readonly JsonReader _reader;
-		private readonly Func<JsonReader, SettingsStorage, string, Type, CancellationToken, ValueTask<object>> _readJson;
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="SettingsStorage"/> class.
-		/// </summary>
-		public SettingsStorage()
-			: base(StringComparer.InvariantCultureIgnoreCase)
-		{
-		}
+		SetValue(name, value);
+		return this;
+	}
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="SettingsStorage"/> class using the specified JSON reader and delegate for reading JSON.
-		/// </summary>
-		/// <param name="reader">The JSON reader used for deserialization.</param>
-		/// <param name="readJson">The delegate to read JSON values.</param>
-		internal SettingsStorage(JsonReader reader, Func<JsonReader, SettingsStorage, string, Type, CancellationToken, ValueTask<object>> readJson)
-			: this()
-		{
-			_reader = reader ?? throw new ArgumentNullException(nameof(reader));
-			_readJson = readJson ?? throw new ArgumentNullException(nameof(readJson));
-		}
+	/// <summary>
+	/// Ensures that the current instance is not used as a reader.
+	/// </summary>
+	private void EnsureIsNotReader()
+	{
+		if (_reader != null)
+			throw new InvalidOperationException("_reader != null");
+	}
 
-		/// <summary>
-		/// Gets the names of all stored settings.
-		/// </summary>
-		public IEnumerable<string> Names => this.SyncGet(d => d.Keys.ToArray());
-
-		/// <summary>
-		/// Sets the value for a specified setting name.
-		/// </summary>
-		/// <typeparam name="T">The type of the value to set.</typeparam>
-		/// <param name="name">The name of the setting.</param>
-		/// <param name="value">The value to set.</param>
-		/// <returns>The current instance of <see cref="SettingsStorage"/>.</returns>
-		public SettingsStorage Set<T>(string name, T value)
-		{
-			SetValue(name, value);
-			return this;
-		}
+	/// <summary>
+	/// Sets the value for a specified setting name.
+	/// </summary>
+	/// <typeparam name="T">The type of the value being set.</typeparam>
+	/// <param name="name">The name of the setting.</param>
+	/// <param name="value">The value to set.</param>
+	public void SetValue<T>(string name, T value)
+	{
+		EnsureIsNotReader();
 
-		/// <summary>
-		/// Ensures that the current instance is not used as a reader.
-		/// </summary>
-		private void EnsureIsNotReader()
-		{
-			if (_reader != null)
-				throw new InvalidOperationException("_reader != null");
-		}
+		this[name.ThrowIfEmpty(nameof(name))] = value;
+	}
 
-		/// <summary>
-		/// Sets the value for a specified setting name.
-		/// </summary>
-		/// <typeparam name="T">The type of the value being set.</typeparam>
-		/// <param name="name">The name of the setting.</param>
-		/// <param name="value">The value to set.</param>
-		public void SetValue<T>(string name, T value)
-		{
-			EnsureIsNotReader();
+	/// <summary>
+	/// Determines whether the storage contains a setting with the specified name.
+	/// </summary>
+	/// <param name="name">The name of the setting.</param>
+	/// <returns><c>true</c> if the setting exists; otherwise, <c>false</c>.</returns>
+	public bool Contains(string name)
+	{
+		return ContainsKey(name.ThrowIfEmpty(nameof(name)));
+	}
 
-			this[name.ThrowIfEmpty(nameof(name))] = value;
-		}
+	/// <summary>
+	/// Determines whether the storage contains a setting with the given key.
+	/// </summary>
+	/// <param name="key">The key of the setting.</param>
+	/// <returns><c>true</c> if the key exists; otherwise, <c>false</c>.</returns>
+	public override bool ContainsKey(string key)
+	{
+		EnsureIsNotReader();
 
-		/// <summary>
-		/// Determines whether the storage contains a setting with the specified name.
-		/// </summary>
-		/// <param name="name">The name of the setting.</param>
-		/// <returns><c>true</c> if the setting exists; otherwise, <c>false</c>.</returns>
-		public bool Contains(string name)
+		return base.ContainsKey(key);
+	}
+
+	/// <summary>
+	/// Gets or sets the deep level of deserialization.
+	/// </summary>
+	internal int DeepLevel { get; set; }
+
+	/// <summary>
+	/// Gets the value of a setting with the specified name and converts it to the specified type.
+	/// </summary>
+	/// <typeparam name="T">The type of value expected.</typeparam>
+	/// <param name="name">The name of the setting.</param>
+	/// <param name="defaultValue">The default value if the setting is not found or is null.</param>
+	/// <returns>The setting value converted to type <typeparamref name="T"/>.</returns>
+	public T GetValue<T>(string name, T defaultValue = default)
+		=> (T)GetValue(typeof(T), name, defaultValue);
+
+	/// <summary>
+	/// Gets the value of a setting with the specified name and converts it to the given type.
+	/// </summary>
+	/// <param name="type">The type of value expected.</param>
+	/// <param name="name">The name of the setting.</param>
+	/// <param name="defaultValue">The default value if the setting is not found or null.</param>
+	/// <returns>The setting value converted to the specified type.</returns>
+	public object GetValue(Type type, string name, object defaultValue = default)
+	{
+		if (type is null)
+			throw new ArgumentNullException(nameof(type));
+
+		if (name.IsEmpty())
+			throw new ArgumentNullException(nameof(name));
+
+		if (_reader != null)
 		{
-			return ContainsKey(name.ThrowIfEmpty(nameof(name)));
+			var res = AsyncHelper.Run(() => GetValueFromReaderAsync(type, name, default));
+
+			if (res is null)
+				return defaultValue;
+
+			return res;
 		}
 
-		/// <summary>
-		/// Determines whether the storage contains a setting with the given key.
-		/// </summary>
-		/// <param name="key">The key of the setting.</param>
-		/// <returns><c>true</c> if the key exists; otherwise, <c>false</c>.</returns>
-		public override bool ContainsKey(string key)
+		if (!TryGetValue(name, out var value))
+			return defaultValue;
+
+		if (value is SettingsStorage storage)
 		{
-			EnsureIsNotReader();
+			if (typeof(SettingsStorage).Is(type))
+				return storage;
 
-			return base.ContainsKey(key);
-		}
+			var obj = Activator.CreateInstance(type);
 
-		/// <summary>
-		/// Gets or sets the deep level of deserialization.
-		/// </summary>
-		internal int DeepLevel { get; set; }
-
-		/// <summary>
-		/// Gets the value of a setting with the specified name and converts it to the specified type.
-		/// </summary>
-		/// <typeparam name="T">The type of value expected.</typeparam>
-		/// <param name="name">The name of the setting.</param>
-		/// <param name="defaultValue">The default value if the setting is not found or is null.</param>
-		/// <returns>The setting value converted to type <typeparamref name="T"/>.</returns>
-		public T GetValue<T>(string name, T defaultValue = default)
-			=> (T)GetValue(typeof(T), name, defaultValue);
-
-		/// <summary>
-		/// Gets the value of a setting with the specified name and converts it to the given type.
-		/// </summary>
-		/// <param name="type">The type of value expected.</param>
-		/// <param name="name">The name of the setting.</param>
-		/// <param name="defaultValue">The default value if the setting is not found or null.</param>
-		/// <returns>The setting value converted to the specified type.</returns>
-		public object GetValue(Type type, string name, object defaultValue = default)
+			if (obj is IAsyncPersistable asyncPer)
+				AsyncContext.Run(() => asyncPer.LoadAsync(storage, default));
+			else if (obj is IPersistable per)
+				per.Load(storage);
+			else
+				throw new ArgumentOutOfRangeException(type.To<string>());
+
+			return obj;
+		}
+		else if (type.IsCollection() && type.GetItemType().IsPersistable())
 		{
-			if (type is null)
-				throw new ArgumentNullException(nameof(type));
+			if (value is null)
+				return default;
 
-			if (name.IsEmpty())
-				throw new ArgumentNullException(nameof(name));
+			var elemType = type.GetItemType();
 
-			if (_reader != null)
-			{
-				var res = AsyncHelper.Run(() => GetValueFromReaderAsync(type, name, default));
+			var arr = ((IEnumerable)value)
+				.Cast<SettingsStorage>()
+				.Select(storage =>
+				{
+					if (storage is null)
+						return null;
 
-				if (res is null)
-					return defaultValue;
+					var per = Activator.CreateInstance(elemType);
 
-				return res;
-			}
+					if (per is IAsyncPersistable asyncPer)
+						AsyncContext.Run(() => asyncPer.LoadAsync(storage, default));
+					else
+						((IPersistable)per).Load(storage);
 
-			if (!TryGetValue(name, out var value))
-				return defaultValue;
+					return per;
+				})
+				.ToArray();
 
-			if (value is SettingsStorage storage)
-			{
-				if (typeof(SettingsStorage).Is(type))
-					return storage;
-
-				var obj = Activator.CreateInstance(type);
-
-				if (obj is IAsyncPersistable asyncPer)
-					AsyncContext.Run(() => asyncPer.LoadAsync(storage, default));
-				else if (obj is IPersistable per)
-					per.Load(storage);
-				else
-					throw new ArgumentOutOfRangeException(type.To<string>());
-
-				return obj;
-			}
-			else if (type.IsCollection() && type.GetItemType().IsPersistable())
-			{
-				if (value is null)
-					return default;
-
-				var elemType = type.GetItemType();
-
-				var arr = ((IEnumerable)value)
-					.Cast<SettingsStorage>()
-					.Select(storage =>
-					{
-						if (storage is null)
-							return null;
-
-						var per = Activator.CreateInstance(elemType);
-
-						if (per is IAsyncPersistable asyncPer)
-							AsyncContext.Run(() => asyncPer.LoadAsync(storage, default));
-						else
-							((IPersistable)per).Load(storage);
-
-						return per;
-					})
-					.ToArray();
-
-				var typedArr = elemType.CreateArray(arr.Length);
-				arr.CopyTo(typedArr, 0);
-				return typedArr.To(type);
-			}
-			else if (type == typeof(SecureString) && value is string str)
-			{
-				value = SecureStringEncryptor.Instance.Decrypt(str.Base64());
-			}
-
-			return value.To(type);
+			var typedArr = elemType.CreateArray(arr.Length);
+			arr.CopyTo(typedArr, 0);
+			return typedArr.To(type);
 		}
-
-		/// <summary>
-		/// Gets the value of a setting with the specified name and converts it to the specified type. Returns a default value if not found.
-		/// </summary>
-		/// <typeparam name="T">The type of the value expected.</typeparam>
-		/// <param name="name">The name of the setting.</param>
-		/// <param name="defaultValue">The default value if the setting is not found.</param>
-		/// <returns>The setting value converted to type <typeparamref name="T"/>.</returns>
-		public T TryGet<T>(string name, T defaultValue = default)
-			=> (T)TryGet(typeof(T), name, defaultValue);
-
-		/// <summary>
-		/// Gets the value of a setting with the specified name and converts it to the given type. Returns a default value if not found.
-		/// </summary>
-		/// <param name="type">The expected type of the setting.</param>
-		/// <param name="name">The name of the setting.</param>
-		/// <param name="defaultValue">The default value if the setting is not found.</param>
-		/// <returns>The setting value converted to the specified type.</returns>
-		public object TryGet(Type type, string name, object defaultValue = default)
-			=> GetValue(type, name, defaultValue);
-
-		/// <summary>
-		/// Asynchronously gets the value of a setting with the specified name and converts it to the specified type.
-		/// </summary>
-		/// <typeparam name="T">The expected type of the value.</typeparam>
-		/// <param name="name">The name of the setting.</param>
-		/// <param name="defaultValue">The default value if the setting is not found.</param>
-		/// <param name="cancellationToken">The cancellation token.</param>
-		/// <returns>A <see cref="ValueTask{T}"/> representing the asynchronous operation producing the value converted to type <typeparamref name="T"/>.</returns>
-		public async ValueTask<T> GetValueAsync<T>(string name, T defaultValue = default, CancellationToken cancellationToken = default)
-			=> (T)await GetValueAsync(typeof(T), name, defaultValue, cancellationToken);
-
-		/// <summary>
-		/// Asynchronously gets the value of a setting with the specified name and converts it to the given type.
-		/// </summary>
-		/// <param name="type">The expected type of the value.</param>
-		/// <param name="name">The name of the setting.</param>
-		/// <param name="defaultValue">The default value if the setting is not found.</param>
-		/// <param name="cancellationToken">The cancellation token.</param>
-		/// <returns>A <see cref="ValueTask"/> representing the asynchronous operation producing the setting value converted to the specified type.</returns>
-		public async ValueTask<object> GetValueAsync(Type type, string name, object defaultValue = default, CancellationToken cancellationToken = default)
+		else if (type == typeof(SecureString) && value is string str)
 		{
-			if (_reader is null)
-				return GetValue(type, name, defaultValue);
-			else
-				return await GetValueFromReaderAsync(type, name, cancellationToken) ?? defaultValue;
+			value = SecureStringEncryptor.Instance.Decrypt(str.Base64());
 		}
 
-		/// <summary>
-		/// Asynchronously gets the value from the JSON reader using the provided delegate.
-		/// </summary>
-		/// <param name="type">The expected type of the value.</param>
-		/// <param name="name">The name of the setting.</param>
-		/// <param name="cancellationToken">The cancellation token.</param>
-		/// <returns>A <see cref="ValueTask"/> representing the asynchronous operation producing the value converted to the specified type.</returns>
-		private async ValueTask<object> GetValueFromReaderAsync(Type type, string name, CancellationToken cancellationToken)
-			=> await _readJson(_reader, this, name, type, cancellationToken);
+		return value.To(type);
+	}
+
+	/// <summary>
+	/// Gets the value of a setting with the specified name and converts it to the specified type. Returns a default value if not found.
+	/// </summary>
+	/// <typeparam name="T">The type of the value expected.</typeparam>
+	/// <param name="name">The name of the setting.</param>
+	/// <param name="defaultValue">The default value if the setting is not found.</param>
+	/// <returns>The setting value converted to type <typeparamref name="T"/>.</returns>
+	public T TryGet<T>(string name, T defaultValue = default)
+		=> (T)TryGet(typeof(T), name, defaultValue);
+
+	/// <summary>
+	/// Gets the value of a setting with the specified name and converts it to the given type. Returns a default value if not found.
+	/// </summary>
+	/// <param name="type">The expected type of the setting.</param>
+	/// <param name="name">The name of the setting.</param>
+	/// <param name="defaultValue">The default value if the setting is not found.</param>
+	/// <returns>The setting value converted to the specified type.</returns>
+	public object TryGet(Type type, string name, object defaultValue = default)
+		=> GetValue(type, name, defaultValue);
+
+	/// <summary>
+	/// Asynchronously gets the value of a setting with the specified name and converts it to the specified type.
+	/// </summary>
+	/// <typeparam name="T">The expected type of the value.</typeparam>
+	/// <param name="name">The name of the setting.</param>
+	/// <param name="defaultValue">The default value if the setting is not found.</param>
+	/// <param name="cancellationToken">The cancellation token.</param>
+	/// <returns>A <see cref="ValueTask{T}"/> representing the asynchronous operation producing the value converted to type <typeparamref name="T"/>.</returns>
+	public async ValueTask<T> GetValueAsync<T>(string name, T defaultValue = default, CancellationToken cancellationToken = default)
+		=> (T)await GetValueAsync(typeof(T), name, defaultValue, cancellationToken);
+
+	/// <summary>
+	/// Asynchronously gets the value of a setting with the specified name and converts it to the given type.
+	/// </summary>
+	/// <param name="type">The expected type of the value.</param>
+	/// <param name="name">The name of the setting.</param>
+	/// <param name="defaultValue">The default value if the setting is not found.</param>
+	/// <param name="cancellationToken">The cancellation token.</param>
+	/// <returns>A <see cref="ValueTask"/> representing the asynchronous operation producing the setting value converted to the specified type.</returns>
+	public async ValueTask<object> GetValueAsync(Type type, string name, object defaultValue = default, CancellationToken cancellationToken = default)
+	{
+		if (_reader is null)
+			return GetValue(type, name, defaultValue);
+		else
+			return await GetValueFromReaderAsync(type, name, cancellationToken) ?? defaultValue;
 	}
+
+	/// <summary>
+	/// Asynchronously gets the value from the JSON reader using the provided delegate.
+	/// </summary>
+	/// <param name="type">The expected type of the value.</param>
+	/// <param name="name">The name of the setting.</param>
+	/// <param name="cancellationToken">The cancellation token.</param>
+	/// <returns>A <see cref="ValueTask"/> representing the asynchronous operation producing the value converted to the specified type.</returns>
+	private async ValueTask<object> GetValueFromReaderAsync(Type type, string name, CancellationToken cancellationToken)
+		=> await _readJson(_reader, this, name, type, cancellationToken);
 }
\ No newline at end of file
diff --git a/Serialization/TransactionFileStream.cs b/Serialization/TransactionFileStream.cs
index 93a309a4..f12a0ba9 100644
--- a/Serialization/TransactionFileStream.cs
+++ b/Serialization/TransactionFileStream.cs
@@ -1,178 +1,177 @@
-namespace Ecng.Serialization
+namespace Ecng.Serialization;
+
+using System;
+using System.Diagnostics;
+using System.IO;
+
+using Ecng.Common;
+
+/// <summary>
+/// Represents a transactional file stream that writes data to a temporary file and, upon disposal, commits the changes to the target file.
+/// </summary>
+public class TransactionFileStream : Stream
 {
-	using System;
-	using System.Diagnostics;
-	using System.IO;
+	private readonly string _name;
+	private readonly string _nameTemp;
 
-	using Ecng.Common;
+	private FileStream _temp;
 
 	/// <summary>
-	/// Represents a transactional file stream that writes data to a temporary file and, upon disposal, commits the changes to the target file.
+	/// Initializes a new instance of the <see cref="TransactionFileStream"/> class.
 	/// </summary>
-	public class TransactionFileStream : Stream
+	/// <param name="name">The name of the target file.</param>
+	/// <param name="mode">The file mode that specifies the type of operations to be performed on the file.</param>
+	public TransactionFileStream(string name, FileMode mode)
 	{
-		private readonly string _name;
-		private readonly string _nameTemp;
+		_name = name.ThrowIfEmpty(nameof(name));
+		_nameTemp = _name + ".tmp";
 
-		private FileStream _temp;
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="TransactionFileStream"/> class.
-		/// </summary>
-		/// <param name="name">The name of the target file.</param>
-		/// <param name="mode">The file mode that specifies the type of operations to be performed on the file.</param>
-		public TransactionFileStream(string name, FileMode mode)
+		switch (mode)
 		{
-			_name = name.ThrowIfEmpty(nameof(name));
-			_nameTemp = _name + ".tmp";
+			case FileMode.CreateNew:
+			{
+				if (File.Exists(_name))
+					throw new IOException();
 
-			switch (mode)
+				break;
+			}
+			case FileMode.Create:
+				break;
+			case FileMode.Open:
+			{
+				File.Copy(_name, _nameTemp, true);
+				break;
+			}
+			case FileMode.OpenOrCreate:
 			{
-				case FileMode.CreateNew:
-				{
-					if (File.Exists(_name))
-						throw new IOException();
-
-					break;
-				}
-				case FileMode.Create:
-					break;
-				case FileMode.Open:
-				{
+				if (File.Exists(_name))
 					File.Copy(_name, _nameTemp, true);
-					break;
-				}
-				case FileMode.OpenOrCreate:
-				{
-					if (File.Exists(_name))
-						File.Copy(_name, _nameTemp, true);
-
-					break;
-				}
-				case FileMode.Truncate:
-					break;
-				case FileMode.Append:
-				{
-					if (File.Exists(_name))
-						File.Copy(_name, _nameTemp, true);
-
-					break;
-				}
-				default:
-					throw new ArgumentOutOfRangeException(nameof(mode), mode, null);
+
+				break;
 			}
+			case FileMode.Truncate:
+				break;
+			case FileMode.Append:
+			{
+				if (File.Exists(_name))
+					File.Copy(_name, _nameTemp, true);
 
-			_temp = new FileStream(_nameTemp, mode, FileAccess.Write);
+				break;
+			}
+			default:
+				throw new ArgumentOutOfRangeException(nameof(mode), mode, null);
 		}
 
-		/// <summary>
-		/// Releases the unmanaged resources used by the <see cref="TransactionFileStream"/> and optionally releases the managed resources.
-		/// Copies the temporary file to the target file and then deletes the temporary file.
-		/// </summary>
-		/// <param name="disposing">true to release both managed and unmanaged resources; false to release only unmanaged resources.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (_temp is null)
-				return;
+		_temp = new FileStream(_nameTemp, mode, FileAccess.Write);
+	}
 
-			_temp.Dispose();
-			_temp = null;
+	/// <summary>
+	/// Releases the unmanaged resources used by the <see cref="TransactionFileStream"/> and optionally releases the managed resources.
+	/// Copies the temporary file to the target file and then deletes the temporary file.
+	/// </summary>
+	/// <param name="disposing">true to release both managed and unmanaged resources; false to release only unmanaged resources.</param>
+	protected override void Dispose(bool disposing)
+	{
+		if (_temp is null)
+			return;
 
-			base.Dispose(disposing);
+		_temp.Dispose();
+		_temp = null;
 
-			File.Copy(_nameTemp, _name, true);
+		base.Dispose(disposing);
 
-			// SSD can copy file async
-			try
-			{
-				File.Delete(_nameTemp);
-			}
-			catch (Exception ex)
-			{
-				Trace.WriteLine(ex);
-			}
-		}
+		File.Copy(_nameTemp, _name, true);
 
-		/// <summary>
-		/// Clears all buffers for the current stream and causes any buffered data to be written to the underlying file.
-		/// </summary>
-		public override void Flush()
+		// SSD can copy file async
+		try
 		{
-			_temp.Flush();
+			File.Delete(_nameTemp);
 		}
-
-		/// <summary>
-		/// Sets the position within the temporary file stream.
-		/// </summary>
-		/// <param name="offset">A byte offset relative to the origin parameter.</param>
-		/// <param name="origin">A value of type <see cref="SeekOrigin"/> indicating the reference point used to obtain the new position.</param>
-		/// <returns>The new position within the temporary file stream.</returns>
-		public override long Seek(long offset, SeekOrigin origin)
+		catch (Exception ex)
 		{
-			return _temp.Seek(offset, origin);
+			Trace.WriteLine(ex);
 		}
+	}
 
-		/// <summary>
-		/// Sets the length of the underlying temporary file stream.
-		/// </summary>
-		/// <param name="value">The desired length of the current stream in bytes.</param>
-		public override void SetLength(long value)
-		{
-			_temp.SetLength(value);
-		}
+	/// <summary>
+	/// Clears all buffers for the current stream and causes any buffered data to be written to the underlying file.
+	/// </summary>
+	public override void Flush()
+	{
+		_temp.Flush();
+	}
 
-		/// <summary>
-		/// Reading is not supported by the <see cref="TransactionFileStream"/>.
-		/// </summary>
-		/// <param name="buffer">The buffer to read data into.</param>
-		/// <param name="offset">The byte offset in buffer at which to begin storing the data read from the underlying stream.</param>
-		/// <param name="count">The maximum number of bytes to be read from the underlying stream.</param>
-		/// <returns>This method always throws a <see cref="NotSupportedException"/>.</returns>
-		/// <exception cref="NotSupportedException">Always thrown.</exception>
-		public override int Read(byte[] buffer, int offset, int count)
-		{
-			throw new NotSupportedException();
-		}
+	/// <summary>
+	/// Sets the position within the temporary file stream.
+	/// </summary>
+	/// <param name="offset">A byte offset relative to the origin parameter.</param>
+	/// <param name="origin">A value of type <see cref="SeekOrigin"/> indicating the reference point used to obtain the new position.</param>
+	/// <returns>The new position within the temporary file stream.</returns>
+	public override long Seek(long offset, SeekOrigin origin)
+	{
+		return _temp.Seek(offset, origin);
+	}
 
-		/// <summary>
-		/// Writes a sequence of bytes to the temporary file stream.
-		/// </summary>
-		/// <param name="buffer">An array of bytes. This is the buffer that contains the data to write to the temporary file.</param>
-		/// <param name="offset">The zero-based byte offset in buffer at which to begin copying bytes to the temporary file.</param>
-		/// <param name="count">The number of bytes to be written to the temporary file.</param>
-		public override void Write(byte[] buffer, int offset, int count)
-		{
-			_temp.Write(buffer, offset, count);
-		}
+	/// <summary>
+	/// Sets the length of the underlying temporary file stream.
+	/// </summary>
+	/// <param name="value">The desired length of the current stream in bytes.</param>
+	public override void SetLength(long value)
+	{
+		_temp.SetLength(value);
+	}
 
-		/// <summary>
-		/// Gets a value indicating whether the temporary file stream supports reading.
-		/// Always returns false.
-		/// </summary>
-		public override bool CanRead => false;
-
-		/// <summary>
-		/// Gets a value indicating whether the underlying temporary file stream supports seeking.
-		/// </summary>
-		public override bool CanSeek => _temp.CanSeek;
-
-		/// <summary>
-		/// Gets a value indicating whether the underlying temporary file stream supports writing.
-		/// </summary>
-		public override bool CanWrite => _temp.CanWrite;
-
-		/// <summary>
-		/// Gets the length in bytes of the underlying temporary file stream.
-		/// </summary>
-		public override long Length => _temp.Length;
-
-		/// <summary>
-		/// Gets or sets the current position within the underlying temporary file stream.
-		/// </summary>
-		public override long Position
-		{
-			get => _temp.Position;
-			set => _temp.Position = value;
-		}
+	/// <summary>
+	/// Reading is not supported by the <see cref="TransactionFileStream"/>.
+	/// </summary>
+	/// <param name="buffer">The buffer to read data into.</param>
+	/// <param name="offset">The byte offset in buffer at which to begin storing the data read from the underlying stream.</param>
+	/// <param name="count">The maximum number of bytes to be read from the underlying stream.</param>
+	/// <returns>This method always throws a <see cref="NotSupportedException"/>.</returns>
+	/// <exception cref="NotSupportedException">Always thrown.</exception>
+	public override int Read(byte[] buffer, int offset, int count)
+	{
+		throw new NotSupportedException();
+	}
+
+	/// <summary>
+	/// Writes a sequence of bytes to the temporary file stream.
+	/// </summary>
+	/// <param name="buffer">An array of bytes. This is the buffer that contains the data to write to the temporary file.</param>
+	/// <param name="offset">The zero-based byte offset in buffer at which to begin copying bytes to the temporary file.</param>
+	/// <param name="count">The number of bytes to be written to the temporary file.</param>
+	public override void Write(byte[] buffer, int offset, int count)
+	{
+		_temp.Write(buffer, offset, count);
+	}
+
+	/// <summary>
+	/// Gets a value indicating whether the temporary file stream supports reading.
+	/// Always returns false.
+	/// </summary>
+	public override bool CanRead => false;
+
+	/// <summary>
+	/// Gets a value indicating whether the underlying temporary file stream supports seeking.
+	/// </summary>
+	public override bool CanSeek => _temp.CanSeek;
+
+	/// <summary>
+	/// Gets a value indicating whether the underlying temporary file stream supports writing.
+	/// </summary>
+	public override bool CanWrite => _temp.CanWrite;
+
+	/// <summary>
+	/// Gets the length in bytes of the underlying temporary file stream.
+	/// </summary>
+	public override long Length => _temp.Length;
+
+	/// <summary>
+	/// Gets or sets the current position within the underlying temporary file stream.
+	/// </summary>
+	public override long Position
+	{
+		get => _temp.Position;
+		set => _temp.Position = value;
 	}
 }
\ No newline at end of file
diff --git a/Server.Utils/ServiceLogListener.cs b/Server.Utils/ServiceLogListener.cs
index 527e59a1..7f5bf3c4 100644
--- a/Server.Utils/ServiceLogListener.cs
+++ b/Server.Utils/ServiceLogListener.cs
@@ -1,71 +1,70 @@
-namespace Ecng.Server.Utils
-{
-	using System;
-	using System.Collections.Generic;
+namespace Ecng.Server.Utils;
+
+using System;
+using System.Collections.Generic;
+
+using Microsoft.Extensions.Logging;
 
-	using Microsoft.Extensions.Logging;
+using Ecng.Serialization;
+using Ecng.Logging;
 
-	using Ecng.Serialization;
-	using Ecng.Logging;
+/// <summary>
+/// The logger recording the data to a <see cref="ILogger"/>.
+/// </summary>
+public class ServiceLogListener : ILogListener
+{
+	private readonly ILogger _logger;
 
 	/// <summary>
-	/// The logger recording the data to a <see cref="ILogger"/>.
+	/// Initializes a new instance of the <see cref="ServiceLogListener"/>.
 	/// </summary>
-	public class ServiceLogListener : ILogListener
+	/// <param name="logger">Logger.</param>
+	public ServiceLogListener(ILogger logger)
 	{
-		private readonly ILogger _logger;
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="ServiceLogListener"/>.
-		/// </summary>
-		/// <param name="logger">Logger.</param>
-		public ServiceLogListener(ILogger logger)
-		{
-			_logger = logger ?? throw new ArgumentNullException(nameof(logger));
-		}
+		_logger = logger ?? throw new ArgumentNullException(nameof(logger));
+	}
 
-		bool ILogListener.CanSave => false;
+	bool ILogListener.CanSave => false;
 
-		void IDisposable.Dispose()
-		{
-			GC.SuppressFinalize(this);
-		}
+	void IDisposable.Dispose()
+	{
+		GC.SuppressFinalize(this);
+	}
 
-		void IPersistable.Load(SettingsStorage storage)
-		{
-		}
+	void IPersistable.Load(SettingsStorage storage)
+	{
+	}
 
-		void IPersistable.Save(SettingsStorage storage)
-		{
-		}
+	void IPersistable.Save(SettingsStorage storage)
+	{
+	}
 
-		void ILogListener.WriteMessages(IEnumerable<LogMessage> messages)
+	void ILogListener.WriteMessages(IEnumerable<LogMessage> messages)
+	{
+		foreach (var message in messages)
 		{
-			foreach (var message in messages)
+			switch (message.Level)
 			{
-				switch (message.Level)
-				{
-					//case LogLevels.Inherit:
-					//case LogLevels.Off:
-					//	break;
-					case LogLevels.Verbose:
-						_logger.Log(LogLevel.Trace, message.Message);
-						break;
-					case LogLevels.Debug:
-						_logger.Log(LogLevel.Debug, message.Message);
-						break;
-					case LogLevels.Info:
-						_logger.Log(LogLevel.Information, message.Message);
-						break;
-					case LogLevels.Warning:
-						_logger.Log(LogLevel.Warning, message.Message);
-						break;
-					case LogLevels.Error:
-						_logger.Log(LogLevel.Error, message.Message);
-						break;
-					//default:
-					//	break;
-				}
+				//case LogLevels.Inherit:
+				//case LogLevels.Off:
+				//	break;
+				case LogLevels.Verbose:
+					_logger.Log(LogLevel.Trace, message.Message);
+					break;
+				case LogLevels.Debug:
+					_logger.Log(LogLevel.Debug, message.Message);
+					break;
+				case LogLevels.Info:
+					_logger.Log(LogLevel.Information, message.Message);
+					break;
+				case LogLevels.Warning:
+					_logger.Log(LogLevel.Warning, message.Message);
+					break;
+				case LogLevels.Error:
+					_logger.Log(LogLevel.Error, message.Message);
+					break;
+				//default:
+				//	break;
 			}
 		}
 	}
diff --git a/Server.Utils/ServicePath.cs b/Server.Utils/ServicePath.cs
index de0666e1..5e457636 100644
--- a/Server.Utils/ServicePath.cs
+++ b/Server.Utils/ServicePath.cs
@@ -1,83 +1,82 @@
-namespace Ecng.Server.Utils
-{
-	using System;
-	using System.IO;
-	using System.Reflection;
+namespace Ecng.Server.Utils;
+
+using System;
+using System.IO;
+using System.Reflection;
 
-	using Ecng.Serialization;
-	using Ecng.Logging;
+using Ecng.Serialization;
+using Ecng.Logging;
 
-	using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 
+/// <summary>
+/// Services IO utils.
+/// </summary>
+public static class ServicePath
+{
 	/// <summary>
-	/// Services IO utils.
+	/// Current service directory.
 	/// </summary>
-	public static class ServicePath
-	{
-		/// <summary>
-		/// Current service directory.
-		/// </summary>
-		public static string ServiceDir => Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location));
+	public static string ServiceDir => Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location));
 
-		/// <summary>
-		/// Get path to Data directory.
-		/// </summary>
-		public static string DataDir => Path.Combine(ServiceDir, "Data");
+	/// <summary>
+	/// Get path to Data directory.
+	/// </summary>
+	public static string DataDir => Path.Combine(ServiceDir, "Data");
 
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="logger"></param>
-		/// <param name="dataDir"></param>
-		/// <param name="defaultLevel"></param>
-		/// <returns></returns>
-		public static LogManager CreateLogManager(this ILogger logger, string dataDir, LogLevels defaultLevel)
-		{
-			if (logger is null)
-				throw new ArgumentNullException(nameof(logger));
+	/// <summary>
+	/// 
+	/// </summary>
+	/// <param name="logger"></param>
+	/// <param name="dataDir"></param>
+	/// <param name="defaultLevel"></param>
+	/// <returns></returns>
+	public static LogManager CreateLogManager(this ILogger logger, string dataDir, LogLevels defaultLevel)
+	{
+		if (logger is null)
+			throw new ArgumentNullException(nameof(logger));
 
-			Directory.CreateDirectory(dataDir);
+		Directory.CreateDirectory(dataDir);
 
-			var serializer = JsonSerializer<SettingsStorage>.CreateDefault();
+		var serializer = JsonSerializer<SettingsStorage>.CreateDefault();
 
-			var logSettingsFile = Path.Combine(dataDir, $"logManager.{serializer.FileExtension}");
+		var logSettingsFile = Path.Combine(dataDir, $"logManager.{serializer.FileExtension}");
 
-			var logManager = new LogManager
-			{
-				Application = { LogLevel = defaultLevel }
-			};
+		var logManager = new LogManager
+		{
+			Application = { LogLevel = defaultLevel }
+		};
 
-			if (File.Exists(logSettingsFile))
-			{
-				logManager.Load(serializer.Deserialize(logSettingsFile));
-			}
-			else
+		if (File.Exists(logSettingsFile))
+		{
+			logManager.Load(serializer.Deserialize(logSettingsFile));
+		}
+		else
+		{
+			logManager.Listeners.Add(new FileLogListener
 			{
-				logManager.Listeners.Add(new FileLogListener
-				{
-					Append = true,
-					FileName = "logs",
-					LogDirectory = Path.Combine(dataDir, "Logs"),
-					SeparateByDates = SeparateByDateModes.SubDirectories,
-					HistoryPolicy = FileLogHistoryPolicies.Delete,
-				});
+				Append = true,
+				FileName = "logs",
+				LogDirectory = Path.Combine(dataDir, "Logs"),
+				SeparateByDates = SeparateByDateModes.SubDirectories,
+				HistoryPolicy = FileLogHistoryPolicies.Delete,
+			});
 
-				serializer.Serialize(logManager.Save(), logSettingsFile);
-			}
+			serializer.Serialize(logManager.Save(), logSettingsFile);
+		}
 
-			logManager.Listeners.Add(new ServiceLogListener(logger));
+		logManager.Listeners.Add(new ServiceLogListener(logger));
 
-			return logManager;
-		}
+		return logManager;
+	}
 
-		/// <summary>
-		/// Restart service.
-		/// </summary>
-		public static void Restart()
-		{
-			// https://stackoverflow.com/a/220451
-			// solution required setup
-			Environment.Exit(1);
-		}
+	/// <summary>
+	/// Restart service.
+	/// </summary>
+	public static void Restart()
+	{
+		// https://stackoverflow.com/a/220451
+		// solution required setup
+		Environment.Exit(1);
 	}
 }
\ No newline at end of file
diff --git a/Server.Utils/ServiceSettingsBase.cs b/Server.Utils/ServiceSettingsBase.cs
index afdabbef..f8ac25c5 100644
--- a/Server.Utils/ServiceSettingsBase.cs
+++ b/Server.Utils/ServiceSettingsBase.cs
@@ -1,27 +1,26 @@
-namespace Ecng.Server.Utils
-{
-	using Ecng.Logging;
+namespace Ecng.Server.Utils;
+
+using Ecng.Logging;
 
+/// <summary>
+/// Base server settings.
+/// </summary>
+public abstract class ServiceSettingsBase
+{
 	/// <summary>
-	/// Base server settings.
+	/// Initializes a new instance of the <see cref="ServiceSettingsBase"/>.
 	/// </summary>
-	public abstract class ServiceSettingsBase
+	protected ServiceSettingsBase()
 	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="ServiceSettingsBase"/>.
-		/// </summary>
-		protected ServiceSettingsBase()
-		{
-		}
+	}
 
-		/// <summary>
-		/// WebAPI address.
-		/// </summary>
-		public string WebApiAddress { get; set; }
+	/// <summary>
+	/// WebAPI address.
+	/// </summary>
+	public string WebApiAddress { get; set; }
 
-		/// <summary>
-		/// <see cref="LogLevels"/>.
-		/// </summary>
-		public LogLevels LogLevel { get; set; }
-	}
+	/// <summary>
+	/// <see cref="LogLevels"/>.
+	/// </summary>
+	public LogLevels LogLevel { get; set; }
 }
\ No newline at end of file
diff --git a/UnitTesting/AssertHelper.cs b/UnitTesting/AssertHelper.cs
index b82d219c..0142dbe3 100644
--- a/UnitTesting/AssertHelper.cs
+++ b/UnitTesting/AssertHelper.cs
@@ -1,151 +1,150 @@
-namespace Ecng.UnitTesting
+namespace Ecng.UnitTesting;
+
+using System;
+using System.Security;
+
+using Ecng.Common;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+/// <summary>
+/// Assert helper.
+/// </summary>
+public static class AssertHelper
 {
-	using System;
-	using System.Security;
+	/// <summary>
+	/// Asserts that the value is true.
+	/// </summary>
+	/// <param name="value">Value.</param>
+	public static void AssertTrue(this bool value)
+		=> Assert.IsTrue(value);
+
+	/// <summary>
+	/// Asserts that the value is false.
+	/// </summary>
+	/// <param name="value">Value.</param>
+	public static void AssertFalse(this bool value)
+		=> Assert.IsFalse(value);
+
+	/// <summary>
+	/// Asserts that the value is null.
+	/// </summary>
+	/// <param name="value">Value.</param>
+	public static void AssertNull(this object value)
+		=> Assert.IsNull(value);
+
+	/// <summary>
+	/// Asserts that the value is not null.
+	/// </summary>
+	/// <param name="value">Value.</param>
+	public static void AssertNull(this Exception value)
+	{
+		if (value != null)
+			throw value;
+	}
+
+	/// <summary>
+	/// Asserts that the value is not null.
+	/// </summary>
+	/// <param name="value">Value.</param>
+	public static void AssertNotNull(this object value)
+		=> Assert.IsNotNull(value);
+
+	/// <summary>
+	/// Asserts that the value is not null.
+	/// </summary>
+	/// <typeparam name="T">Type of the value.</typeparam>
+	/// <param name="value">Value.</param>
+	public static void AssertOfType<T>(this object value)
+		=> Assert.IsInstanceOfType(value, typeof(T));
+
+	/// <summary>
+	/// Asserts that the value is not null.
+	/// </summary>
+	/// <typeparam name="T">Type of the value.</typeparam>
+	/// <param name="value">Value.</param>
+	public static void AssertNotOfType<T>(this object value)
+		=> Assert.IsNotInstanceOfType(value, typeof(T));
+
+	/// <summary>
+	/// Asserts that the value is not null.
+	/// </summary>
+	/// <typeparam name="T">Type of the value.</typeparam>
+	/// <param name="value">Value.</param>
+	/// <param name="expected">Expected value.</param>
+	public static void AreEqual<T>(this T value, T expected)
+		=> value.AssertEqual(expected);
+
+	/// <summary>
+	/// Asserts that the value is not null.
+	/// </summary>
+	/// <typeparam name="T">Type of the value.</typeparam>
+	/// <param name="value">Value.</param>
+	/// <param name="expected">Expected value.</param>
+	public static void AssertEqual<T>(this T value, T expected)
+	{
+		if (value is SecureString str)
+			str.IsEqualTo(expected.To<SecureString>()).AssertTrue();
+		else
+			Assert.AreEqual(expected, value);
+	}
+
+	/// <summary>
+	/// Asserts that the value is not null.
+	/// </summary>
+	/// <param name="value">Value.</param>
+	/// <param name="expected">Expected value.</param>
+	/// <param name="delta">Delta for comparing floating point numbers.</param>
+	public static void AssertEqual(this double value, double expected, double delta)
+		=> Assert.AreEqual(expected, value, delta);
+
+	/// <summary>
+	/// Asserts that the value is not null.
+	/// </summary>
+	/// <param name="value">Value.</param>
+	/// <param name="expected">Expected value.</param>
+	/// <param name="delta">Delta for comparing floating point numbers.</param>
+	public static void AssertEqual(this float value, float expected, float delta)
+		=> Assert.AreEqual(expected, value, delta);
+
+	/// <summary>
+	/// Asserts that the value is not null.
+	/// </summary>
+	/// <typeparam name="T">Type of the value.</typeparam>
+	/// <param name="value">Value.</param>
+	/// <param name="expected">Expected value.</param>
+	public static void AssertNotEqual<T>(this T value, T expected)
+		=> Assert.AreNotEqual(expected, value);
 
-	using Ecng.Common;
+	/// <summary>
+	/// Asserts that the value is not null.
+	/// </summary>
+	/// <typeparam name="T">Type of the value.</typeparam>
+	/// <param name="value">Value.</param>
+	/// <param name="expected">Expected value.</param>
+	public static void AssertSame<T>(this T value, T expected)
+		=> Assert.AreSame(expected, value);
 
-	using Microsoft.VisualStudio.TestTools.UnitTesting;
+	/// <summary>
+	/// Asserts that the value is not null.
+	/// </summary>
+	/// <typeparam name="T">Type of the value.</typeparam>
+	/// <param name="value">Value.</param>
+	/// <param name="expected">Expected value.</param>
+	public static void AssertNotSame<T>(this T value, T expected)
+		=> Assert.AreNotSame(expected, value);
 
 	/// <summary>
-	/// Assert helper.
+	/// Asserts that the value is not null.
 	/// </summary>
-	public static class AssertHelper
+	/// <param name="value">Value.</param>
+	/// <param name="expected">Expected value.</param>
+	/// <param name="nullAsEmpty">If <see langword="true"/>, then null and empty strings are considered equal.</param>
+	public static void AssertEqual(this string value, string expected, bool nullAsEmpty = false)
 	{
-		/// <summary>
-		/// Asserts that the value is true.
-		/// </summary>
-		/// <param name="value">Value.</param>
-		public static void AssertTrue(this bool value)
-			=> Assert.IsTrue(value);
-
-		/// <summary>
-		/// Asserts that the value is false.
-		/// </summary>
-		/// <param name="value">Value.</param>
-		public static void AssertFalse(this bool value)
-			=> Assert.IsFalse(value);
-
-		/// <summary>
-		/// Asserts that the value is null.
-		/// </summary>
-		/// <param name="value">Value.</param>
-		public static void AssertNull(this object value)
-			=> Assert.IsNull(value);
-
-		/// <summary>
-		/// Asserts that the value is not null.
-		/// </summary>
-		/// <param name="value">Value.</param>
-		public static void AssertNull(this Exception value)
-		{
-			if (value != null)
-				throw value;
-		}
-
-		/// <summary>
-		/// Asserts that the value is not null.
-		/// </summary>
-		/// <param name="value">Value.</param>
-		public static void AssertNotNull(this object value)
-			=> Assert.IsNotNull(value);
-
-		/// <summary>
-		/// Asserts that the value is not null.
-		/// </summary>
-		/// <typeparam name="T">Type of the value.</typeparam>
-		/// <param name="value">Value.</param>
-		public static void AssertOfType<T>(this object value)
-			=> Assert.IsInstanceOfType(value, typeof(T));
-
-		/// <summary>
-		/// Asserts that the value is not null.
-		/// </summary>
-		/// <typeparam name="T">Type of the value.</typeparam>
-		/// <param name="value">Value.</param>
-		public static void AssertNotOfType<T>(this object value)
-			=> Assert.IsNotInstanceOfType(value, typeof(T));
-
-		/// <summary>
-		/// Asserts that the value is not null.
-		/// </summary>
-		/// <typeparam name="T">Type of the value.</typeparam>
-		/// <param name="value">Value.</param>
-		/// <param name="expected">Expected value.</param>
-		public static void AreEqual<T>(this T value, T expected)
-			=> value.AssertEqual(expected);
-
-		/// <summary>
-		/// Asserts that the value is not null.
-		/// </summary>
-		/// <typeparam name="T">Type of the value.</typeparam>
-		/// <param name="value">Value.</param>
-		/// <param name="expected">Expected value.</param>
-		public static void AssertEqual<T>(this T value, T expected)
-		{
-			if (value is SecureString str)
-				str.IsEqualTo(expected.To<SecureString>()).AssertTrue();
-			else
-				Assert.AreEqual(expected, value);
-		}
-
-		/// <summary>
-		/// Asserts that the value is not null.
-		/// </summary>
-		/// <param name="value">Value.</param>
-		/// <param name="expected">Expected value.</param>
-		/// <param name="delta">Delta for comparing floating point numbers.</param>
-		public static void AssertEqual(this double value, double expected, double delta)
-			=> Assert.AreEqual(expected, value, delta);
-
-		/// <summary>
-		/// Asserts that the value is not null.
-		/// </summary>
-		/// <param name="value">Value.</param>
-		/// <param name="expected">Expected value.</param>
-		/// <param name="delta">Delta for comparing floating point numbers.</param>
-		public static void AssertEqual(this float value, float expected, float delta)
-			=> Assert.AreEqual(expected, value, delta);
-
-		/// <summary>
-		/// Asserts that the value is not null.
-		/// </summary>
-		/// <typeparam name="T">Type of the value.</typeparam>
-		/// <param name="value">Value.</param>
-		/// <param name="expected">Expected value.</param>
-		public static void AssertNotEqual<T>(this T value, T expected)
-			=> Assert.AreNotEqual(expected, value);
-
-		/// <summary>
-		/// Asserts that the value is not null.
-		/// </summary>
-		/// <typeparam name="T">Type of the value.</typeparam>
-		/// <param name="value">Value.</param>
-		/// <param name="expected">Expected value.</param>
-		public static void AssertSame<T>(this T value, T expected)
-			=> Assert.AreSame(expected, value);
-
-		/// <summary>
-		/// Asserts that the value is not null.
-		/// </summary>
-		/// <typeparam name="T">Type of the value.</typeparam>
-		/// <param name="value">Value.</param>
-		/// <param name="expected">Expected value.</param>
-		public static void AssertNotSame<T>(this T value, T expected)
-			=> Assert.AreNotSame(expected, value);
-
-		/// <summary>
-		/// Asserts that the value is not null.
-		/// </summary>
-		/// <param name="value">Value.</param>
-		/// <param name="expected">Expected value.</param>
-		/// <param name="nullAsEmpty">If <see langword="true"/>, then null and empty strings are considered equal.</param>
-		public static void AssertEqual(this string value, string expected, bool nullAsEmpty = false)
-		{
-			if (nullAsEmpty && value.IsEmpty() && expected.IsEmpty())
-				return;
-
-			value.AssertEqual(expected);
-		}
+		if (nullAsEmpty && value.IsEmpty() && expected.IsEmpty())
+			return;
+
+		value.AssertEqual(expected);
 	}
 }
\ No newline at end of file