diff --git a/Orm/Xtensive.Orm.Tests.Core/UrlInfoTest.cs b/Orm/Xtensive.Orm.Tests.Core/UrlInfoTest.cs
index 0f6dddd64..cd3e8ebb6 100644
--- a/Orm/Xtensive.Orm.Tests.Core/UrlInfoTest.cs
+++ b/Orm/Xtensive.Orm.Tests.Core/UrlInfoTest.cs
@@ -6,26 +6,53 @@
 
 using NUnit.Framework;
 
-namespace Xtensive.Orm.Tests.Core
+namespace Xtensive.Orm.Tests.Core;
+
+[TestFixture]
+public class UrlInfoTest
 {
-  [TestFixture]
-  public class UrlInfoTest
+  [Test]
+  public void CombinedTest()
   {
-    [Test]
-    public void CombinedTest()
-    {
-      UrlInfo a1 = UrlInfo.Parse("tcp://user:password@someHost:1000/someUrl/someUrl?someParameter=someValue&someParameter2=someValue2");
-      UrlInfo a2 = UrlInfo.Parse("tcp://user:password@someHost:1000/someUrl/someUrl?someParameter=someValue&someParameter2=someValue2");
-      UrlInfo aX = UrlInfo.Parse("tcp://user:password@someHost:1000/someUrl/someUrl?someParameter2=someValue2&someParameter=someValue");
-      UrlInfo b  = UrlInfo.Parse("tcp://user:password@someHost:1000/someUrl/someUrl");
+    UrlInfo a1 = UrlInfo.Parse("tcp://user:password@someHost:1000/someUrl/someUrl?someParameter=someValue&someParameter2=someValue2");
+    UrlInfo a2 = UrlInfo.Parse("tcp://user:password@someHost:1000/someUrl/someUrl?someParameter=someValue&someParameter2=someValue2");
+    UrlInfo aX = UrlInfo.Parse("tcp://user:password@someHost:1000/someUrl/someUrl?someParameter2=someValue2&someParameter=someValue");
+    UrlInfo b  = UrlInfo.Parse("tcp://user:password@someHost:1000/someUrl/someUrl");
+
+    Assert.IsTrue(a1.GetHashCode()==a2.GetHashCode());
+    Assert.IsTrue(a1.GetHashCode()!=b.GetHashCode());
 
-      Assert.IsTrue(a1.GetHashCode()==a2.GetHashCode());
-      Assert.IsTrue(a1.GetHashCode()!=aX.GetHashCode());
-      Assert.IsTrue(a1.GetHashCode()!=b.GetHashCode());
+    Assert.IsTrue(a1.Equals(a2));
+    Assert.IsFalse(a1.Equals(b));
+  }
 
-      Assert.IsTrue(a1.Equals(a2));
-      Assert.IsFalse(a1.Equals(aX));
-      Assert.IsFalse(a1.Equals(b));
-    }
+  [Test]
+  public void WithTest()
+  {
+    UrlInfo a1 = UrlInfo.Parse("tcp://user:password@someHost:1000/someUrl/someUrl?p3=v3&p4=v4&p1=v1&p2=v2");
+    var a2 = a1 with {
+      Port = 2000,
+      Password = "xxx",
+      Protocol = "unkProto",
+      Resource = "other/resource",
+      Params = new Dictionary<string, string> { { "a", "b" } }
+    };
+    Assert.AreEqual("unkProto://user:xxx@someHost:2000/other/resource?a=b", a2.ToString());
+    Assert.IsTrue(a2.Equals(a2));
+    Assert.IsFalse(a1.Equals(a2));
+    var a3 = UrlInfo.Parse("unkProto://user:xxx@someHost:2000/other/resource?a=b");
+    Assert.IsTrue(a2 == a3);
+  }
+
+  [Test]
+  public void TestUrlProps()
+  {
+    var url = UrlInfo.Parse("sqlserver://int:xxx@127.0.0.1:51571/db");
+    Assert.AreEqual("sqlserver", url.Protocol);
+    Assert.AreEqual("int", url.User);
+    Assert.AreEqual("xxx", url.Password);
+    Assert.AreEqual("127.0.0.1", url.Host);
+    Assert.AreEqual(51571, url.Port);
+    Assert.AreEqual("db", url.Resource);
   }
-}
\ No newline at end of file
+}
diff --git a/Orm/Xtensive.Orm/Orm/UrlInfo.cs b/Orm/Xtensive.Orm/Orm/UrlInfo.cs
index dca896c9a..eb10f4df4 100644
--- a/Orm/Xtensive.Orm/Orm/UrlInfo.cs
+++ b/Orm/Xtensive.Orm/Orm/UrlInfo.cs
@@ -4,455 +4,394 @@
 // Created by: Alex Yakunin
 // Created:    2007.06.08
 
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Diagnostics;
-using System.Runtime.Serialization;
-using System.Security;
 using System.Text;
 using System.Text.RegularExpressions;
 using Xtensive.Core;
 using Xtensive.Comparison;
 
