diff --git a/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/IKSqlDbParameters.cs b/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/IKSqlDbParameters.cs
index 90eb4555..d1c34652 100644
--- a/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/IKSqlDbParameters.cs
+++ b/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/IKSqlDbParameters.cs
@@ -1,6 +1,13 @@
 namespace ksqlDB.RestApi.Client.KSql.RestApi.Parameters;
 
+/// <summary>
+/// Represents parameters for a KSqlDb endpoint.
+/// </summary>
 public interface IKSqlDbParameters : IQueryParameters
 {
+  /// <summary>
+  /// Clones the current parameters.
+  /// </summary>
+  /// <returns>A new instance of the parameters with the same values.</returns>
   IKSqlDbParameters Clone();
 }
diff --git a/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/IPullQueryParameters.cs b/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/IPullQueryParameters.cs
index 19d85eb8..543744ca 100644
--- a/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/IPullQueryParameters.cs
+++ b/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/IPullQueryParameters.cs
@@ -1,6 +1,8 @@
-namespace ksqlDB.RestApi.Client.KSql.RestApi.Parameters
+namespace ksqlDB.RestApi.Client.KSql.RestApi.Parameters;
+
+/// <summary>
+/// Represents parameters for a pull query.
+/// </summary>
+public interface IPullQueryParameters : IKSqlDbParameters
 {
-  public interface IPullQueryParameters : IKSqlDbParameters
-  {
-  }
 }
diff --git a/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/IPushQueryParameters.cs b/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/IPushQueryParameters.cs
index 86cb0eb6..8959d028 100644
--- a/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/IPushQueryParameters.cs
+++ b/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/IPushQueryParameters.cs
@@ -1,9 +1,11 @@
 using ksqlDB.RestApi.Client.KSql.Query.Options;
 
-namespace ksqlDB.RestApi.Client.KSql.RestApi.Parameters
+namespace ksqlDB.RestApi.Client.KSql.RestApi.Parameters;
+
+/// <summary>
+/// Represents parameters for a push query.
+/// </summary>
+public interface IPushQueryParameters : IKSqlDbParameters
 {
-  public interface IPushQueryParameters : IKSqlDbParameters
-  {
-    AutoOffsetReset AutoOffsetReset { get; set; }
-  }
+  AutoOffsetReset AutoOffsetReset { get; set; }
 }
diff --git a/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/IQueryParameters.cs b/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/IQueryParameters.cs
index c8f86a36..e958ea6e 100644
--- a/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/IQueryParameters.cs
+++ b/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/IQueryParameters.cs
@@ -1,8 +1,19 @@
-namespace ksqlDB.RestApi.Client.KSql.RestApi.Parameters;
+namespace ksqlDB.RestApi.Client.KSql.RestApi.Parameters;
 
+/// <summary>
+/// Represents query parameters for a KSqlDb endpoint.
+/// </summary>
 public interface IQueryParameters : IQueryOptions
 {
+  /// <summary>
+  /// A semicolon-delimited sequence of SQL statements to run.
+  /// </summary>
   string Sql { get; set; }
-    
+
+  /// <summary>
+  /// Indexer to access properties by key.
+  /// </summary>
+  /// <param name="key">The key of the property.</param>
+  /// <returns>The value of the property.</returns>
   string this[string key] { get; set; }
-}
\ No newline at end of file
+}
diff --git a/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/PullQueryParameters.cs b/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/PullQueryParameters.cs
index 9f9d51bd..b82af70d 100644
--- a/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/PullQueryParameters.cs
+++ b/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/PullQueryParameters.cs
@@ -1,6 +1,8 @@
-namespace ksqlDB.RestApi.Client.KSql.RestApi.Parameters
+namespace ksqlDB.RestApi.Client.KSql.RestApi.Parameters;
+
+/// <summary>
+/// Represents parameters for a pull query endpoint.
+/// </summary>
+public class PullQueryParameters : QueryEndpointParameters<PullQueryParameters>, IPullQueryParameters
 {
-  public class PullQueryParameters : QueryEndpointParameters<PullQueryParameters>, IPullQueryParameters
-  {
-  }
 }
diff --git a/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/PullQueryStreamParameters.cs b/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/PullQueryStreamParameters.cs
index 1d0c45af..6d429e82 100644
--- a/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/PullQueryStreamParameters.cs
+++ b/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/PullQueryStreamParameters.cs
@@ -1,6 +1,8 @@
-namespace ksqlDB.RestApi.Client.KSql.RestApi.Parameters
+namespace ksqlDB.RestApi.Client.KSql.RestApi.Parameters;
+
+/// <summary>
+/// Represents parameters for a pull query stream endpoint.
+/// </summary>
+public class PullQueryStreamParameters : QueryStreamEndpointParameters<PullQueryStreamParameters>, IPullQueryParameters
 {
-  public class PullQueryStreamParameters : QueryStreamEndpointParameters<PullQueryStreamParameters>, IPullQueryParameters
-  {
-  }
 }
diff --git a/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/QueryEndpointParameters.cs b/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/QueryEndpointParameters.cs
index 08e59a57..ed9732ad 100644
--- a/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/QueryEndpointParameters.cs
+++ b/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/QueryEndpointParameters.cs
@@ -1,53 +1,73 @@
 using System.Text.Json.Serialization;
 using ksqlDB.RestApi.Client.KSql.RestApi.Statements;
 
-namespace ksqlDB.RestApi.Client.KSql.RestApi.Parameters
+namespace ksqlDB.RestApi.Client.KSql.RestApi.Parameters;
+
+/// <summary>
+/// Represents parameters for a '/query' endpoint.
+/// </summary>
+/// <typeparam name="T">The type of the query stream endpoint parameters.</typeparam>
+public class QueryEndpointParameters<T> : IKSqlDbParameters
+  where T : QueryEndpointParameters<T>, new()
 {
-  public class QueryEndpointParameters<T> : IKSqlDbParameters
-    where T : QueryEndpointParameters<T>, new()
+  /// <summary>
+  /// A semicolon-delimited sequence of SQL statements to run.
+  /// </summary>
+  [JsonPropertyName("ksql")]
+  public string Sql { get; set; } = null!;
+
+  /// <summary>
+  /// Property overrides to run the statements with.
+  /// </summary>
+  [JsonPropertyName("streamsProperties")]
+  public Dictionary<string, string> Properties { get; } = new();
+
+  /// <summary>
+  /// Indexer to access properties by key.
+  /// </summary>
+  /// <param name="key">The key of the property.</param>
+  /// <returns>The value of the property.</returns>
+  public string this[string key]
   {
-    /// <summary>
-    /// A semicolon-delimited sequence of SQL statements to run.
-    /// </summary>
-    [JsonPropertyName("ksql")]
-    public string Sql { get; set; } = null!;
-
-    /// <summary>
-    /// Property overrides to run the statements with.
-    /// </summary>
-    [JsonPropertyName("streamsProperties")]
-    public Dictionary<string, string> Properties { get; } = new();
-
-    public string this[string key]
-    {
-      get => Properties[key];
-      set => Properties[key] = value;
-    }
+    get => Properties[key];
+    set => Properties[key] = value;
+  }
 
-    internal EndpointType EndpointType { get; set; } = EndpointType.Query;
+  internal EndpointType EndpointType { get; set; } = EndpointType.Query;
 
-    public void FillFrom(IKSqlDbParameters parameters)
-    {
-      this.FillQueryParametersFrom(parameters);
-    }
+  /// <summary>
+  /// Fills the parameters from another set of parameters.
+  /// </summary>
+  /// <param name="parameters">The parameters to fill from.</param>
+  public void FillFrom(IKSqlDbParameters parameters)
+  {
+    this.FillQueryParametersFrom(parameters);
+  }
 
-    public IKSqlDbParameters Clone()
+  /// <summary>
+  /// Clones the current parameters.
+  /// </summary>
+  /// <returns>A new instance of the parameters with the same values.</returns>
+  public IKSqlDbParameters Clone()
+  {
+    var queryParams = new T()
     {
-      var queryParams = new T()
-      {
-        Sql = Sql,
-        EndpointType = EndpointType
-      };
+      Sql = Sql,
+      EndpointType = EndpointType
+    };
 
-      foreach (var entry in Properties)
-        queryParams.Properties.Add(entry.Key, entry.Value);
+    foreach (var entry in Properties)
+      queryParams.Properties.Add(entry.Key, entry.Value);
 
-      return queryParams;
-    }
+    return queryParams;
+  }
 
-    public override string ToString()
-    {
-      return this.ToLogInfo();
-    }
+  /// <summary>
+  /// Returns a string representation of the object.
+  /// </summary>
+  /// <returns>A string representation of the object.</returns>
+  public override string ToString()
+  {
+    return this.ToLogInfo();
   }
 }
diff --git a/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/QueryParameters.cs b/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/QueryParameters.cs
index 96905cb2..2b2fb9ba 100644
--- a/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/QueryParameters.cs
+++ b/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/QueryParameters.cs
@@ -3,10 +3,16 @@
 
 namespace ksqlDB.RestApi.Client.KSql.RestApi.Parameters;
 