-
-namespace Xtensive.Orm
+namespace Xtensive.Orm;
+
+/// <summary>
+/// Holds an URL and provides easy access to its different parts.
+/// </summary>
+/// <remarks>
+/// <para>
+/// The common URL format that would be converted
+/// to the <see cref="UrlInfo"/> can be represented
+/// in the BNF form as following:
+/// <code lang="BNF" outline="true">
+/// url ::= protocol://[user[:password]@]host[:port]/resource[?parameters]
+/// protocol ::= alphanumx[protocol]
+/// user ::= alphanumx[user]
+/// password ::= alphanumx[password]
+/// host ::= hostname | hostnum
+/// port ::= digits
+/// resource ::= name
+/// parameters ::= parameter[&amp;parameter]
+///
+/// hostname ::= name[.hostname]
+/// hostnum ::= digits.digits.digits.digits
+///
+/// parameter ::= name=[name]
+///
+/// name ::= alpanumx[name]
+///
+/// digits ::= digit[digits]
+/// alphanumx ::= alphanum | escape | $ | - | _ | . | + | ! | * | " | ' | ( | ) | , | ; | # | space
+/// alphanum ::= alpha | digit
+/// escape ::= % hex hex
+/// hex ::= digit | a | b | c | d | e | f | A | B | C | D | E | F
+/// digit ::= 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9
+/// alpha ::= /* represents any unicode alpa character */
+/// </code>
+/// </para>
+/// <note>
+/// This not fully precise notation because it slightly simplified to be shorter.
+/// But it almost completely reflects <see cref="UrlInfo"/> URL parser
+/// capabilities.
+/// </note>
+/// <para>
+/// Here you can see several valid URL samples:
+/// <pre>
+/// tcp://localhost/
+/// tcp://server:40000/myResource
+/// tcp://admin:admin@localhost:40000/myResource?askTimeout=60
+/// </pre>
+/// </para>
+/// </remarks>
+[Serializable]
+[DebuggerDisplay("{Url}")]
+[TypeConverter(typeof(UrlInfoConverter))]
+public sealed record UrlInfo
+(
+) : IComparable<UrlInfo>
 {
+  private static readonly Regex Pattern = new Regex(
+        @"^(?'proto'[^:]*[^sS])(?'secure'[sS]?)://" +
+        @"((?'username'[^:@]*)" +
+        @"(:(?'password'[^@]*))?@)?" +
+        @"(?'host'[^:/]*)" +
+        @"(:(?'port'\d+))?" +
+        @"/(?'resource'[^?]*)?" +
+        @"(\?(?'params'.*))?",
+        RegexOptions.Compiled|RegexOptions.Singleline);
+
   /// <summary>
-  /// Holds an URL and provides easy access to its different parts.
+  /// Gets an URL this instance describes.
   /// </summary>
-  /// <remarks>
-  /// <para>
-  /// The common URL format that would be converted
-  /// to the <see cref="UrlInfo"/> can be represented
-  /// in the BNF form as following:
-  /// <code lang="BNF" outline="true">
-  /// url ::= protocol://[user[:password]@]host[:port]/resource[?parameters]
-  /// protocol ::= alphanumx[protocol]
-  /// user ::= alphanumx[user]
-  /// password ::= alphanumx[password]
-  /// host ::= hostname | hostnum
-  /// port ::= digits
-  /// resource ::= name
-  /// parameters ::= parameter[&amp;parameter]
-  ///
-  /// hostname ::= name[.hostname]
-  /// hostnum ::= digits.digits.digits.digits
-  ///
-  /// parameter ::= name=[name]
-  ///
-  /// name ::= alpanumx[name]
-  ///
-  /// digits ::= digit[digits]
-  /// alphanumx ::= alphanum | escape | $ | - | _ | . | + | ! | * | " | ' | ( | ) | , | ; | # | space
-  /// alphanum ::= alpha | digit
-  /// escape ::= % hex hex
-  /// hex ::= digit | a | b | c | d | e | f | A | B | C | D | E | F
-  /// digit ::= 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9
-  /// alpha ::= /* represents any unicode alpa character */
-  /// </code>
-  /// </para>
-  /// <note>
-  /// This not fully precise notation because it slightly simplified to be shorter.
-  /// But it almost completely reflects <see cref="UrlInfo"/> URL parser
-  /// capabilities.
-  /// </note>
-  /// <para>
-  /// Here you can see several valid URL samples:
-  /// <pre>
-  /// tcp://localhost/
-  /// tcp://server:40000/myResource
-  /// tcp://admin:admin@localhost:40000/myResource?askTimeout=60
-  /// </pre>
-  /// </para>
-  /// </remarks>
-  [Serializable]
-  [DebuggerDisplay("{url}")]
-  [TypeConverter(typeof(UrlInfoConverter))]
-  public class UrlInfo :
-    IEquatable<UrlInfo>,
-    IComparable<UrlInfo>,
-    ISerializable
+  public string Url
   {
-    private static readonly Regex Pattern = new Regex(
-          @"^(?'proto'[^:]*[^sS])(?'secure'[sS]?)://" +
-          @"((?'username'[^:@]*)" +
-          @"(:(?'password'[^@]*))?@)?" +
-          @"(?'host'[^:/]*)" +
-          @"(:(?'port'\d+))?" +
-          @"/(?'resource'[^?]*)?" +
-          @"(\?(?'params'.*))?",
-          RegexOptions.Compiled|RegexOptions.Singleline);
-
-    private string url = string.Empty;
-    private string protocol = string.Empty;
-    private bool secure = false;
-    private string host = string.Empty;
-    private int    port;
-    private string resource = string.Empty;
-    private string user = string.Empty;
-    private string password = string.Empty;
-    private ReadOnlyDictionary<string, string> parameters;
-
-    #region Properties: Url, Protocol, Host, etc...
-
-    /// <summary>
-    /// Gets an URL this instance describes.
-    /// </summary>
-    public string Url
-    {
-      [DebuggerStepThrough]
-      get { return url; }
-    }
+    get {
+      if (field is null) {
+        StringBuilder sb = new(100);
+        sb.Append($"{Protocol}{(Secure ? "s" : "")}://");
+        if (!string.IsNullOrEmpty(User)) {
+          sb.Append(UrlEncode(User));
+          if (!string.IsNullOrEmpty(Password)) {
+            sb.Append($":{UrlEncode(Password)}");
+          }
+          sb.Append('@');
+        }
 
-    /// <summary>
-    /// Gets the protocol part of the current <see cref="Url"/>
-    /// (e.g. <b>"tcp"</b> is the protocol part of the "<b>tcp</b>://admin:password@localhost/resource" URL).
-    /// </summary>
-    public string Protocol
-    {
-      [DebuggerStepThrough]
-      get { return protocol; }
-    }
+        sb.Append(UrlEncode(Host));
+        if (Port != 0) {
+          sb.Append($":{Port}");
+        }
 
-    /// <summary>
-    /// Gets the security part of the current <see cref="Url"/>
-    /// Scheme with 's' suffix is secure.
-    /// </summary>
-    public bool Secure
-    {
-      [DebuggerStepThrough]
-      get => secure;
-    }
+        if (!string.IsNullOrEmpty(Resource)) {
+          sb.Append($"/{Resource}");
+        }
 
-    /// <summary>
-    /// Gets the host part of the current <see cref="Url"/>
-    /// (e.g. <b>"localhost"</b> is the host part of the "tcp://admin:password@<b>localhost</b>/resource" URL).
-    /// </summary>
-    public string Host
-    {
-      [DebuggerStepThrough]
-      get { return host; }
+        if (Params.Count > 0) {
+          sb.Append('?');
+          sb.Append(string.Join("&", Params.Select(kv =>$"{UrlEncode(kv.Key)}={UrlEncode(kv.Value)}")));
+        }
+        field = sb.ToString();
+      }
+      return field;
     }
+    private init;
+  }
 
-    /// <summary>
-    /// Gets the port part of the current <see cref="Url"/>
-    /// (e.g. <b>40000</b> is the port part of the "tcp://admin:password@localhost:<b>40000</b>/resource" URL).
-    /// </summary>
-    public int Port
-    {
-      [DebuggerStepThrough]
-      get { return port; }
+  /// <summary>
+  /// Gets the protocol part of the current <see cref="Url"/>
+  /// (e.g. <b>"tcp"</b> is the protocol part of the "<b>tcp</b>://admin:password@localhost/resource" URL).
+  /// </summary>
+  public string Protocol
+  {
+    [DebuggerStepThrough] get => field;
+    init {
+      field = value;
+      Url = null;
     }
+  } = string.Empty;
 
-    /// <summary>
-    /// Gets the resource name part of the current <see cref="Url"/>
-    /// (e.g. <b>"resource"</b> is the resource name part of the "tcp://admin:password@localhost/<b>resource</b>" URL).
-    /// </summary>
-    public string Resource
-    {
-      [DebuggerStepThrough]
-      get { return resource; }
+  /// <summary>
+  /// Gets the security part of the current <see cref="Url"/>
+  /// Scheme with 's' suffix is secure.
+  /// </summary>
+  public bool Secure
+  {
+    [DebuggerStepThrough] get => field;
+    init {
+      field = value;
+      Url = null;
     }
+  }
 
-    /// <summary>
-    /// Gets the user name part of the current <see cref="Url"/>
-    /// (e.g. <b>"admin"</b> is the user name part of the "tcp://<b>admin</b>:password@localhost/resource" URL).
-    /// </summary>
-    public string User
-    {
-      [DebuggerStepThrough]
-      get { return user; }
+  /// <summary>
+  /// Gets the host part of the current <see cref="Url"/>
+  /// (e.g. <b>"localhost"</b> is the host part of the "tcp://admin:password@<b>localhost</b>/resource" URL).
+  /// </summary>
+  public string Host
+  {
+    [DebuggerStepThrough] get;
+    init {
+      field = value;
+      Url = null;
     }
+  } = string.Empty;
 
-    /// <summary>
-    /// Gets the password part of the current <see cref="Url"/>
-    /// (e.g. <b>"password"</b> is the password part of the "tcp://admin:<b>password</b>@localhost/resource" URL).
-    /// </summary>
-    public string Password
-    {
-      [DebuggerStepThrough]
-      get { return password; }
+  /// <summary>
+  /// Gets the port part of the current <see cref="Url"/>
+  /// (e.g. <b>40000</b> is the port part of the "tcp://admin:password@localhost:<b>40000</b>/resource" URL).
+  /// </summary>
+  public int Port
+  {
+    [DebuggerStepThrough] get;
+    init {
+      field = value;
+      Url = null;
     }
+  }
 
-    /// <summary>
-    /// Gets additional parameters of the current <see cref="Url"/>
-    /// (e.g. <b>"param1=value1&amp;param2=value2"</b> is the additional parameters part
-    /// of the "tcp://admin:password@localhost/resource?<b>param1=value1&amp;param2=value2</b>" URL).
-    /// </summary>
-    /// <remarks>
-    /// <para>The mentioned part of the <see cref="Url"/> is parsed
-    /// and represented in a <see cref="Dictionary{String,String}"/> form.</para>
-    /// </remarks>
-    public IReadOnlyDictionary<string, string> Params
-    {
-      [DebuggerStepThrough]
-      get { return parameters; }
+  /// <summary>
+  /// Gets the resource name part of the current <see cref="Url"/>
+  /// (e.g. <b>"resource"</b> is the resource name part of the "tcp://admin:password@localhost/<b>resource</b>" URL).
+  /// </summary>
+  public string Resource
+  {
+    [DebuggerStepThrough] get;
+    init {
+      field = value;
+      Url = null;
     }
+  } = string.Empty;
 
-    #endregion
-
-    /// <summary>
-    /// Splits URL into parts (protocol, host, port, resource, user, password) and set all
-    /// derived values to the corresponding properties of the instance.
-    /// </summary>
-    /// <param name="url">URL to split</param>
-    /// <remarks>
-    /// The expected URL format is as the following:
-    /// proto://[[user[:password]@]host[:port]]/resource.
-    /// Note that the empty URL will cause an exception.
-    /// </remarks>
-    /// <exception cref="ArgumentException">Specified <paramref name="url"/> is invalid (cannot be parsed).</exception>
-    public static UrlInfo Parse(string url)
-    {
-      var result = new UrlInfo();
-      Parse(url, result);
-      return result;
+  /// <summary>
+  /// Gets the user name part of the current <see cref="Url"/>
+  /// (e.g. <b>"admin"</b> is the user name part of the "tcp://<b>admin</b>:password@localhost/resource" URL).
+  /// </summary>
+  public string User
+  {
+    [DebuggerStepThrough] get => field;
+    init {
+      field = value;
+      Url = null;
     }
+  } = string.Empty;
 
-    private static void Parse(string url, UrlInfo info)
-    {
-      try {
-        string tUrl = url;
-        if (tUrl.Length==0)
-          tUrl = ":///";
-
-        var result = Pattern.Match(tUrl);
-        if (!result.Success)
-          throw Exceptions.InvalidUrl(url, "url");
-
-        int @port = 0;
-
-        if (result.Result("${port}").Length!=0)
-          @port = int.Parse(result.Result("${port}"));
-        if (@port<0 || @port>65535)
-          throw Exceptions.InvalidUrl(url, "port");
-
-        string tParams = result.Result("${params}");
-        string[] aParams = tParams.Split('&');
-        var @params = new Dictionary<string, string>();
-        if (tParams!=string.Empty) {
-          foreach (string sPair in aParams) {
-            string[] aNameValue = sPair.Split(new char[] {'='}, 2);
-            if (aNameValue.Length!=2)
-              throw Exceptions.InvalidUrl(url, "parameters");
-            @params.Add(UrlDecode(aNameValue[0]), UrlDecode(aNameValue[1]));
-          }
-        }
-
-        info.url = url;
-        info.user = UrlDecode(result.Result("${username}"));
-        info.password = UrlDecode(result.Result("${password}"));
-        info.resource = UrlDecode(result.Result("${resource}"));
-        info.host = UrlDecode(result.Result("${host}"));
-        info.protocol = UrlDecode(result.Result("${proto}"));
-        info.secure = !string.IsNullOrEmpty(result.Result("${secure}"));
-        info.port = @port;
-        info.parameters = new ReadOnlyDictionary<string, string>(@params);
-      }
-      catch (Exception e) {
-        if (e is ArgumentException || e is InvalidOperationException)
-          throw;
-        else
-          throw Exceptions.InvalidUrl(url, "url");
-      }
+  /// <summary>
+  /// Gets the password part of the current <see cref="Url"/>
+  /// (e.g. <b>"password"</b> is the password part of the "tcp://admin:<b>password</b>@localhost/resource" URL).
+  /// </summary>
+  public string Password
+  {
+    [DebuggerStepThrough] get => field;
+    init {
+      field = value;
+      Url = null;
     }
+  } = string.Empty;
 
-    #region Nested type: UrlDecoder
-
-    private class UrlDecoder
-    {
-      // Fields
-      private int m_bufferSize;
-      private byte[] m_byteBuffer;
-      private char[] m_charBuffer;
-      private Encoding m_encoding;
-      private int m_numBytes;
-      private int m_numChars;
-
-      // Methods
-      internal UrlDecoder(int bufferSize, Encoding encoding)
-      {
-        m_bufferSize = bufferSize;
-        m_encoding = encoding;
-        m_charBuffer = new char[bufferSize];
-      }
-
-      internal void AddByte(byte b)
-      {
-        if (m_byteBuffer==null)
-          m_byteBuffer = new byte[m_bufferSize];
-        m_byteBuffer[m_numBytes++] = b;
-      }
-
-      internal void AddChar(char ch)
-      {
-        if (m_numBytes>0)
-          FlushBytes();
-        m_charBuffer[m_numChars++] = ch;
-      }
+  /// <summary>
+  /// Gets additional parameters of the current <see cref="Url"/>
+  /// (e.g. <b>"param1=value1&amp;param2=value2"</b> is the additional parameters part
+  /// of the "tcp://admin:password@localhost/resource?<b>param1=value1&amp;param2=value2</b>" URL).
+  /// </summary>
+  /// <remarks>
+  /// <para>The mentioned part of the <see cref="Url"/> is parsed
+  /// and represented in a <see cref="Dictionary{String,String}"/> form.</para>
+  /// </remarks>
+  public IReadOnlyDictionary<string, string> Params
+  {
+    [DebuggerStepThrough]
+    get => field;
+    init {
+      field = value;
+      Url = null;
+    }
+  }
 
-      private void FlushBytes()
-      {
-        if (m_numBytes>0) {
-          m_numChars += m_encoding.GetChars(m_byteBuffer, 0, m_numBytes, m_charBuffer, m_numChars);
-          m_numBytes = 0;
+  /// <summary>
+  /// Splits URL into parts (protocol, host, port, resource, user, password) and set all
+  /// derived values to the corresponding properties of the instance.
+  /// </summary>
+  /// <param name="url">URL to split</param>
+  /// <remarks>
+  /// The expected URL format is as the following:
+  /// proto://[[user[:password]@]host[:port]]/resource.
+  /// Note that the empty URL will cause an exception.
+  /// </remarks>
+  /// <exception cref="ArgumentException">Specified <paramref name="url"/> is invalid (cannot be parsed).</exception>
+  public static UrlInfo Parse(string url)
+  {
+    try {
+      string tUrl = url;
+      if (tUrl.Length==0)
+        tUrl = ":///";
+
+      var result = Pattern.Match(tUrl);
+      if (!result.Success)
+        throw Exceptions.InvalidUrl(url, "url");
+
+      int @port = 0;
+
+      if (result.Result("${port}").Length!=0)
+        @port = int.Parse(result.Result("${port}"));
+      if (@port<0 || @port>65535)
+        throw Exceptions.InvalidUrl(url, "port");
+
+      string tParams = result.Result("${params}");
+      string[] aParams = tParams.Split('&');
+      var parameters = new SortedDictionary<string, string>();
+      if (tParams!=string.Empty) {
+        foreach (string sPair in aParams) {
+          string[] aNameValue = sPair.Split(new char[] {'='}, 2);
+          if (aNameValue.Length!=2)
+            throw Exceptions.InvalidUrl(url, "parameters");
+          parameters.Add(UrlDecode(aNameValue[0]), UrlDecode(aNameValue[1]));
         }
       }
 
-      internal string GetString()
-      {
-        if (m_numBytes>0)
-          FlushBytes();
-        if (m_numChars>0)
-          return new string(m_charBuffer, 0, m_numChars);
-        return string.Empty;
-      }
+      return new UrlInfo {
+        User = UrlDecode(result.Result("${username}")),
+        Password = UrlDecode(result.Result("${password}")),
+        Resource = UrlDecode(result.Result("${resource}")),
+        Host = UrlDecode(result.Result("${host}")),
+        Protocol = UrlDecode(result.Result("${proto}")),
+        Secure = !string.IsNullOrEmpty(result.Result("${secure}")),
+        Port = @port,
+        Params = parameters
+      };
     }
-
-    #endregion
-
-    #region Private \ internal methods
-
-    private static string UrlDecode(string str)
-    {
-      return UrlDecode(str, Encoding.UTF8);
+    catch (Exception e) when (!(e is ArgumentException or InvalidOperationException)) {
+      throw Exceptions.InvalidUrl(url, "url");
     }
+  }
 
-    private static string UrlDecode(string s, Encoding e)
+  private class UrlDecoder
+  {
+    // Fields
+    private int m_bufferSize;
+    private byte[] m_byteBuffer;
+    private char[] m_charBuffer;
+    private Encoding m_encoding;
+    private int m_numBytes;
+    private int m_numChars;
+
+    // Methods
+    internal UrlDecoder(int bufferSize, Encoding encoding)
     {
-      int len = s.Length;
-      UrlDecoder decoder = new UrlDecoder(len, e);
-      for (int i = 0; i<len; i++) {
-        char c = s[i];
-        if (c=='+') {
-          c = ' ';
-        }
-        else if (c=='%' && i<(len-2)) {
-          if (s[i+1]=='u' && i<(len-5)) {
-            int num3 = HexToInt(s[i+2]);
-            int num4 = HexToInt(s[i+3]);
-            int num5 = HexToInt(s[i+4]);
-            int num6 = HexToInt(s[i+5]);
-            if ((num3<0 || num4<0) || (num5<0 || num6<0))
-              goto loc_1;
-            c = (char)((ushort)((((num3 << 12)|(num4 << 8))|(num5 << 4))|num6));
-            i += 5;
-            decoder.AddChar(c);
-            continue;
-          }
-          int num7 = HexToInt(s[i+1]);
-          int num8 = HexToInt(s[i+2]);
-          if (num7>=0 && num8>=0) {
-            byte num9 = (byte)((num7 << 4)|num8);
-            i += 2;
-            decoder.AddByte(num9);
-            continue;
-          }
-        }
-        loc_1:
-        if ((c&0xff80)=='\0')
-          decoder.AddByte((byte)c);
-        else
-          decoder.AddChar(c);
-      }
-      return decoder.GetString().Trim();
+      m_bufferSize = bufferSize;
+      m_encoding = encoding;
+      m_charBuffer = new char[bufferSize];
     }
 
-    private static int HexToInt(char h)
+    internal void AddByte(byte b)
     {
-      if (h>='0' && h<='9')
-        return h-'0';
-      if (h<'a' || h>'f') {
-        if (h>='A' && h<='F')
-          return h-'A'+'\n';
-        return -1;
-      }
-      return h-'a'+'\n';
+      if (m_byteBuffer==null)
+        m_byteBuffer = new byte[m_bufferSize];
+      m_byteBuffer[m_numBytes++] = b;
     }
 
-    #endregion
-
-    #region IComparable<...>, IEquatable<...> methods
-
-    /// <inheritdoc/>
-    public bool Equals(UrlInfo other)
+    internal void AddChar(char ch)
     {
-      return AdvancedComparerStruct<string>.System.Equals(url, other.url);
+      if (m_numBytes>0)
+        FlushBytes();
+      m_charBuffer[m_numChars++] = ch;
     }
 
-    /// <inheritdoc/>
-    public int CompareTo(UrlInfo other)
+    private void FlushBytes()
     {
-      return AdvancedComparerStruct<string>.System.Compare(url, other.url);
+      if (m_numBytes>0) {
+        m_numChars += m_encoding.GetChars(m_byteBuffer, 0, m_numBytes, m_charBuffer, m_numChars);
+        m_numBytes = 0;
+      }
     }
 
-    #endregion
-
-    #region Equals, GetHashCode, ==, !=
-
-    /// <inheritdoc/>
-    public override bool Equals(object obj) => obj is UrlInfo other && Equals(other);
-
-    /// <inheritdoc/>
-    public override int GetHashCode() => url?.GetHashCode() ?? 0;
-
-    /// <summary>
-    /// Checks specified objects for equality.
-    /// </summary>
-    /// <param name="left"></param>
-    /// <param name="right"></param>
-    /// <returns></returns>
-    public static bool operator ==(UrlInfo left, UrlInfo right) => left?.Equals(right) ?? right is null;
-
-    /// <summary>
-    /// Checks specified objects for inequality.
-    /// </summary>
-    /// <param name="left"></param>
-    /// <param name="right"></param>
-    /// <returns></returns>
-    public static bool operator !=(UrlInfo left, UrlInfo right) => !(left == right);
-
-    #endregion
-
-    /// <inheritdoc/>
-    public override string ToString()
+    internal string GetString()
     {
-      return url;
+      if (m_numBytes>0)
+        FlushBytes();
+      if (m_numChars>0)
+        return new string(m_charBuffer, 0, m_numChars);
+      return string.Empty;
     }
+  }
 
+  private static string UrlEncode(string str) => Uri.EscapeDataString(str);
 
-    // Constructors
-
-    private UrlInfo()
-    {
+  private static string UrlDecode(string s, Encoding e = null)
+  {
+    e ??= Encoding.UTF8;
+    int len = s.Length;
+    UrlDecoder decoder = new UrlDecoder(len, e);
+    for (int i = 0; i<len; i++) {
+      char c = s[i];
+      if (c=='+') {
+        c = ' ';
+      }
+      else if (c=='%' && i<(len-2)) {
+        if (s[i+1]=='u' && i<(len-5)) {
+          int num3 = HexToInt(s[i+2]);
+          int num4 = HexToInt(s[i+3]);
+          int num5 = HexToInt(s[i+4]);
+          int num6 = HexToInt(s[i+5]);
+          if ((num3<0 || num4<0) || (num5<0 || num6<0))
+            goto loc_1;
+          c = (char)((ushort)((((num3 << 12)|(num4 << 8))|(num5 << 4))|num6));
+          i += 5;
+          decoder.AddChar(c);
+          continue;
+        }
+        int num7 = HexToInt(s[i+1]);
+        int num8 = HexToInt(s[i+2]);
+        if (num7>=0 && num8>=0) {
+          byte num9 = (byte)((num7 << 4)|num8);
+          i += 2;
+          decoder.AddByte(num9);
+          continue;
+        }
+      }
+      loc_1:
+      if ((c&0xff80)=='\0')
+        decoder.AddByte((byte)c);
+      else
+        decoder.AddChar(c);
     }
+    return decoder.GetString().Trim();
+  }
 
-    #region ISerializable members, deserializing constructor
+  private static int HexToInt(char h) =>
+    h is >= '0' and <= '9' ? h - '0'
+    : h is >= 'a' and <= 'f' ? h - 'a' + 10
+    : h is >= 'A' and <= 'F' ? h - 'A' + 10
+    : -1;
 
-    ///<summary>
-    /// Deserilizing constructor.
-    ///</summary>
-    /// <param name="context">The source (see <see cref="T:System.Runtime.Serialization.StreamingContext"></see>) for this deserialization. </param>
-    /// <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo"></see> to populate the data from. </param>
-    protected UrlInfo(SerializationInfo info, StreamingContext context)
-    {
-      Parse(info.GetString("Url"), this);
-    }
+  /// <inheritdoc/>
+  public bool Equals(UrlInfo other) =>
+    AdvancedComparerStruct<string>.System.Equals(Url, other.Url);
 
-    /// <summary>
-    /// Populates a <see cref="T:System.Runtime.Serialization.SerializationInfo"></see> with the data needed to serialize the target object.
-    /// </summary>
-    /// <param name="context">The destination (see <see cref="T:System.Runtime.Serialization.StreamingContext"></see>) for this serialization. </param>
-    /// <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo"></see> to populate with data. </param>
-    /// <exception cref="T:System.Security.SecurityException">The caller does not have the required permission. </exception>
-    [SecurityCritical]
-    public virtual void GetObjectData(SerializationInfo info, StreamingContext context)
-    {
-      info.AddValue("Url", url);
-    }
+  /// <inheritdoc/>
+  public int CompareTo(UrlInfo other) =>
+    AdvancedComparerStruct<string>.System.Compare(Url, other.Url);
 
-    #endregion
-  }
+  /// <inheritdoc/>
+  public override int GetHashCode() => Url.GetHashCode();
+
+  /// <inheritdoc/>
+  public override string ToString() => Url;
 }