+/// <summary>
+/// Represents parameters for a query.
+/// </summary>
 public class QueryParameters : QueryEndpointParameters<QueryParameters>, IPushQueryParameters
 {
   public static readonly string AutoOffsetResetPropertyName = "ksql.streams.auto.offset.reset";
 
+  /// <summary>
+  /// Sets the auto offset reset using <see cref="AutoOffsetReset"/>.
+  /// </summary>
   [JsonIgnore]
   public AutoOffsetReset AutoOffsetReset
   {
diff --git a/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/QueryParametersExtensions.cs b/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/QueryParametersExtensions.cs
index 774d8e4d..eb5c4f46 100644
--- a/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/QueryParametersExtensions.cs
+++ b/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/QueryParametersExtensions.cs
@@ -19,7 +19,7 @@ internal static void FillQueryParametersFrom(this IQueryParameters destination,
       destination.Properties.Add(entry.Key, entry.Value);
   }
 
-  public static string ToLogInfo(this IQueryParameters queryParameters)
+  internal static string ToLogInfo(this IQueryParameters queryParameters)
   {
     var sb = new StringBuilder();
 
diff --git a/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/QueryStreamEndpointParameters.cs b/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/QueryStreamEndpointParameters.cs
index 5629bee9..9f8d53ee 100644
--- a/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/QueryStreamEndpointParameters.cs
+++ b/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/QueryStreamEndpointParameters.cs
@@ -1,43 +1,70 @@
 using System.Text.Json.Serialization;
 
-namespace ksqlDB.RestApi.Client.KSql.RestApi.Parameters
+namespace ksqlDB.RestApi.Client.KSql.RestApi.Parameters;
+
+/// <summary>
+/// Represents parameters for a '/query-stream' endpoint.
+/// </summary>
+/// <typeparam name="T">The type of the query stream endpoint parameters.</typeparam>
+public class QueryStreamEndpointParameters<T> : IKSqlDbParameters
+  where T : QueryStreamEndpointParameters<T>, new()
 {
-  public class QueryStreamEndpointParameters<T> : IKSqlDbParameters
-    where T : QueryStreamEndpointParameters<T>, new()
-  {
-    [JsonPropertyName("sql")]
-    public string Sql { get; set; } = null!;
+  /// <summary>
+  /// A semicolon-delimited sequence of SQL statements to run.
+  /// </summary>
+  [JsonPropertyName("sql")]
+  public string Sql { get; set; } = null!;
 
-    [JsonPropertyName("properties")]
-    public Dictionary<string, string> Properties { get; } = new();
+  /// <summary>
+  /// Property overrides to run the statements with.
+  /// </summary>
+  [JsonPropertyName("properties")]
+  public Dictionary<string, string> Properties { get; } = new();
 
-    public string this[string key]
-    {
-      get => Properties[key];
-      set => Properties[key] = value;
-    }
+  /// <summary>
+  /// Indexer to access properties by key.
+  /// </summary>
+  /// <param name="key">The key of the property.</param>
+  /// <returns>The value of the property.</returns>
+  public string this[string key]
+  {
+    get => Properties[key];
+    set => Properties[key] = value;
+  }
+
+  /// <summary>
+  /// Fills the parameters from another set of parameters.
+  /// </summary>
+  /// <param name="parameters">The parameters to fill from.</param>
+  public void FillFrom(IKSqlDbParameters parameters)
+  {
+    this.FillQueryParametersFrom(parameters);
+  }
 
-    public void FillFrom(IKSqlDbParameters parameters)
-    {
-      this.FillQueryParametersFrom(parameters);
-    }
 
-    public IKSqlDbParameters Clone()
+  /// <summary>
+  /// Clones the current parameters.
+  /// </summary>
+  /// <returns>A new instance of the parameters with the same values.</returns>
+  public IKSqlDbParameters Clone()
+  {
+    var queryParams = new T()
     {
-      var queryParams = new T()
-      {
-        Sql = Sql
-      };
+      Sql = Sql
+    };
 
-      foreach (var entry in Properties)
-        queryParams.Properties.Add(entry.Key, entry.Value);
+    foreach (var entry in Properties)
+      queryParams.Properties.Add(entry.Key, entry.Value);
 
-      return queryParams;
-    }
+    return queryParams;
+  }
 
-    public override string ToString()
-    {
-      return this.ToLogInfo();
-    }
+  /// <summary>
+  /// Returns a string representation of the object.
+  /// </summary>
+  /// <returns>A string representation of the object.</returns>
+  public override string ToString()
+  {
+    return this.ToLogInfo();
   }
 }
diff --git a/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/QueryStreamParameters.cs b/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/QueryStreamParameters.cs
index 292426ae..3341ddf7 100644
--- a/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/QueryStreamParameters.cs
+++ b/ksqlDb.RestApi.Client/KSql/RestApi/Parameters/QueryStreamParameters.cs
@@ -3,10 +3,16 @@
 
 namespace ksqlDB.RestApi.Client.KSql.RestApi.Parameters;
 
+/// <summary>
+/// Represents parameters for a query stream.
+/// </summary>
 public sealed class QueryStreamParameters : QueryStreamEndpointParameters<QueryStreamParameters>, IPushQueryParameters
 {
   public static readonly string AutoOffsetResetPropertyName = "auto.offset.reset";
 
+  /// <summary>
+  /// Sets the auto offset reset using <see cref="AutoOffsetReset"/>.
+  /// </summary>
   [JsonIgnore]
   public AutoOffsetReset AutoOffsetReset
   {