diff --git a/Source/EasyNetQ.Management.Client.ApprovalTests/EasyNetQ.Management.Client.approved.txt b/Source/EasyNetQ.Management.Client.ApprovalTests/EasyNetQ.Management.Client.approved.txt
index 6377437a..090bf3f5 100644
--- a/Source/EasyNetQ.Management.Client.ApprovalTests/EasyNetQ.Management.Client.approved.txt
+++ b/Source/EasyNetQ.Management.Client.ApprovalTests/EasyNetQ.Management.Client.approved.txt
@@ -3,78 +3,14 @@ namespace EasyNetQ.Management.Client
     public interface IManagementClient : System.IDisposable
     {
         System.Uri Endpoint { get; }
-        System.Threading.Tasks.Task CloseConnectionAsync(string connectionName, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task CreateExchangeAsync(string vhostName, string exchangeName, EasyNetQ.Management.Client.Model.ExchangeInfo exchangeInfo, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task CreateExchangeBindingAsync(string vhostName, string sourceExchangeName, string destinationExchangeName, EasyNetQ.Management.Client.Model.BindingInfo bindingInfo, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task CreateParameterAsync(string componentName, string vhostName, string parameterName, object parameterValue, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task CreatePermissionAsync(string vhostName, string userName, EasyNetQ.Management.Client.Model.PermissionInfo permissionInfo, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task CreatePolicyAsync(string vhostName, string policyName, EasyNetQ.Management.Client.Model.PolicyInfo policyInfo, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task CreateQueueAsync(string vhostName, string queueName, EasyNetQ.Management.Client.Model.QueueInfo queueInfo, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task CreateQueueBindingAsync(string vhostName, string exchangeName, string queueName, EasyNetQ.Management.Client.Model.BindingInfo bindingInfo, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task CreateTopicPermissionAsync(string vhostName, string userName, EasyNetQ.Management.Client.Model.TopicPermissionInfo topicPermissionInfo, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task CreateUserAsync(string userName, EasyNetQ.Management.Client.Model.UserInfo userInfo, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task CreateVhostAsync(string vhostName, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task DeleteExchangeAsync(string vhostName, string exchangeName, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task DeleteExchangeBindingAsync(string vhostName, string sourceExchangeName, string destinationExchangeName, string propertiesKey, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task DeleteParameterAsync(string componentName, string vhostName, string parameterName, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task DeletePermissionAsync(string vhostName, string userName, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task DeletePolicyAsync(string vhostName, string policyName, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task DeleteQueueAsync(string vhostName, string queueName, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task DeleteQueueBindingAsync(string vhostName, string exchangeName, string queueName, string propertiesKey, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task DeleteTopicPermissionAsync(string vhostName, string userName, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task DeleteUserAsync(string userName, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task DeleteVhostAsync(string vhostName, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task DisableTracingAsync(string vhostName, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task EnableTracingAsync(string vhostName, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding>> GetBindingsAsync(System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding>> GetBindingsAsync(string vhostName, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding>> GetBindingsForQueueAsync(string vhostName, string queueName, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding>> GetBindingsWithDestinationAsync(string vhostName, string exchangeName, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding>> GetBindingsWithSourceAsync(string vhostName, string exchangeName, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Channel> GetChannelAsync(string channelName, EasyNetQ.Management.Client.Model.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Channel>> GetChannelsAsync(System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Channel>> GetChannelsAsync(string connectionName, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Connection>> GetConnectionsAsync(System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Connection>> GetConnectionsAsync(string vhostName, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Consumer>> GetConsumersAsync(System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Consumer>> GetConsumersAsync(string vhostName, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Definitions> GetDefinitionsAsync(System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Exchange> GetExchangeAsync(string vhostName, string exchangeName, EasyNetQ.Management.Client.Model.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding>> GetExchangeBindingsAsync(string vhostName, string sourceExchangeName, string destinationExchangeName, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Exchange>> GetExchangesAsync(System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Exchange>> GetExchangesAsync(string vhostName, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.PageResult<EasyNetQ.Management.Client.Model.Exchange>> GetExchangesByPageAsync(EasyNetQ.Management.Client.Model.PageCriteria pageCriteria, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.PageResult<EasyNetQ.Management.Client.Model.Exchange>> GetExchangesByPageAsync(string vhostName, EasyNetQ.Management.Client.Model.PageCriteria pageCriteria, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Federation>> GetFederationsAsync(System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Message>> GetMessagesFromQueueAsync(string vhostName, string queueName, EasyNetQ.Management.Client.Model.GetMessagesFromQueueInfo getMessagesFromQueueInfo, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Node>> GetNodesAsync(System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Overview> GetOverviewAsync(EasyNetQ.Management.Client.Model.LengthsCriteria? lengthsCriteria = null, EasyNetQ.Management.Client.Model.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Parameter> GetParameterAsync(string vhostName, string componentName, string parameterName, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Parameter>> GetParametersAsync(System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Permission>> GetPermissionsAsync(System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Policy>> GetPoliciesAsync(System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Queue> GetQueueAsync(string vhostName, string queueName, EasyNetQ.Management.Client.Model.LengthsCriteria? lengthsCriteria = null, EasyNetQ.Management.Client.Model.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding>> GetQueueBindingsAsync(string vhostName, string exchangeName, string queueName, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Queue>> GetQueuesAsync(System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Queue>> GetQueuesAsync(string vhostName, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.PageResult<EasyNetQ.Management.Client.Model.Queue>> GetQueuesByPageAsync(EasyNetQ.Management.Client.Model.PageCriteria pageCriteria, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.PageResult<EasyNetQ.Management.Client.Model.Queue>> GetQueuesByPageAsync(string vhostName, EasyNetQ.Management.Client.Model.PageCriteria pageCriteria, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.QueueWithoutStats>> GetQueuesWithoutStatsAsync(System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.ShovelStatus>> GetShovelStatusesAsync(System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.ShovelStatus>> GetShovelStatusesAsync(string vhostName, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.TopicPermission>> GetTopicPermissionsAsync(System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.User> GetUserAsync(string userName, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.User>> GetUsersAsync(System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Vhost> GetVhostAsync(string vhostName, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Vhost>> GetVhostsAsync(System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<bool> HaveAnyClassicQueuesWithoutSynchronisedMirrorsAsync(System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<bool> HaveAnyClusterAlarmsAsync(System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<bool> HaveAnyLocalAlarmsAsync(System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<bool> HaveAnyQuorumQueuesInCriticalStateAsync(System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<bool> IsAliveAsync(string vhostName, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.PublishResult> PublishAsync(string vhostName, string exchangeName, EasyNetQ.Management.Client.Model.PublishInfo publishInfo, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task PurgeAsync(string vhostName, string queueName, System.Threading.CancellationToken cancellationToken = default);
-        System.Threading.Tasks.Task RebalanceQueuesAsync(System.Threading.CancellationToken cancellationToken = default);
+        System.Threading.Tasks.Task<bool> CheckAsync(EasyNetQ.Management.Client.RelativePath path, System.Threading.CancellationToken cancellationToken = default);
+        System.Threading.Tasks.Task DeleteAsync(EasyNetQ.Management.Client.RelativePath path, System.Threading.CancellationToken cancellationToken = default);
+        System.Threading.Tasks.Task<TResult> GetAsync<TResult>(EasyNetQ.Management.Client.RelativePath path, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, string>>? queryParameters, System.Threading.CancellationToken cancellationToken = default);
+        System.Threading.Tasks.Task PostAsync(EasyNetQ.Management.Client.RelativePath path, System.Threading.CancellationToken cancellationToken = default);
+        System.Threading.Tasks.Task PostAsync<TBody>(EasyNetQ.Management.Client.RelativePath path, TBody item, System.Threading.CancellationToken cancellationToken = default);
+        System.Threading.Tasks.Task<TResult> PostAsync<TBody, TResult>(EasyNetQ.Management.Client.RelativePath path, TBody item, System.Threading.CancellationToken cancellationToken = default);
+        System.Threading.Tasks.Task PutAsync(EasyNetQ.Management.Client.RelativePath path, System.Threading.CancellationToken cancellationToken = default);
+        System.Threading.Tasks.Task PutAsync<TBody>(EasyNetQ.Management.Client.RelativePath path, TBody item, System.Threading.CancellationToken cancellationToken = default);
     }
     public static class IManagementClientExtensions
     {
@@ -82,19 +18,23 @@ namespace EasyNetQ.Management.Client
         public static void ChangeUserPassword(this EasyNetQ.Management.Client.IManagementClient client, string userName, string newPassword, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task ChangeUserPasswordAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.User user, string newPassword, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task ChangeUserPasswordAsync(this EasyNetQ.Management.Client.IManagementClient client, string userName, string newPassword, System.Threading.CancellationToken cancellationToken = default) { }
+        public static bool Check(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.RelativePath path, System.Threading.CancellationToken cancellationToken = default) { }
         public static void CloseConnection(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Connection connection, System.Threading.CancellationToken cancellationToken = default) { }
         public static void CloseConnection(this EasyNetQ.Management.Client.IManagementClient client, string connectionName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task CloseConnectionAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Connection connection, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task CloseConnectionAsync(this EasyNetQ.Management.Client.IManagementClient client, string connectionName, System.Threading.CancellationToken cancellationToken = default) { }
         public static void CreateExchange(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.ExchangeName exchange, EasyNetQ.Management.Client.Model.ExchangeInfo exchangeInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static void CreateExchange(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string exchangeName, EasyNetQ.Management.Client.Model.ExchangeInfo exchangeInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static void CreateExchange(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string exchangeName, EasyNetQ.Management.Client.Model.ExchangeInfo exchangeInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task CreateExchangeAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.ExchangeName exchange, EasyNetQ.Management.Client.Model.ExchangeInfo exchangeInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task CreateExchangeAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string exchangeName, EasyNetQ.Management.Client.Model.ExchangeInfo exchangeInfo, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task CreateExchangeAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string exchangeName, EasyNetQ.Management.Client.Model.ExchangeInfo exchangeInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static void CreateExchangeBinding(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.ExchangeName sourceExchange, EasyNetQ.Management.Client.Model.ExchangeName destinationExchange, EasyNetQ.Management.Client.Model.BindingInfo bindingInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static void CreateExchangeBinding(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string sourceExchangeName, string destinationExchangeName, EasyNetQ.Management.Client.Model.BindingInfo bindingInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static void CreateExchangeBinding(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string sourceExchangeName, string destinationExchangeName, EasyNetQ.Management.Client.Model.BindingInfo bindingInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task CreateExchangeBindingAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.ExchangeName sourceExchange, EasyNetQ.Management.Client.Model.ExchangeName destinationExchange, EasyNetQ.Management.Client.Model.BindingInfo bindingInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task CreateExchangeBindingAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string sourceExchangeName, string destinationExchangeName, EasyNetQ.Management.Client.Model.BindingInfo bindingInfo, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task CreateExchangeBindingAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string sourceExchangeName, string destinationExchangeName, EasyNetQ.Management.Client.Model.BindingInfo bindingInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static void CreateFederationUpstream(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string federationUpstreamName, EasyNetQ.Management.Client.Model.ParameterFederationValue federationUpstreamDescription, System.Threading.CancellationToken cancellationToken = default) { }
         public static void CreateFederationUpstream(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string federationUpstreamName, EasyNetQ.Management.Client.Model.ParameterFederationValue federationUpstreamDescription, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task CreateFederationUpstreamAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string federationUpstreamName, EasyNetQ.Management.Client.Model.ParameterFederationValue federationUpstreamDescription, System.Threading.CancellationToken cancellationToken = default) { }
@@ -106,6 +46,7 @@ namespace EasyNetQ.Management.Client
         public static System.Threading.Tasks.Task CreateParameterAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Parameter parameter, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task CreateParameterAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Parameter parameter, object parameterValue, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task CreateParameterAsync(this EasyNetQ.Management.Client.IManagementClient client, string componentName, EasyNetQ.Management.Client.Model.Vhost vhost, string parameterName, object parameterValue, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task CreateParameterAsync(this EasyNetQ.Management.Client.IManagementClient client, string componentName, string vhostName, string parameterName, object parameterValue, System.Threading.CancellationToken cancellationToken = default) { }
         public static void CreatePermission(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, EasyNetQ.Management.Client.Model.User user, EasyNetQ.Management.Client.Model.PermissionInfo permissionInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static void CreatePermission(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string userName, EasyNetQ.Management.Client.Model.PermissionInfo permissionInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static void CreatePermission(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, EasyNetQ.Management.Client.Model.User user, EasyNetQ.Management.Client.Model.PermissionInfo permissionInfo, System.Threading.CancellationToken cancellationToken = default) { }
@@ -113,16 +54,19 @@ namespace EasyNetQ.Management.Client
         public static System.Threading.Tasks.Task CreatePermissionAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, EasyNetQ.Management.Client.Model.User user, EasyNetQ.Management.Client.Model.PermissionInfo permissionInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task CreatePermissionAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string userName, EasyNetQ.Management.Client.Model.PermissionInfo permissionInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task CreatePermissionAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, EasyNetQ.Management.Client.Model.User user, EasyNetQ.Management.Client.Model.PermissionInfo permissionInfo, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task CreatePermissionAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string userName, EasyNetQ.Management.Client.Model.PermissionInfo permissionInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static void CreatePolicy(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Policy policy, System.Threading.CancellationToken cancellationToken = default) { }
         public static void CreatePolicy(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string policyName, EasyNetQ.Management.Client.Model.PolicyInfo policyInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static void CreatePolicy(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string policyName, EasyNetQ.Management.Client.Model.PolicyInfo policyInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task CreatePolicyAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Policy policy, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task CreatePolicyAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string policyName, EasyNetQ.Management.Client.Model.PolicyInfo policyInfo, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task CreatePolicyAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string policyName, EasyNetQ.Management.Client.Model.PolicyInfo policyInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static void CreateQueue(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.QueueName queue, EasyNetQ.Management.Client.Model.QueueInfo queueInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static void CreateQueue(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string queueName, EasyNetQ.Management.Client.Model.QueueInfo queueInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static void CreateQueue(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string queueName, EasyNetQ.Management.Client.Model.QueueInfo queueInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task CreateQueueAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.QueueName queue, EasyNetQ.Management.Client.Model.QueueInfo queueInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task CreateQueueAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string queueName, EasyNetQ.Management.Client.Model.QueueInfo queueInfo, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task CreateQueueAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string queueName, EasyNetQ.Management.Client.Model.QueueInfo queueInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static void CreateQueueBinding(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.ExchangeName exchange, EasyNetQ.Management.Client.Model.QueueName queue, EasyNetQ.Management.Client.Model.BindingInfo bindingInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static void CreateQueueBinding(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.ExchangeName exchange, string queueName, EasyNetQ.Management.Client.Model.BindingInfo bindingInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static void CreateQueueBinding(this EasyNetQ.Management.Client.IManagementClient client, string exchangeName, EasyNetQ.Management.Client.Model.QueueName queue, EasyNetQ.Management.Client.Model.BindingInfo bindingInfo, System.Threading.CancellationToken cancellationToken = default) { }
@@ -132,6 +76,7 @@ namespace EasyNetQ.Management.Client
         public static System.Threading.Tasks.Task CreateQueueBindingAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.ExchangeName exchange, string queueName, EasyNetQ.Management.Client.Model.BindingInfo bindingInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task CreateQueueBindingAsync(this EasyNetQ.Management.Client.IManagementClient client, string exchangeName, EasyNetQ.Management.Client.Model.QueueName queue, EasyNetQ.Management.Client.Model.BindingInfo bindingInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task CreateQueueBindingAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string exchangeName, string queueName, EasyNetQ.Management.Client.Model.BindingInfo bindingInfo, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task CreateQueueBindingAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string exchangeName, string queueName, EasyNetQ.Management.Client.Model.BindingInfo bindingInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static void CreateShovel(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string shovelName, EasyNetQ.Management.Client.Model.ParameterShovelValue shovelDescription, System.Threading.CancellationToken cancellationToken = default) { }
         public static void CreateShovel(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string shovelName, EasyNetQ.Management.Client.Model.ParameterShovelValue shovelDescription, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task CreateShovelAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string shovelName, EasyNetQ.Management.Client.Model.ParameterShovelValue shovelDescription, System.Threading.CancellationToken cancellationToken = default) { }
@@ -143,12 +88,16 @@ namespace EasyNetQ.Management.Client
         public static System.Threading.Tasks.Task CreateTopicPermissionAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, EasyNetQ.Management.Client.Model.User user, EasyNetQ.Management.Client.Model.TopicPermissionInfo topicPermissionInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task CreateTopicPermissionAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string userName, EasyNetQ.Management.Client.Model.TopicPermissionInfo topicPermissionInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task CreateTopicPermissionAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, EasyNetQ.Management.Client.Model.User user, EasyNetQ.Management.Client.Model.TopicPermissionInfo topicPermissionInfo, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task CreateTopicPermissionAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string userName, EasyNetQ.Management.Client.Model.TopicPermissionInfo topicPermissionInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static void CreateUser(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.User user, EasyNetQ.Management.Client.Model.UserInfo userInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static void CreateUser(this EasyNetQ.Management.Client.IManagementClient client, string userName, EasyNetQ.Management.Client.Model.UserInfo userInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task CreateUserAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.User user, EasyNetQ.Management.Client.Model.UserInfo userInfo, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task CreateUserAsync(this EasyNetQ.Management.Client.IManagementClient client, string userName, EasyNetQ.Management.Client.Model.UserInfo userInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static void CreateVhost(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, System.Threading.CancellationToken cancellationToken = default) { }
         public static void CreateVhost(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task CreateVhostAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task CreateVhostAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
+        public static void Delete(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.RelativePath path, System.Threading.CancellationToken cancellationToken = default) { }
         public static void DeleteBinding(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Binding binding, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task DeleteBindingAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Binding binding, System.Threading.CancellationToken cancellationToken = default) { }
         public static void DeleteExchange(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.ExchangeName exchange, System.Threading.CancellationToken cancellationToken = default) { }
@@ -156,16 +105,19 @@ namespace EasyNetQ.Management.Client
         public static void DeleteExchange(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string exchangeName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task DeleteExchangeAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.ExchangeName exchange, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task DeleteExchangeAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string exchangeName, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task DeleteExchangeAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string exchangeName, System.Threading.CancellationToken cancellationToken = default) { }
         public static void DeleteExchangeBinding(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.ExchangeName sourceExchange, EasyNetQ.Management.Client.Model.ExchangeName destinationExchange, string propertiesKey, System.Threading.CancellationToken cancellationToken = default) { }
         public static void DeleteExchangeBinding(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string sourceExchangeName, string destinationExchangeName, string propertiesKey, System.Threading.CancellationToken cancellationToken = default) { }
         public static void DeleteExchangeBinding(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string sourceExchangeName, string destinationExchangeName, string propertiesKey, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task DeleteExchangeBindingAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.ExchangeName sourceExchange, EasyNetQ.Management.Client.Model.ExchangeName destinationExchange, string propertiesKey, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task DeleteExchangeBindingAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string sourceExchangeName, string destinationExchangeName, string propertiesKey, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task DeleteExchangeBindingAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string sourceExchangeName, string destinationExchangeName, string propertiesKey, System.Threading.CancellationToken cancellationToken = default) { }
         public static void DeleteParameter(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Parameter parameter, System.Threading.CancellationToken cancellationToken = default) { }
         public static void DeleteParameter(this EasyNetQ.Management.Client.IManagementClient client, string componentName, EasyNetQ.Management.Client.Model.Vhost vhost, string parameterName, System.Threading.CancellationToken cancellationToken = default) { }
         public static void DeleteParameter(this EasyNetQ.Management.Client.IManagementClient client, string componentName, string vhostName, string parameterName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task DeleteParameterAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Parameter parameter, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task DeleteParameterAsync(this EasyNetQ.Management.Client.IManagementClient client, string componentName, EasyNetQ.Management.Client.Model.Vhost vhost, string parameterName, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task DeleteParameterAsync(this EasyNetQ.Management.Client.IManagementClient client, string componentName, string vhostName, string parameterName, System.Threading.CancellationToken cancellationToken = default) { }
         public static void DeletePermission(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Permission permission, System.Threading.CancellationToken cancellationToken = default) { }
         public static void DeletePermission(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, EasyNetQ.Management.Client.Model.User user, System.Threading.CancellationToken cancellationToken = default) { }
         public static void DeletePermission(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string userName, System.Threading.CancellationToken cancellationToken = default) { }
@@ -175,14 +127,17 @@ namespace EasyNetQ.Management.Client
         public static System.Threading.Tasks.Task DeletePermissionAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, EasyNetQ.Management.Client.Model.User user, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task DeletePermissionAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string userName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task DeletePermissionAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, EasyNetQ.Management.Client.Model.User user, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task DeletePermissionAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string userName, System.Threading.CancellationToken cancellationToken = default) { }
         public static void DeletePolicy(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string policyName, System.Threading.CancellationToken cancellationToken = default) { }
         public static void DeletePolicy(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string policyName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task DeletePolicyAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string policyName, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task DeletePolicyAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string policyName, System.Threading.CancellationToken cancellationToken = default) { }
         public static void DeleteQueue(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.QueueName queue, System.Threading.CancellationToken cancellationToken = default) { }
         public static void DeleteQueue(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string queueName, System.Threading.CancellationToken cancellationToken = default) { }
         public static void DeleteQueue(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string queueName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task DeleteQueueAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.QueueName queue, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task DeleteQueueAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string queueName, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task DeleteQueueAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string queueName, System.Threading.CancellationToken cancellationToken = default) { }
         public static void DeleteQueueBinding(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.ExchangeName exchange, EasyNetQ.Management.Client.Model.QueueName queue, string propertiesKey, System.Threading.CancellationToken cancellationToken = default) { }
         public static void DeleteQueueBinding(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.ExchangeName exchange, string queueName, string propertiesKey, System.Threading.CancellationToken cancellationToken = default) { }
         public static void DeleteQueueBinding(this EasyNetQ.Management.Client.IManagementClient client, string exchangeName, EasyNetQ.Management.Client.Model.QueueName queue, string propertiesKey, System.Threading.CancellationToken cancellationToken = default) { }
@@ -192,6 +147,7 @@ namespace EasyNetQ.Management.Client
         public static System.Threading.Tasks.Task DeleteQueueBindingAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.ExchangeName exchange, string queueName, string propertiesKey, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task DeleteQueueBindingAsync(this EasyNetQ.Management.Client.IManagementClient client, string exchangeName, EasyNetQ.Management.Client.Model.QueueName queue, string propertiesKey, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task DeleteQueueBindingAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string exchangeName, string queueName, string propertiesKey, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task DeleteQueueBindingAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string exchangeName, string queueName, string propertiesKey, System.Threading.CancellationToken cancellationToken = default) { }
         public static void DeleteTopicPermission(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.TopicPermission topicPermission, System.Threading.CancellationToken cancellationToken = default) { }
         public static void DeleteTopicPermission(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, EasyNetQ.Management.Client.Model.User user, System.Threading.CancellationToken cancellationToken = default) { }
         public static void DeleteTopicPermission(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string userName, System.Threading.CancellationToken cancellationToken = default) { }
@@ -201,94 +157,130 @@ namespace EasyNetQ.Management.Client
         public static System.Threading.Tasks.Task DeleteTopicPermissionAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, EasyNetQ.Management.Client.Model.User user, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task DeleteTopicPermissionAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string userName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task DeleteTopicPermissionAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, EasyNetQ.Management.Client.Model.User user, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task DeleteTopicPermissionAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string userName, System.Threading.CancellationToken cancellationToken = default) { }
         public static void DeleteUser(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.User user, System.Threading.CancellationToken cancellationToken = default) { }
         public static void DeleteUser(this EasyNetQ.Management.Client.IManagementClient client, string userName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task DeleteUserAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.User user, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task DeleteUserAsync(this EasyNetQ.Management.Client.IManagementClient client, string userName, System.Threading.CancellationToken cancellationToken = default) { }
         public static void DeleteVhost(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, System.Threading.CancellationToken cancellationToken = default) { }
         public static void DeleteVhost(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task DeleteVhostAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task DeleteVhostAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
         public static void DisableTracing(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, System.Threading.CancellationToken cancellationToken = default) { }
         public static void DisableTracing(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task DisableTracingAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task DisableTracingAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
         public static void EnableTracing(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, System.Threading.CancellationToken cancellationToken = default) { }
         public static void EnableTracing(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task EnableTracingAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task EnableTracingAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
+        public static TResult Get<TResult>(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.RelativePath path, System.Threading.CancellationToken cancellationToken = default) { }
+        public static TResult Get<TResult>(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.RelativePath path, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, string>>? queryParameters, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<TResult> GetAsync<TResult>(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.RelativePath path, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding> GetBindings(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding> GetBindings(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding> GetBindings(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding>> GetBindingsAsync(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding>> GetBindingsAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding>> GetBindingsAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding> GetBindingsForQueue(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.QueueName queue, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding> GetBindingsForQueue(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string queueName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding> GetBindingsForQueue(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string queueName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding>> GetBindingsForQueueAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.QueueName queue, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding>> GetBindingsForQueueAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string queueName, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding>> GetBindingsForQueueAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string queueName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding> GetBindingsWithDestination(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.ExchangeName exchange, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding> GetBindingsWithDestination(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string exchangeName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding> GetBindingsWithDestination(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string exchangeName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding>> GetBindingsWithDestinationAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.ExchangeName exchange, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding>> GetBindingsWithDestinationAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string exchangeName, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding>> GetBindingsWithDestinationAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string exchangeName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding> GetBindingsWithSource(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.ExchangeName exchange, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding> GetBindingsWithSource(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string exchangeName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding> GetBindingsWithSource(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string exchangeName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding>> GetBindingsWithSourceAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.ExchangeName exchange, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding>> GetBindingsWithSourceAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string exchangeName, System.Threading.CancellationToken cancellationToken = default) { }
-        public static EasyNetQ.Management.Client.Model.Channel GetChannel(this EasyNetQ.Management.Client.IManagementClient client, string channelName, EasyNetQ.Management.Client.Model.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding>> GetBindingsWithSourceAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string exchangeName, System.Threading.CancellationToken cancellationToken = default) { }
+        public static EasyNetQ.Management.Client.Model.Channel GetChannel(this EasyNetQ.Management.Client.IManagementClient client, string channelName, EasyNetQ.Management.Client.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Channel> GetChannelAsync(this EasyNetQ.Management.Client.IManagementClient client, string channelName, EasyNetQ.Management.Client.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Channel> GetChannels(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Channel> GetChannels(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Connection connection, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Channel> GetChannels(this EasyNetQ.Management.Client.IManagementClient client, string connectionName, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Channel>> GetChannelsAsync(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Channel>> GetChannelsAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Connection connection, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Channel>> GetChannelsAsync(this EasyNetQ.Management.Client.IManagementClient client, string connectionName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Connection> GetConnections(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Connection> GetConnections(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Connection> GetConnections(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Connection>> GetConnectionsAsync(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Connection>> GetConnectionsAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Connection>> GetConnectionsAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Consumer> GetConsumers(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Consumer> GetConsumers(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Consumer> GetConsumers(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Consumer>> GetConsumersAsync(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Consumer>> GetConsumersAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Consumer>> GetConsumersAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
         public static EasyNetQ.Management.Client.Model.Definitions GetDefinitions(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
-        public static EasyNetQ.Management.Client.Model.Exchange GetExchange(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.ExchangeName exchange, EasyNetQ.Management.Client.Model.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
-        public static EasyNetQ.Management.Client.Model.Exchange GetExchange(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string exchangeName, EasyNetQ.Management.Client.Model.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
-        public static EasyNetQ.Management.Client.Model.Exchange GetExchange(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string exchangeName, EasyNetQ.Management.Client.Model.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
-        public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Exchange> GetExchangeAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.ExchangeName exchange, EasyNetQ.Management.Client.Model.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
-        public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Exchange> GetExchangeAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string exchangeName, EasyNetQ.Management.Client.Model.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Definitions> GetDefinitionsAsync(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
+        public static EasyNetQ.Management.Client.Model.Exchange GetExchange(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.ExchangeName exchange, EasyNetQ.Management.Client.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
+        public static EasyNetQ.Management.Client.Model.Exchange GetExchange(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string exchangeName, EasyNetQ.Management.Client.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
+        public static EasyNetQ.Management.Client.Model.Exchange GetExchange(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string exchangeName, EasyNetQ.Management.Client.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Exchange> GetExchangeAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.ExchangeName exchange, EasyNetQ.Management.Client.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Exchange> GetExchangeAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string exchangeName, EasyNetQ.Management.Client.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Exchange> GetExchangeAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string exchangeName, EasyNetQ.Management.Client.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding> GetExchangeBindings(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.ExchangeName sourceExchange, EasyNetQ.Management.Client.Model.ExchangeName destinationExchange, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding> GetExchangeBindings(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string sourceExchangeName, string destinationExchangeName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding> GetExchangeBindings(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string sourceExchangeName, string destinationExchangeName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding>> GetExchangeBindingsAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.ExchangeName sourceExchange, EasyNetQ.Management.Client.Model.ExchangeName destinationExchange, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding>> GetExchangeBindingsAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string sourceExchangeName, string destinationExchangeName, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding>> GetExchangeBindingsAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string sourceExchangeName, string destinationExchangeName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Exchange> GetExchanges(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Exchange> GetExchanges(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Exchange> GetExchanges(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Exchange>> GetExchangesAsync(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Exchange>> GetExchangesAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, System.Threading.CancellationToken cancellationToken = default) { }
-        public static EasyNetQ.Management.Client.Model.PageResult<EasyNetQ.Management.Client.Model.Exchange> GetExchangesByPage(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.PageCriteria pageCriteria, System.Threading.CancellationToken cancellationToken = default) { }
-        public static EasyNetQ.Management.Client.Model.PageResult<EasyNetQ.Management.Client.Model.Exchange> GetExchangesByPage(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, EasyNetQ.Management.Client.Model.PageCriteria pageCriteria, System.Threading.CancellationToken cancellationToken = default) { }
-        public static EasyNetQ.Management.Client.Model.PageResult<EasyNetQ.Management.Client.Model.Exchange> GetExchangesByPage(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, EasyNetQ.Management.Client.Model.PageCriteria pageCriteria, System.Threading.CancellationToken cancellationToken = default) { }
-        public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.PageResult<EasyNetQ.Management.Client.Model.Exchange>> GetExchangesByPageAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, EasyNetQ.Management.Client.Model.PageCriteria pageCriteria, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Exchange>> GetExchangesAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
+        public static EasyNetQ.Management.Client.Model.PageResult<EasyNetQ.Management.Client.Model.Exchange> GetExchangesByPage(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.PageCriteria pageCriteria, System.Threading.CancellationToken cancellationToken = default) { }
+        public static EasyNetQ.Management.Client.Model.PageResult<EasyNetQ.Management.Client.Model.Exchange> GetExchangesByPage(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, EasyNetQ.Management.Client.PageCriteria pageCriteria, System.Threading.CancellationToken cancellationToken = default) { }
+        public static EasyNetQ.Management.Client.Model.PageResult<EasyNetQ.Management.Client.Model.Exchange> GetExchangesByPage(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, EasyNetQ.Management.Client.PageCriteria pageCriteria, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.PageResult<EasyNetQ.Management.Client.Model.Exchange>> GetExchangesByPageAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.PageCriteria pageCriteria, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.PageResult<EasyNetQ.Management.Client.Model.Exchange>> GetExchangesByPageAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, EasyNetQ.Management.Client.PageCriteria pageCriteria, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.PageResult<EasyNetQ.Management.Client.Model.Exchange>> GetExchangesByPageAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, EasyNetQ.Management.Client.PageCriteria pageCriteria, System.Threading.CancellationToken cancellationToken = default) { }
         public static EasyNetQ.Management.Client.Model.Parameter GetFederationUpstream(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string federationUpstreamName, System.Threading.CancellationToken cancellationToken = default) { }
         public static EasyNetQ.Management.Client.Model.Parameter GetFederationUpstream(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string federationUpstreamName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Parameter> GetFederationUpstreamAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string federationUpstreamName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Parameter> GetFederationUpstreamAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string federationUpstreamName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Federation> GetFederations(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Federation>> GetFederationsAsync(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Message> GetMessagesFromQueue(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.QueueName queue, EasyNetQ.Management.Client.Model.GetMessagesFromQueueInfo getMessagesFromQueueInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Message> GetMessagesFromQueue(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string queueName, EasyNetQ.Management.Client.Model.GetMessagesFromQueueInfo getMessagesFromQueueInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Message> GetMessagesFromQueue(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string queueName, EasyNetQ.Management.Client.Model.GetMessagesFromQueueInfo getMessagesFromQueueInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Message>> GetMessagesFromQueueAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.QueueName queue, EasyNetQ.Management.Client.Model.GetMessagesFromQueueInfo getMessagesFromQueueInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Message>> GetMessagesFromQueueAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string queueName, EasyNetQ.Management.Client.Model.GetMessagesFromQueueInfo getMessagesFromQueueInfo, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Message>> GetMessagesFromQueueAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string queueName, EasyNetQ.Management.Client.Model.GetMessagesFromQueueInfo getMessagesFromQueueInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Node> GetNodes(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
-        public static EasyNetQ.Management.Client.Model.Overview GetOverview(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.LengthsCriteria? lengthsCriteria = null, EasyNetQ.Management.Client.Model.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Node>> GetNodesAsync(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
+        public static EasyNetQ.Management.Client.Model.Overview GetOverview(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.LengthsCriteria? lengthsCriteria = null, EasyNetQ.Management.Client.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Overview> GetOverviewAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.LengthsCriteria? lengthsCriteria = null, EasyNetQ.Management.Client.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
         public static EasyNetQ.Management.Client.Model.Parameter GetParameter(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Parameter parameter, System.Threading.CancellationToken cancellationToken = default) { }
         public static EasyNetQ.Management.Client.Model.Parameter GetParameter(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string componentName, string parameterName, System.Threading.CancellationToken cancellationToken = default) { }
         public static EasyNetQ.Management.Client.Model.Parameter GetParameter(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string componentName, string parameterName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Parameter> GetParameterAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Parameter parameter, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Parameter> GetParameterAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string componentName, string parameterName, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Parameter> GetParameterAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string componentName, string parameterName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Parameter> GetParameters(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Parameter>> GetParametersAsync(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Permission> GetPermissions(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Permission>> GetPermissionsAsync(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Policy> GetPolicies(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
-        public static EasyNetQ.Management.Client.Model.Queue GetQueue(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.QueueName queue, EasyNetQ.Management.Client.Model.LengthsCriteria? lengthsCriteria = null, EasyNetQ.Management.Client.Model.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
-        public static EasyNetQ.Management.Client.Model.Queue GetQueue(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string queueName, EasyNetQ.Management.Client.Model.LengthsCriteria? lengthsCriteria = null, EasyNetQ.Management.Client.Model.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
-        public static EasyNetQ.Management.Client.Model.Queue GetQueue(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string queueName, EasyNetQ.Management.Client.Model.LengthsCriteria? lengthsCriteria = null, EasyNetQ.Management.Client.Model.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
-        public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Queue> GetQueueAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.QueueName queue, EasyNetQ.Management.Client.Model.LengthsCriteria? lengthsCriteria = null, EasyNetQ.Management.Client.Model.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
-        public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Queue> GetQueueAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string queueName, EasyNetQ.Management.Client.Model.LengthsCriteria? lengthsCriteria = null, EasyNetQ.Management.Client.Model.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Policy>> GetPoliciesAsync(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
+        public static EasyNetQ.Management.Client.Model.Queue GetQueue(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.QueueName queue, EasyNetQ.Management.Client.LengthsCriteria? lengthsCriteria = null, EasyNetQ.Management.Client.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
+        public static EasyNetQ.Management.Client.Model.Queue GetQueue(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string queueName, EasyNetQ.Management.Client.LengthsCriteria? lengthsCriteria = null, EasyNetQ.Management.Client.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
+        public static EasyNetQ.Management.Client.Model.Queue GetQueue(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string queueName, EasyNetQ.Management.Client.LengthsCriteria? lengthsCriteria = null, EasyNetQ.Management.Client.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Queue> GetQueueAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.QueueName queue, EasyNetQ.Management.Client.LengthsCriteria? lengthsCriteria = null, EasyNetQ.Management.Client.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Queue> GetQueueAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string queueName, EasyNetQ.Management.Client.LengthsCriteria? lengthsCriteria = null, EasyNetQ.Management.Client.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Queue> GetQueueAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string queueName, EasyNetQ.Management.Client.LengthsCriteria? lengthsCriteria = null, EasyNetQ.Management.Client.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding> GetQueueBindings(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.ExchangeName exchange, EasyNetQ.Management.Client.Model.QueueName queue, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding> GetQueueBindings(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.ExchangeName exchange, string queueName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding> GetQueueBindings(this EasyNetQ.Management.Client.IManagementClient client, string exchangeName, EasyNetQ.Management.Client.Model.QueueName queue, System.Threading.CancellationToken cancellationToken = default) { }
@@ -298,15 +290,19 @@ namespace EasyNetQ.Management.Client
         public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding>> GetQueueBindingsAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.ExchangeName exchange, string queueName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding>> GetQueueBindingsAsync(this EasyNetQ.Management.Client.IManagementClient client, string exchangeName, EasyNetQ.Management.Client.Model.QueueName queue, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding>> GetQueueBindingsAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string exchangeName, string queueName, System.Threading.CancellationToken cancellationToken = default) { }
-        public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Queue> GetQueues(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
-        public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Queue> GetQueues(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, System.Threading.CancellationToken cancellationToken = default) { }
-        public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Queue> GetQueues(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
-        public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Queue>> GetQueuesAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, System.Threading.CancellationToken cancellationToken = default) { }
-        public static EasyNetQ.Management.Client.Model.PageResult<EasyNetQ.Management.Client.Model.Queue> GetQueuesByPage(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.PageCriteria pageCriteria, System.Threading.CancellationToken cancellationToken = default) { }
-        public static EasyNetQ.Management.Client.Model.PageResult<EasyNetQ.Management.Client.Model.Queue> GetQueuesByPage(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, EasyNetQ.Management.Client.Model.PageCriteria pageCriteria, System.Threading.CancellationToken cancellationToken = default) { }
-        public static EasyNetQ.Management.Client.Model.PageResult<EasyNetQ.Management.Client.Model.Queue> GetQueuesByPage(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, EasyNetQ.Management.Client.Model.PageCriteria pageCriteria, System.Threading.CancellationToken cancellationToken = default) { }
-        public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.PageResult<EasyNetQ.Management.Client.Model.Queue>> GetQueuesByPageAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, EasyNetQ.Management.Client.Model.PageCriteria pageCriteria, System.Threading.CancellationToken cancellationToken = default) { }
-        public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.QueueWithoutStats> GetQueuesWithoutStats(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding>> GetQueueBindingsAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string exchangeName, string queueName, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Queue> GetQueues(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.StatsCriteria? statsCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Queue> GetQueues(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, EasyNetQ.Management.Client.StatsCriteria? statsCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Queue> GetQueues(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, EasyNetQ.Management.Client.StatsCriteria? statsCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Queue>> GetQueuesAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.StatsCriteria? statsCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Queue>> GetQueuesAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, EasyNetQ.Management.Client.StatsCriteria? statsCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Queue>> GetQueuesAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, EasyNetQ.Management.Client.StatsCriteria? statsCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
+        public static EasyNetQ.Management.Client.Model.PageResult<EasyNetQ.Management.Client.Model.Queue> GetQueuesByPage(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.PageCriteria pageCriteria, System.Threading.CancellationToken cancellationToken = default) { }
+        public static EasyNetQ.Management.Client.Model.PageResult<EasyNetQ.Management.Client.Model.Queue> GetQueuesByPage(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, EasyNetQ.Management.Client.PageCriteria pageCriteria, System.Threading.CancellationToken cancellationToken = default) { }
+        public static EasyNetQ.Management.Client.Model.PageResult<EasyNetQ.Management.Client.Model.Queue> GetQueuesByPage(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, EasyNetQ.Management.Client.PageCriteria pageCriteria, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.PageResult<EasyNetQ.Management.Client.Model.Queue>> GetQueuesByPageAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.PageCriteria pageCriteria, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.PageResult<EasyNetQ.Management.Client.Model.Queue>> GetQueuesByPageAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, EasyNetQ.Management.Client.PageCriteria pageCriteria, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.PageResult<EasyNetQ.Management.Client.Model.Queue>> GetQueuesByPageAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, EasyNetQ.Management.Client.PageCriteria pageCriteria, System.Threading.CancellationToken cancellationToken = default) { }
         public static EasyNetQ.Management.Client.Model.Parameter GetShovel(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string shovelName, System.Threading.CancellationToken cancellationToken = default) { }
         public static EasyNetQ.Management.Client.Model.Parameter GetShovel(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string shovelName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Parameter> GetShovelAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string shovelName, System.Threading.CancellationToken cancellationToken = default) { }
@@ -314,34 +310,61 @@ namespace EasyNetQ.Management.Client
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.ShovelStatus> GetShovelStatuses(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.ShovelStatus> GetShovelStatuses(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.ShovelStatus> GetShovelStatuses(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.ShovelStatus>> GetShovelStatusesAsync(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.ShovelStatus>> GetShovelStatusesAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.ShovelStatus>> GetShovelStatusesAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.TopicPermission> GetTopicPermissions(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.TopicPermission>> GetTopicPermissionsAsync(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
         public static EasyNetQ.Management.Client.Model.User GetUser(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.User user, System.Threading.CancellationToken cancellationToken = default) { }
         public static EasyNetQ.Management.Client.Model.User GetUser(this EasyNetQ.Management.Client.IManagementClient client, string userName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.User> GetUserAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.User user, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.User> GetUserAsync(this EasyNetQ.Management.Client.IManagementClient client, string userName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.User> GetUsers(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.User>> GetUsersAsync(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
         public static EasyNetQ.Management.Client.Model.Vhost GetVhost(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, System.Threading.CancellationToken cancellationToken = default) { }
         public static EasyNetQ.Management.Client.Model.Vhost GetVhost(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Vhost> GetVhostAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Vhost> GetVhostAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Vhost> GetVhosts(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Vhost>> GetVhostsAsync(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
         public static bool HaveAnyClassicQueuesWithoutSynchronisedMirrors(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<bool> HaveAnyClassicQueuesWithoutSynchronisedMirrorsAsync(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
         public static bool HaveAnyClusterAlarms(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<bool> HaveAnyClusterAlarmsAsync(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
         public static bool HaveAnyLocalAlarms(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<bool> HaveAnyLocalAlarmsAsync(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
         public static bool HaveAnyQuorumQueuesInCriticalState(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<bool> HaveAnyQuorumQueuesInCriticalStateAsync(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
         public static bool IsAlive(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, System.Threading.CancellationToken cancellationToken = default) { }
         public static bool IsAlive(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task<bool> IsAliveAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<bool> IsAliveAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
+        public static void Post(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.RelativePath path, System.Threading.CancellationToken cancellationToken = default) { }
+        public static void Post<TBody>(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.RelativePath path, TBody item, System.Threading.CancellationToken cancellationToken = default) { }
+        public static TResult Post<TBody, TResult>(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.RelativePath path, TBody item, System.Threading.CancellationToken cancellationToken = default) { }
         public static EasyNetQ.Management.Client.Model.PublishResult Publish(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.ExchangeName exchange, EasyNetQ.Management.Client.Model.PublishInfo publishInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static EasyNetQ.Management.Client.Model.PublishResult Publish(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string exchangeName, EasyNetQ.Management.Client.Model.PublishInfo publishInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static EasyNetQ.Management.Client.Model.PublishResult Publish(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string exchangeName, EasyNetQ.Management.Client.Model.PublishInfo publishInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.PublishResult> PublishAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.ExchangeName exchange, EasyNetQ.Management.Client.Model.PublishInfo publishInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.PublishResult> PublishAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string exchangeName, EasyNetQ.Management.Client.Model.PublishInfo publishInfo, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.PublishResult> PublishAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string exchangeName, EasyNetQ.Management.Client.Model.PublishInfo publishInfo, System.Threading.CancellationToken cancellationToken = default) { }
         public static void Purge(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.QueueName queue, System.Threading.CancellationToken cancellationToken = default) { }
         public static void Purge(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string queueName, System.Threading.CancellationToken cancellationToken = default) { }
         public static void Purge(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string queueName, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task PurgeAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.QueueName queue, System.Threading.CancellationToken cancellationToken = default) { }
         public static System.Threading.Tasks.Task PurgeAsync(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.Model.Vhost vhost, string queueName, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task PurgeAsync(this EasyNetQ.Management.Client.IManagementClient client, string vhostName, string queueName, System.Threading.CancellationToken cancellationToken = default) { }
+        public static void Put(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.RelativePath path, System.Threading.CancellationToken cancellationToken = default) { }
+        public static void Put<TBody>(this EasyNetQ.Management.Client.IManagementClient client, EasyNetQ.Management.Client.RelativePath path, TBody item, System.Threading.CancellationToken cancellationToken = default) { }
         public static void RebalanceQueues(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
+        public static System.Threading.Tasks.Task RebalanceQueuesAsync(this EasyNetQ.Management.Client.IManagementClient client, System.Threading.CancellationToken cancellationToken = default) { }
+    }
+    public class LengthsCriteria : System.IEquatable<EasyNetQ.Management.Client.LengthsCriteria>
+    {
+        public readonly System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, string>> QueryParameters;
+        public LengthsCriteria(int LengthsAge, int LengthsIncr) { }
+        public int LengthsAge { get; init; }
+        public int LengthsIncr { get; init; }
     }
     public class ManagementClient : EasyNetQ.Management.Client.IManagementClient, System.IDisposable
     {
@@ -350,79 +373,47 @@ namespace EasyNetQ.Management.Client
         [System.Obsolete("Please use another constructor")]
         public ManagementClient(string hostUrl, string username, string password, int portNumber = 15672, System.TimeSpan? timeout = default, System.Action<System.Net.Http.HttpRequestMessage>? configureHttpRequestMessage = null, bool ssl = false, System.Action<System.Net.Http.SocketsHttpHandler>? configureHttpHandler = null) { }
         public System.Uri Endpoint { get; }
-        public System.Threading.Tasks.Task CloseConnectionAsync(string connectionName, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task CreateExchangeAsync(string vhostName, string exchangeName, EasyNetQ.Management.Client.Model.ExchangeInfo exchangeInfo, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task CreateExchangeBindingAsync(string vhostName, string sourceExchangeName, string destinationExchangeName, EasyNetQ.Management.Client.Model.BindingInfo bindingInfo, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task CreateParameterAsync(string componentName, string vhostName, string parameterName, object parameterValue, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task CreatePermissionAsync(string vhostName, string userName, EasyNetQ.Management.Client.Model.PermissionInfo permissionInfo, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task CreatePolicyAsync(string vhostName, string policyName, EasyNetQ.Management.Client.Model.PolicyInfo policyInfo, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task CreateQueueAsync(string vhostName, string queueName, EasyNetQ.Management.Client.Model.QueueInfo queueInfo, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task CreateQueueBindingAsync(string vhostName, string exchangeName, string queueName, EasyNetQ.Management.Client.Model.BindingInfo bindingInfo, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task CreateTopicPermissionAsync(string vhostName, string userName, EasyNetQ.Management.Client.Model.TopicPermissionInfo topicPermissionInfo, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task CreateUserAsync(string userName, EasyNetQ.Management.Client.Model.UserInfo userInfo, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task CreateVhostAsync(string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task DeleteExchangeAsync(string vhostName, string exchangeName, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task DeleteExchangeBindingAsync(string vhostName, string sourceExchangeName, string destinationExchangeName, string propertiesKey, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task DeleteParameterAsync(string componentName, string vhostName, string parameterName, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task DeletePermissionAsync(string vhostName, string userName, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task DeletePolicyAsync(string vhostName, string policyName, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task DeleteQueueAsync(string vhostName, string queueName, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task DeleteQueueBindingAsync(string vhostName, string exchangeName, string queueName, string propertiesKey, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task DeleteTopicPermissionAsync(string vhostName, string userName, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task DeleteUserAsync(string userName, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task DeleteVhostAsync(string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task DisableTracingAsync(string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
+        public System.Threading.Tasks.Task<bool> CheckAsync(EasyNetQ.Management.Client.RelativePath path, System.Threading.CancellationToken cancellationToken = default) { }
+        public System.Threading.Tasks.Task DeleteAsync(EasyNetQ.Management.Client.RelativePath path, System.Threading.CancellationToken cancellationToken = default) { }
         public void Dispose() { }
-        public System.Threading.Tasks.Task EnableTracingAsync(string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding>> GetBindingsAsync(System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding>> GetBindingsAsync(string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding>> GetBindingsForQueueAsync(string vhostName, string queueName, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding>> GetBindingsWithDestinationAsync(string vhostName, string exchangeName, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding>> GetBindingsWithSourceAsync(string vhostName, string exchangeName, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Channel> GetChannelAsync(string channelName, EasyNetQ.Management.Client.Model.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Channel>> GetChannelsAsync(System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Channel>> GetChannelsAsync(string connectionName, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Connection>> GetConnectionsAsync(System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Connection>> GetConnectionsAsync(string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Consumer>> GetConsumersAsync(System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Consumer>> GetConsumersAsync(string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Definitions> GetDefinitionsAsync(System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Exchange> GetExchangeAsync(string vhostName, string exchangeName, EasyNetQ.Management.Client.Model.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding>> GetExchangeBindingsAsync(string vhostName, string sourceExchangeName, string destinationExchangeName, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Exchange>> GetExchangesAsync(System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Exchange>> GetExchangesAsync(string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.PageResult<EasyNetQ.Management.Client.Model.Exchange>> GetExchangesByPageAsync(EasyNetQ.Management.Client.Model.PageCriteria pageCriteria, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.PageResult<EasyNetQ.Management.Client.Model.Exchange>> GetExchangesByPageAsync(string vhostName, EasyNetQ.Management.Client.Model.PageCriteria pageCriteria, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Federation>> GetFederationsAsync(System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Message>> GetMessagesFromQueueAsync(string vhostName, string queueName, EasyNetQ.Management.Client.Model.GetMessagesFromQueueInfo getMessagesFromQueueInfo, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Node>> GetNodesAsync(System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Overview> GetOverviewAsync(EasyNetQ.Management.Client.Model.LengthsCriteria? lengthsCriteria = null, EasyNetQ.Management.Client.Model.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Parameter> GetParameterAsync(string vhostName, string componentName, string parameterName, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Parameter>> GetParametersAsync(System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Permission>> GetPermissionsAsync(System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Policy>> GetPoliciesAsync(System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Queue> GetQueueAsync(string vhostName, string queueName, EasyNetQ.Management.Client.Model.LengthsCriteria? lengthsCriteria = null, EasyNetQ.Management.Client.Model.RatesCriteria? ratesCriteria = null, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Binding>> GetQueueBindingsAsync(string vhostName, string exchangeName, string queueName, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Queue>> GetQueuesAsync(System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Queue>> GetQueuesAsync(string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.PageResult<EasyNetQ.Management.Client.Model.Queue>> GetQueuesByPageAsync(EasyNetQ.Management.Client.Model.PageCriteria pageCriteria, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.PageResult<EasyNetQ.Management.Client.Model.Queue>> GetQueuesByPageAsync(string vhostName, EasyNetQ.Management.Client.Model.PageCriteria pageCriteria, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.QueueWithoutStats>> GetQueuesWithoutStatsAsync(System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.ShovelStatus>> GetShovelStatusesAsync(System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.ShovelStatus>> GetShovelStatusesAsync(string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.TopicPermission>> GetTopicPermissionsAsync(System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.User> GetUserAsync(string userName, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.User>> GetUsersAsync(System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.Vhost> GetVhostAsync(string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.Vhost>> GetVhostsAsync(System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<bool> HaveAnyClassicQueuesWithoutSynchronisedMirrorsAsync(System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<bool> HaveAnyClusterAlarmsAsync(System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<bool> HaveAnyLocalAlarmsAsync(System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<bool> HaveAnyQuorumQueuesInCriticalStateAsync(System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<bool> IsAliveAsync(string vhostName, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task<EasyNetQ.Management.Client.Model.PublishResult> PublishAsync(string vhostName, string exchangeName, EasyNetQ.Management.Client.Model.PublishInfo publishInfo, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task PurgeAsync(string vhostName, string queueName, System.Threading.CancellationToken cancellationToken = default) { }
-        public System.Threading.Tasks.Task RebalanceQueuesAsync(System.Threading.CancellationToken cancellationToken = default) { }
+        public System.Threading.Tasks.Task<TResult> GetAsync<TResult>(EasyNetQ.Management.Client.RelativePath path, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, string>>? queryParameters, System.Threading.CancellationToken cancellationToken = default) { }
+        public System.Threading.Tasks.Task PostAsync(EasyNetQ.Management.Client.RelativePath path, System.Threading.CancellationToken cancellationToken = default) { }
+        public System.Threading.Tasks.Task PostAsync<TItem>(EasyNetQ.Management.Client.RelativePath path, TItem item, System.Threading.CancellationToken cancellationToken = default) { }
+        public System.Threading.Tasks.Task<TResult> PostAsync<TItem, TResult>(EasyNetQ.Management.Client.RelativePath path, TItem item, System.Threading.CancellationToken cancellationToken = default) { }
+        public System.Threading.Tasks.Task PutAsync(EasyNetQ.Management.Client.RelativePath path, System.Threading.CancellationToken cancellationToken = default) { }
+        public System.Threading.Tasks.Task PutAsync<TBody>(EasyNetQ.Management.Client.RelativePath path, TBody item, System.Threading.CancellationToken cancellationToken = default) { }
+    }
+    public class PageCriteria : System.IEquatable<EasyNetQ.Management.Client.PageCriteria>
+    {
+        public readonly System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, string>> QueryParameters;
+        public PageCriteria(int Page, int PageSize, string? Name = null, bool UseRegex = false) { }
+        public string? Name { get; init; }
+        public int PageSize { get; init; }
+        public int Page { get; init; }
+        public bool UseRegex { get; init; }
+    }
+    public class RatesCriteria : System.IEquatable<EasyNetQ.Management.Client.RatesCriteria>
+    {
+        public readonly System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, string>> QueryParameters;
+        public RatesCriteria(int MsgRatesAge, int MsgRatesIncr) { }
+        public int MsgRatesAge { get; init; }
+        public int MsgRatesIncr { get; init; }
+    }
+    public readonly struct RelativePath
+    {
+        public RelativePath(string segment) { }
+        public string Build() { }
+        public static EasyNetQ.Management.Client.RelativePath operator /(EasyNetQ.Management.Client.RelativePath parent, char segment) { }
+        public static EasyNetQ.Management.Client.RelativePath operator /(EasyNetQ.Management.Client.RelativePath parent, string segment) { }
+    }
+    public class StatsCriteria : System.IEquatable<EasyNetQ.Management.Client.StatsCriteria>
+    {
+        public readonly System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, string>>? QueryParameters;
+        public static EasyNetQ.Management.Client.StatsCriteria Disable;
+        public static EasyNetQ.Management.Client.StatsCriteria QueueTotalsOnly;
+        public StatsCriteria(bool DisableStats, bool EnableQueueTotals) { }
+        public bool DisableStats { get; init; }
+        public bool EnableQueueTotals { get; init; }
     }
     [System.Serializable]
     public class UnexpectedHttpStatusCodeException : System.Exception
@@ -846,13 +837,6 @@ namespace EasyNetQ.Management.Client.Model
         Manual = 0,
         Automatic = 1,
     }
-    public class LengthsCriteria : System.IEquatable<EasyNetQ.Management.Client.Model.LengthsCriteria>
-    {
-        public LengthsCriteria(int LengthsAge, int LengthsIncr) { }
-        public int LengthsAge { get; init; }
-        public int LengthsIncr { get; init; }
-        public System.Collections.Generic.IReadOnlyDictionary<string, string> ToQueryParameters() { }
-    }
     public class LengthsDetails : System.IEquatable<EasyNetQ.Management.Client.Model.LengthsDetails>
     {
         public LengthsDetails(double Rate, double AvgRate, double Avg, System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.LengthsSample>? Samples = null) { }
@@ -1063,15 +1047,6 @@ namespace EasyNetQ.Management.Client.Model
         public EasyNetQ.Management.Client.Model.QueueTotals QueueTotals { get; init; }
         public string RabbitmqVersion { get; init; }
     }
-    public class PageCriteria : System.IEquatable<EasyNetQ.Management.Client.Model.PageCriteria>
-    {
-        public PageCriteria(int Page, int PageSize, string? Name = null, bool UseRegex = false) { }
-        public string? Name { get; init; }
-        public int PageSize { get; init; }
-        public int Page { get; init; }
-        public bool UseRegex { get; init; }
-        public System.Collections.Generic.IReadOnlyDictionary<string, string> ToQueryParameters() { }
-    }
     public class PageResult<T> : System.IEquatable<EasyNetQ.Management.Client.Model.PageResult<T>>
     {
         public PageResult(int FilteredCount, int ItemCount, System.Collections.Generic.IReadOnlyList<T> Items, int Page, int PageCount, int PageSize, int TotalCount) { }
@@ -1329,7 +1304,7 @@ namespace EasyNetQ.Management.Client.Model
         public PublishResult(bool Routed) { }
         public bool Routed { get; init; }
     }
-    public class Queue : EasyNetQ.Management.Client.Model.QueueWithoutStats, System.IEquatable<EasyNetQ.Management.Client.Model.Queue>
+    public class Queue : EasyNetQ.Management.Client.Model.QueueName, System.IEquatable<EasyNetQ.Management.Client.Model.Queue>
     {
         public Queue(
                     string Name,
@@ -1365,10 +1340,15 @@ namespace EasyNetQ.Management.Client.Model
         [System.Text.Json.Serialization.JsonExtensionData]
         public System.Collections.Generic.IDictionary<string, System.Text.Json.JsonElement>? JsonExtensionData { get; set; }
         public long ActiveConsumers { get; init; }
+        [System.Text.Json.Serialization.JsonConverter(typeof(EasyNetQ.Management.Client.Serialization.StringObjectReadOnlyDictionaryConverter?))]
+        public System.Collections.Generic.IReadOnlyDictionary<string, object?> Arguments { get; init; }
+        public bool AutoDelete { get; init; }
         public EasyNetQ.Management.Client.Model.BackingQueueStatus? BackingQueueStatus { get; init; }
         public System.Collections.Generic.IReadOnlyList<EasyNetQ.Management.Client.Model.ConsumerDetail>? ConsumerDetails { get; init; }
         public long Consumers { get; init; }
+        public bool Durable { get; init; }
         public string? ExclusiveConsumerTag { get; init; }
+        public bool Exclusive { get; init; }
         public long? HeadMessageTimestamp { get; init; }
         public string? IdleSince { get; init; }
         public long Memory { get; init; }
@@ -1376,10 +1356,16 @@ namespace EasyNetQ.Management.Client.Model
         public EasyNetQ.Management.Client.Model.MessageStats? MessageStats { get; init; }
         public EasyNetQ.Management.Client.Model.LengthsDetails? MessagesDetails { get; init; }
         public EasyNetQ.Management.Client.Model.LengthsDetails? MessagesReadyDetails { get; init; }
+        public long MessagesReady { get; init; }
         public EasyNetQ.Management.Client.Model.LengthsDetails? MessagesUnacknowledgedDetails { get; init; }
+        public long MessagesUnacknowledged { get; init; }
+        public long Messages { get; init; }
+        public string? Node { get; init; }
         public string? Policy { get; init; }
         public System.Collections.Generic.IReadOnlyList<string>? SlaveNodes { get; init; }
+        public string? State { get; init; }
         public System.Collections.Generic.IReadOnlyList<string>? SynchronisedSlaveNodes { get; init; }
+        public EasyNetQ.Management.Client.Model.QueueType Type { get; init; }
     }
     public class QueueInfo : System.IEquatable<EasyNetQ.Management.Client.Model.QueueInfo>
     {
@@ -1423,28 +1409,6 @@ namespace EasyNetQ.Management.Client.Model
         V1 = 1,
         V2 = 2,
     }
-    public class QueueWithoutStats : EasyNetQ.Management.Client.Model.QueueName, System.IEquatable<EasyNetQ.Management.Client.Model.QueueWithoutStats>
-    {
-        public QueueWithoutStats(string Name, string Vhost, EasyNetQ.Management.Client.Model.QueueType Type, string? Node, string? State, System.Collections.Generic.IReadOnlyDictionary<string, object?> Arguments, bool Durable, bool Exclusive, bool AutoDelete, long MessagesReady, long MessagesUnacknowledged, long Messages) { }
-        [System.Text.Json.Serialization.JsonConverter(typeof(EasyNetQ.Management.Client.Serialization.StringObjectReadOnlyDictionaryConverter?))]
-        public System.Collections.Generic.IReadOnlyDictionary<string, object?> Arguments { get; init; }
-        public bool AutoDelete { get; init; }
-        public bool Durable { get; init; }
-        public bool Exclusive { get; init; }
-        public long MessagesReady { get; init; }
-        public long MessagesUnacknowledged { get; init; }
-        public long Messages { get; init; }
-        public string? Node { get; init; }
-        public string? State { get; init; }
-        public EasyNetQ.Management.Client.Model.QueueType Type { get; init; }
-    }
-    public class RatesCriteria : System.IEquatable<EasyNetQ.Management.Client.Model.RatesCriteria>
-    {
-        public RatesCriteria(int MsgRatesAge, int MsgRatesIncr) { }
-        public int MsgRatesAge { get; init; }
-        public int MsgRatesIncr { get; init; }
-        public System.Collections.Generic.IReadOnlyDictionary<string, string> ToQueryParameters() { }
-    }
     public class ShovelStatus : System.IEquatable<EasyNetQ.Management.Client.Model.ShovelStatus>
     {
         public ShovelStatus(
diff --git a/Source/EasyNetQ.Management.Client.ExtensionsGenerator/ReplacementExtensionsGenerator.cs b/Source/EasyNetQ.Management.Client.ExtensionsGenerator/ReplacementExtensionsGenerator.cs
index b916cf95..38426081 100644
--- a/Source/EasyNetQ.Management.Client.ExtensionsGenerator/ReplacementExtensionsGenerator.cs
+++ b/Source/EasyNetQ.Management.Client.ExtensionsGenerator/ReplacementExtensionsGenerator.cs
@@ -76,13 +76,14 @@ private static MethodDeclarationSyntax GenerateReplacementExtensionMethod(
             SyntaxFactory.MemberAccessExpression(
                 SyntaxKind.SimpleMemberAccessExpression,
                 SyntaxFactory.IdentifierName(thisParameter.Identifier.Text),
-                SyntaxFactory.IdentifierName(method.Name)
+                method.GetAccessName()
             ),
             SyntaxFactory.ArgumentList(
                 SyntaxFactory.SeparatedList(argumentExpressions.Select(a => SyntaxFactory.Argument(a))))
         );
 
         return SyntaxFactory.MethodDeclaration(method.ReturnType.GetTypeSyntax(), methodName)
+            .WithTypeParameterList(method.GetTypeParameterListSyntax())
             .AddModifiers(SyntaxFactory.Token(SyntaxKind.PublicKeyword), SyntaxFactory.Token(SyntaxKind.StaticKeyword))
             .WithParameterList(SyntaxFactory.ParameterList(parameters))
             .WithExpressionBody(SyntaxFactory.ArrowExpressionClause(expression))
diff --git a/Source/EasyNetQ.Management.Client.ExtensionsGenerator/SyncExtensionsGenerator.cs b/Source/EasyNetQ.Management.Client.ExtensionsGenerator/SyncExtensionsGenerator.cs
index 9c33e60a..eff07e42 100644
--- a/Source/EasyNetQ.Management.Client.ExtensionsGenerator/SyncExtensionsGenerator.cs
+++ b/Source/EasyNetQ.Management.Client.ExtensionsGenerator/SyncExtensionsGenerator.cs
@@ -67,7 +67,7 @@ private static MethodDeclarationSyntax GenerateSyncExtensionMethod(
             SyntaxFactory.MemberAccessExpression(
                 SyntaxKind.SimpleMemberAccessExpression,
                 SyntaxFactory.IdentifierName(thisParameter.Identifier.Text),
-                SyntaxFactory.IdentifierName(method.Name)
+                method.GetAccessName()
             ),
             SyntaxFactory.ArgumentList(
                 SyntaxFactory.SeparatedList(argumentExpressions.Select(a => SyntaxFactory.Argument(a))))
@@ -90,6 +90,7 @@ private static MethodDeclarationSyntax GenerateSyncExtensionMethod(
         method.IsAwaitable(out var awaitableResultType);
 
         return SyntaxFactory.MethodDeclaration(awaitableResultType!.GetTypeSyntax(), methodName)
+            .WithTypeParameterList(method.GetTypeParameterListSyntax())
             .AddModifiers(SyntaxFactory.Token(SyntaxKind.PublicKeyword), SyntaxFactory.Token(SyntaxKind.StaticKeyword))
             .WithParameterList(SyntaxFactory.ParameterList(parameters))
             .WithExpressionBody(SyntaxFactory.ArrowExpressionClause(expression))
diff --git a/Source/EasyNetQ.Management.Client.ExtensionsGenerator/SyntaxExtensions.cs b/Source/EasyNetQ.Management.Client.ExtensionsGenerator/SyntaxExtensions.cs
index e18ce872..147bac1e 100644
--- a/Source/EasyNetQ.Management.Client.ExtensionsGenerator/SyntaxExtensions.cs
+++ b/Source/EasyNetQ.Management.Client.ExtensionsGenerator/SyntaxExtensions.cs
@@ -23,4 +23,22 @@ public static SeparatedSyntaxList<ParameterSyntax> GetParameterListSyntax(this I
     {
         return (SyntaxFactory.ParseMemberDeclaration(method.ToDisplayString(MethodDisplayFormat)) as MethodDeclarationSyntax)!.ParameterList.Parameters;
     }
+
+    public static TypeParameterListSyntax? GetTypeParameterListSyntax(this IMethodSymbol method)
+    {
+        return (SyntaxFactory.ParseMemberDeclaration(method.ToDisplayString(MethodDisplayFormat)) as MethodDeclarationSyntax)!.TypeParameterList;
+    }
+
+    public static SimpleNameSyntax GetAccessName(this IMethodSymbol method)
+    {
+        if (method.IsGenericMethod)
+        {
+            var arguments = method.GetTypeParameterListSyntax()!.Parameters.Select(typeParameter => SyntaxFactory.IdentifierName(typeParameter.Identifier));
+            return SyntaxFactory.GenericName(method.Name).WithTypeArgumentList(SyntaxFactory.TypeArgumentList(SyntaxFactory.SeparatedList<TypeSyntax>(arguments)));
+        }
+        else
+        {
+            return SyntaxFactory.IdentifierName(method.Name);
+        }
+    }
 }
diff --git a/Source/EasyNetQ.Management.Client.IntegrationTests/ManagementClientTests.cs b/Source/EasyNetQ.Management.Client.IntegrationTests/ManagementClientTests.cs
index df44bb05..d65d6b3a 100644
--- a/Source/EasyNetQ.Management.Client.IntegrationTests/ManagementClientTests.cs
+++ b/Source/EasyNetQ.Management.Client.IntegrationTests/ManagementClientTests.cs
@@ -1215,11 +1215,39 @@ public async Task Should_get_queues()
     }
 
     [Fact]
-    public async Task Should_get_queues_without_stats()
+    public async Task Should_get_queues_with_stats_criteria()
     {
-        await CreateTestQueue(TestQueue);
-        var queues = await fixture.ManagementClient.GetQueuesWithoutStatsAsync();
-        queues.Should().NotBeNullOrEmpty();
+        var queue = await CreateTestQueue(TestQueue);
+
+        var publishInfo = new PublishInfo(
+            TestQueue,
+            "Hello World",
+            PayloadEncoding.String,
+            new Dictionary<string, object?>
+            {
+                { "app_id", "management-test" }
+            }
+        );
+
+        await fixture.ManagementClient.PublishAsync("/", "amq.default", publishInfo);
+        Queue queueWithStats;
+        do
+        {
+            queueWithStats = (await fixture.ManagementClient.GetQueuesAsync()).Single(q => q.Name == TestQueue);
+        } while (queueWithStats.Messages == 0);
+        queueWithStats.Messages.Should().Be(1);
+        queueWithStats.MessagesDetails.Should().NotBeNull();
+        queueWithStats.MessageStats.Should().NotBeNull();
+
+        var queueWithoutStats = (await fixture.ManagementClient.GetQueuesAsync(StatsCriteria.Disable)).Single(q => q.Name == TestQueue);
+        queueWithoutStats.Messages.Should().Be(0);
+        queueWithoutStats.MessagesDetails.Should().BeNull();
+        queueWithoutStats.MessageStats.Should().BeNull();
+
+        var queueWithTotalsOnly = (await fixture.ManagementClient.GetQueuesAsync(StatsCriteria.QueueTotalsOnly)).Single(q => q.Name == TestQueue);
+        queueWithTotalsOnly.Messages.Should().Be(1);
+        queueWithTotalsOnly.MessagesDetails.Should().BeNull();
+        queueWithTotalsOnly.MessageStats.Should().BeNull();
     }
 
 
diff --git a/Source/EasyNetQ.Management.Client/IManagementClient.cs b/Source/EasyNetQ.Management.Client/IManagementClient.cs
index b2e30805..e50fdc05 100755
--- a/Source/EasyNetQ.Management.Client/IManagementClient.cs
+++ b/Source/EasyNetQ.Management.Client/IManagementClient.cs
@@ -9,270 +9,466 @@ public interface IManagementClient : IDisposable
     /// </summary>
     Uri Endpoint { get; }
 
+    Task<TResult> GetAsync<TResult>(
+        RelativePath path,
+        IEnumerable<KeyValuePair<string, string>>? queryParameters,
+        CancellationToken cancellationToken = default);
+
+    Task<bool> CheckAsync(
+        RelativePath path,
+        CancellationToken cancellationToken = default);
+
+    Task PutAsync<TBody>(
+        RelativePath path,
+        TBody item,
+        CancellationToken cancellationToken = default);
+    Task PutAsync(
+        RelativePath path,
+        CancellationToken cancellationToken = default);
+
+    Task DeleteAsync(
+        RelativePath path,
+        CancellationToken cancellationToken = default);
+
+    Task<TResult> PostAsync<TBody, TResult>(
+        RelativePath path,
+        TBody item,
+        CancellationToken cancellationToken = default);
+    Task PostAsync<TBody>(
+        RelativePath path,
+        TBody item,
+        CancellationToken cancellationToken = default);
+    Task PostAsync(
+        RelativePath path,
+        CancellationToken cancellationToken = default);
+}
+
+public static partial class IManagementClientExtensions
+{
+    private static readonly RelativePath Api = new("api");
+    private static readonly RelativePath Vhosts = Api / "vhosts";
+    private static readonly RelativePath AlivenessTest = Api / "aliveness-test";
+    private static readonly RelativePath Connections = Api / "connections";
+    private static readonly RelativePath Consumers = Api / "consumers";
+    private static readonly RelativePath Channels = Api / "channels";
+    private static readonly RelativePath Users = Api / "users";
+    private static readonly RelativePath Permissions = Api / "permissions";
+    private static readonly RelativePath Parameters = Api / "parameters";
+    private static readonly RelativePath Bindings = Api / "bindings";
+    private static readonly RelativePath Queues = Api / "queues";
+    private static readonly RelativePath Exchanges = Api / "exchanges";
+    private static readonly RelativePath TopicPermissions = Api / "topic-permissions";
+    private static readonly RelativePath Policies = Api / "policies";
+    private static readonly RelativePath FederationLinks = Api / "federation-links";
+    private static readonly RelativePath Overview = Api / "overview";
+    private static readonly RelativePath Nodes = Api / "nodes";
+    private static readonly RelativePath Definitions = Api / "definitions";
+    private static readonly RelativePath Health = Api / "health";
+    private static readonly RelativePath Rebalance = Api / "rebalance";
+    private static readonly RelativePath ShovelStatuses = Api / "shovels";
+
+    private static IEnumerable<KeyValuePair<string, string>>? ConcatNullableQueryParameters(params IEnumerable<KeyValuePair<string, string>>?[] multipleQueryParameters)
+    {
+        return multipleQueryParameters.All(qp => qp == null) ? null : ConcatQueryParameters(multipleQueryParameters);
+    }
+
+    private static IEnumerable<KeyValuePair<string, string>> ConcatQueryParameters(params IEnumerable<KeyValuePair<string, string>>?[] multipleQueryParameters)
+    {
+        foreach (var queryParameters in multipleQueryParameters)
+        {
+            if (queryParameters == null)
+                continue;
+            foreach (var queryParameter in queryParameters)
+                yield return queryParameter;
+        }
+    }
+
+    public static Task<TResult> GetAsync<TResult>(
+        this IManagementClient client,
+        RelativePath path,
+        CancellationToken cancellationToken = default
+    )
+    {
+        return client.GetAsync<TResult>(path, null, cancellationToken);
+    }
+
     /// <summary>
     ///     Various random bits of information that describe the whole system.
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="lengthsCriteria">Criteria for getting samples of queue length data</param>
     /// <param name="ratesCriteria">Criteria for getting samples of rate data</param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<Overview> GetOverviewAsync(
+    public static Task<Overview> GetOverviewAsync(
+        this IManagementClient client,
         LengthsCriteria? lengthsCriteria = null,
         RatesCriteria? ratesCriteria = null,
         CancellationToken cancellationToken = default
-    );
+    )
+    {
+        var queryParameters =
+            ConcatNullableQueryParameters(lengthsCriteria?.QueryParameters, ratesCriteria?.QueryParameters);
+        return client.GetAsync<Overview>(Overview, queryParameters, cancellationToken);
+    }
 
     /// <summary>
     ///     A list of nodes in the RabbitMQ cluster.
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<IReadOnlyList<Node>> GetNodesAsync(CancellationToken cancellationToken = default);
+    public static Task<IReadOnlyList<Node>> GetNodesAsync(
+        this IManagementClient client,
+        CancellationToken cancellationToken = default
+    ) => client.GetAsync<IReadOnlyList<Node>>(Nodes, cancellationToken);
 
     /// <summary>
     ///     The server definitions - exchanges, queues, bindings, users, virtual hosts, permissions, topic permissions, policies and parameters.
     ///     Everything apart from messages.
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<Definitions> GetDefinitionsAsync(CancellationToken cancellationToken = default);
+    public static Task<Definitions> GetDefinitionsAsync(
+        this IManagementClient client,
+        CancellationToken cancellationToken = default
+    ) => client.GetAsync<Definitions>(Definitions, cancellationToken);
 
     /// <summary>
     ///     A list of all open connections.
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<IReadOnlyList<Connection>> GetConnectionsAsync(CancellationToken cancellationToken = default);
+    public static Task<IReadOnlyList<Connection>> GetConnectionsAsync(
+        this IManagementClient client,
+        CancellationToken cancellationToken = default
+    ) => client.GetAsync<IReadOnlyList<Connection>>(Connections, cancellationToken);
 
     /// <summary>
     ///     A list of all open connections on the specified VHost.
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<IReadOnlyList<Connection>> GetConnectionsAsync(string vhostName, CancellationToken cancellationToken = default);
+    public static Task<IReadOnlyList<Connection>> GetConnectionsAsync(
+        this IManagementClient client,
+        string vhostName,
+        CancellationToken cancellationToken = default
+    ) => client.GetAsync<IReadOnlyList<Connection>>(Vhosts / vhostName / "connections", cancellationToken);
 
     /// <summary>
     ///     A list of all open channels.
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<IReadOnlyList<Channel>> GetChannelsAsync(CancellationToken cancellationToken = default);
+    public static Task<IReadOnlyList<Channel>> GetChannelsAsync(
+        this IManagementClient client,
+        CancellationToken cancellationToken = default
+    ) => client.GetAsync<IReadOnlyList<Channel>>(Channels, cancellationToken);
 
     /// <summary>
     ///     A list of all open channels for the given connection.
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="connectionName"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<IReadOnlyList<Channel>> GetChannelsAsync(
+    public static Task<IReadOnlyList<Channel>> GetChannelsAsync(
+        this IManagementClient client,
         string connectionName,
         CancellationToken cancellationToken = default
-    );
+    ) => client.GetAsync<IReadOnlyList<Channel>>(Connections / connectionName / "channels", cancellationToken);
 
     /// <summary>
     ///     Gets the channel. This returns more detail, including consumers than the GetChannels method.
     /// </summary>
     /// <returns>The channel.</returns>
+    /// <param name="client"></param>
     /// <param name="channelName">Channel name.</param>
     /// <param name="ratesCriteria">Criteria for getting samples of rate data</param>
     /// <param name="cancellationToken"></param>
-    Task<Channel> GetChannelAsync(
+    public static Task<Channel> GetChannelAsync(
+        this IManagementClient client,
         string channelName,
         RatesCriteria? ratesCriteria = null,
         CancellationToken cancellationToken = default
-    );
+    ) => client.GetAsync<Channel>(Channels / channelName, ratesCriteria?.QueryParameters, cancellationToken);
 
     /// <summary>
     ///     A list of all exchanges.
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<IReadOnlyList<Exchange>> GetExchangesAsync(CancellationToken cancellationToken = default);
+    public static Task<IReadOnlyList<Exchange>> GetExchangesAsync(
+        this IManagementClient client,
+        CancellationToken cancellationToken = default
+    ) => client.GetAsync<IReadOnlyList<Exchange>>(Exchanges, cancellationToken);
 
     /// <summary>
     ///     A list of exchanges for a page.
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="pageCriteria"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<PageResult<Exchange>> GetExchangesByPageAsync(PageCriteria pageCriteria, CancellationToken cancellationToken = default);
+    public static Task<PageResult<Exchange>> GetExchangesByPageAsync(
+        this IManagementClient client,
+        PageCriteria pageCriteria,
+        CancellationToken cancellationToken = default
+    ) => client.GetAsync<PageResult<Exchange>>(Exchanges, pageCriteria.QueryParameters, cancellationToken);
 
     /// <summary>
     ///     A list of all exchanges for a virtual host.
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<IReadOnlyList<Exchange>> GetExchangesAsync(string vhostName, CancellationToken cancellationToken = default);
+    public static Task<IReadOnlyList<Exchange>> GetExchangesAsync(
+        this IManagementClient client,
+        string vhostName,
+        CancellationToken cancellationToken = default
+    ) => client.GetAsync<IReadOnlyList<Exchange>>(Exchanges / vhostName, cancellationToken);
 
     /// <summary>
     ///     A list of exchanges for a page for a virtual host.
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName"></param>
     /// <param name="pageCriteria"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<PageResult<Exchange>> GetExchangesByPageAsync(string vhostName, PageCriteria pageCriteria, CancellationToken cancellationToken = default);
+    public static Task<PageResult<Exchange>> GetExchangesByPageAsync(
+        this IManagementClient client,
+        string vhostName,
+        PageCriteria pageCriteria,
+        CancellationToken cancellationToken = default
+    ) => client.GetAsync<PageResult<Exchange>>(Exchanges / vhostName, pageCriteria.QueryParameters, cancellationToken);
 
     /// <summary>
     ///     A list of all queues.
     /// </summary>
+    /// <param name="client"></param>
+    /// <param name="statsCriteria"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<IReadOnlyList<Queue>> GetQueuesAsync(CancellationToken cancellationToken = default);
+    public static Task<IReadOnlyList<Queue>> GetQueuesAsync(
+        this IManagementClient client,
+        StatsCriteria? statsCriteria = null,
+        CancellationToken cancellationToken = default
+    ) => client.GetAsync<IReadOnlyList<Queue>>(Queues, statsCriteria?.QueryParameters, cancellationToken);
 
     /// <summary>
     ///     A list of queues for a page.
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="pageCriteria"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<PageResult<Queue>> GetQueuesByPageAsync(PageCriteria pageCriteria, CancellationToken cancellationToken = default);
+    public static Task<PageResult<Queue>> GetQueuesByPageAsync(
+        this IManagementClient client,
+        PageCriteria pageCriteria,
+        CancellationToken cancellationToken = default
+    ) => client.GetAsync<PageResult<Queue>>(Queues, pageCriteria.QueryParameters, cancellationToken);
 
     /// <summary>
     ///     A list of all queues for a virtual host.
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName"></param>
+    /// <param name="statsCriteria"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<IReadOnlyList<Queue>> GetQueuesAsync(string vhostName, CancellationToken cancellationToken = default);
+    public static Task<IReadOnlyList<Queue>> GetQueuesAsync(
+        this IManagementClient client,
+        string vhostName,
+        StatsCriteria? statsCriteria = null,
+        CancellationToken cancellationToken = default
+    ) => client.GetAsync<IReadOnlyList<Queue>>(Queues / vhostName, statsCriteria?.QueryParameters, cancellationToken);
 
     /// <summary>
     ///     A list of queues for a page for a virtual host.
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName"></param>
     /// <param name="pageCriteria"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<PageResult<Queue>> GetQueuesByPageAsync(string vhostName, PageCriteria pageCriteria, CancellationToken cancellationToken = default);
-
-    /// <summary>
-    ///     A list of all queues.
-    /// </summary>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    Task<IReadOnlyList<QueueWithoutStats>> GetQueuesWithoutStatsAsync(CancellationToken cancellationToken = default);
+    public static Task<PageResult<Queue>> GetQueuesByPageAsync(
+        this IManagementClient client,
+        string vhostName,
+        PageCriteria pageCriteria,
+        CancellationToken cancellationToken = default
+    ) => client.GetAsync<PageResult<Queue>>(Queues / vhostName, pageCriteria.QueryParameters, cancellationToken);
 
     /// <summary>
     ///     A list of all bindings.
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<IReadOnlyList<Binding>> GetBindingsAsync(CancellationToken cancellationToken = default);
+    public static Task<IReadOnlyList<Binding>> GetBindingsAsync(
+        this IManagementClient client,
+        CancellationToken cancellationToken = default
+    ) => client.GetAsync<IReadOnlyList<Binding>>(Bindings, cancellationToken);
 
     /// <summary>
     ///     A list of all bindings within the specified VHost.
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<IReadOnlyList<Binding>> GetBindingsAsync(string vhostName, CancellationToken cancellationToken = default);
+    public static Task<IReadOnlyList<Binding>> GetBindingsAsync(
+        this IManagementClient client,
+        string vhostName,
+        CancellationToken cancellationToken = default
+    ) => client.GetAsync<IReadOnlyList<Binding>>(Bindings / vhostName, cancellationToken);
 
     /// <summary>
     ///     A list of all vhosts.
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<IReadOnlyList<Vhost>> GetVhostsAsync(CancellationToken cancellationToken = default);
+    public static Task<IReadOnlyList<Vhost>> GetVhostsAsync(
+        this IManagementClient client,
+        CancellationToken cancellationToken = default
+    ) => client.GetAsync<IReadOnlyList<Vhost>>(Vhosts, cancellationToken);
 
     /// <summary>
     ///     A list of all users.
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<IReadOnlyList<User>> GetUsersAsync(CancellationToken cancellationToken = default);
+    public static Task<IReadOnlyList<User>> GetUsersAsync(
+        this IManagementClient client,
+        CancellationToken cancellationToken = default
+    ) => client.GetAsync<IReadOnlyList<User>>(Users, cancellationToken);
 
     /// <summary>
     ///     A list of all permissions for all users.
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<IReadOnlyList<Permission>> GetPermissionsAsync(CancellationToken cancellationToken = default);
+    public static Task<IReadOnlyList<Permission>> GetPermissionsAsync(
+        this IManagementClient client,
+        CancellationToken cancellationToken = default
+    ) => client.GetAsync<IReadOnlyList<Permission>>(Permissions, cancellationToken);
 
     /// <summary>
     ///     A list of all topic permissions for all users.
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<IReadOnlyList<TopicPermission>> GetTopicPermissionsAsync(CancellationToken cancellationToken = default);
+    public static Task<IReadOnlyList<TopicPermission>> GetTopicPermissionsAsync(
+        this IManagementClient client,
+        CancellationToken cancellationToken = default
+    ) => client.GetAsync<IReadOnlyList<TopicPermission>>(TopicPermissions, cancellationToken);
 
     /// <summary>
     ///     A list of all consumers.
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<IReadOnlyList<Consumer>> GetConsumersAsync(CancellationToken cancellationToken = default);
+    public static Task<IReadOnlyList<Consumer>> GetConsumersAsync(
+        this IManagementClient client,
+        CancellationToken cancellationToken = default
+    ) => client.GetAsync<IReadOnlyList<Consumer>>(Consumers, cancellationToken);
 
     /// <summary>
     ///     A list of all consumers for the specified VHost.
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<IReadOnlyList<Consumer>> GetConsumersAsync(string vhostName, CancellationToken cancellationToken = default);
+    public static Task<IReadOnlyList<Consumer>> GetConsumersAsync(
+        this IManagementClient client,
+        string vhostName,
+        CancellationToken cancellationToken = default
+    ) => client.GetAsync<IReadOnlyList<Consumer>>(Consumers / vhostName, cancellationToken);
 
     /// <summary>
     ///     Closes the given connection
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="connectionName"></param>
     /// <param name="cancellationToken"></param>
-    Task CloseConnectionAsync(
+    public static Task CloseConnectionAsync(
+        this IManagementClient client,
         string connectionName,
         CancellationToken cancellationToken = default
-    );
+    ) => client.DeleteAsync(Connections / connectionName, cancellationToken);
 
     /// <summary>
     ///     Creates the given exchange
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName"></param>
     /// <param name="exchangeName"></param>
     /// <param name="exchangeInfo"></param>
     /// <param name="cancellationToken"></param>
-    Task CreateExchangeAsync(
+    public static Task CreateExchangeAsync(
+        this IManagementClient client,
         string vhostName,
         string exchangeName,
         ExchangeInfo exchangeInfo,
         CancellationToken cancellationToken = default
-    );
+    ) => client.PutAsync(Exchanges / vhostName / exchangeName, exchangeInfo, cancellationToken);
 
     /// <summary>
     ///     Delete the given exchange
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName"></param>
     /// <param name="exchangeName"></param>
     /// <param name="cancellationToken"></param>
-    Task DeleteExchangeAsync(
+    public static Task DeleteExchangeAsync(
+        this IManagementClient client,
         string vhostName,
         string exchangeName,
         CancellationToken cancellationToken = default
-    );
+    ) => client.DeleteAsync(Exchanges / vhostName / exchangeName, cancellationToken);
 
     /// <summary>
     ///     A list of all bindings in which a given exchange is the source.
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName"></param>
     /// <param name="exchangeName"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<IReadOnlyList<Binding>> GetBindingsWithSourceAsync(
+    public static Task<IReadOnlyList<Binding>> GetBindingsWithSourceAsync(
+        this IManagementClient client,
         string vhostName,
         string exchangeName,
         CancellationToken cancellationToken = default
-    );
+    ) => client.GetAsync<IReadOnlyList<Binding>>(Exchanges / vhostName / exchangeName / "bindings" / "source", cancellationToken);
 
     /// <summary>
     ///     A list of all bindings in which a given exchange is the destination.
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName"></param>
     /// <param name="exchangeName"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<IReadOnlyList<Binding>> GetBindingsWithDestinationAsync(
+    public static Task<IReadOnlyList<Binding>> GetBindingsWithDestinationAsync(
+        this IManagementClient client,
         string vhostName,
         string exchangeName,
         CancellationToken cancellationToken = default
-    );
+    ) => client.GetAsync<IReadOnlyList<Binding>>(Exchanges / vhostName / exchangeName / "bindings" / "destination", cancellationToken);
 
     /// <summary>
     ///     Publish a message to a given exchange.
@@ -280,67 +476,77 @@ Task<IReadOnlyList<Binding>> GetBindingsWithDestinationAsync(
     ///     test messages, diagnostics etc - they do not implement reliable delivery and so should
     ///     be treated as a sysadmin's tool rather than a general API for messaging.
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName">The vhost</param>
     /// <param name="exchangeName">The exchange</param>
     /// <param name="publishInfo">The publication parameters</param>
     /// <param name="cancellationToken"></param>
     /// <returns>A PublishResult, routed == true if the message was sent to at least one queue</returns>
-    Task<PublishResult> PublishAsync(
+    public static Task<PublishResult> PublishAsync(
+        this IManagementClient client,
         string vhostName,
         string exchangeName,
         PublishInfo publishInfo,
         CancellationToken cancellationToken = default
-    );
+    ) => client.PostAsync<PublishInfo, PublishResult>(Exchanges / vhostName / exchangeName / "publish", publishInfo, cancellationToken);
 
     /// <summary>
     ///     Create the given queue
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName"></param>
     /// <param name="queueName"></param>
     /// <param name="queueInfo"></param>
     /// <param name="cancellationToken"></param>
-    Task CreateQueueAsync(
+    public static Task CreateQueueAsync(
+        this IManagementClient client,
         string vhostName,
         string queueName,
         QueueInfo queueInfo,
         CancellationToken cancellationToken = default
-    );
+    ) => client.PutAsync(Queues / vhostName / queueName, queueInfo, cancellationToken);
 
     /// <summary>
     ///     Delete the given queue
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName"></param>
     /// <param name="queueName"></param>
     /// <param name="cancellationToken"></param>
-    Task DeleteQueueAsync(
+    public static Task DeleteQueueAsync(
+        this IManagementClient client,
         string vhostName,
         string queueName,
         CancellationToken cancellationToken = default
-    );
+    ) => client.DeleteAsync(Queues / vhostName / queueName, cancellationToken);
 
     /// <summary>
     ///     A list of all bindings on a given queue.
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName"></param>
     /// <param name="queueName"></param>
     /// <param name="cancellationToken"></param>
-    Task<IReadOnlyList<Binding>> GetBindingsForQueueAsync(
+    public static Task<IReadOnlyList<Binding>> GetBindingsForQueueAsync(
+        this IManagementClient client,
         string vhostName,
         string queueName,
         CancellationToken cancellationToken = default
-    );
+    ) => client.GetAsync<IReadOnlyList<Binding>>(Queues / vhostName / queueName / "bindings", cancellationToken);
 
     /// <summary>
     ///     Purge a queue of all messages
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName"></param>
     /// <param name="queueName"></param>
     /// <param name="cancellationToken"></param>
-    Task PurgeAsync(
+    public static Task PurgeAsync(
+        this IManagementClient client,
         string vhostName,
         string queueName,
         CancellationToken cancellationToken = default
-    );
+    ) => client.DeleteAsync(Queues / vhostName / queueName / "contents", cancellationToken);
 
     /// <summary>
     ///     Get messages from a queue.
@@ -349,225 +555,262 @@ Task PurgeAsync(
     ///     delivery and so should be treated as a sysadmin's tool rather than a
     ///     general API for messaging.
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName"></param>
     /// <param name="queueName">The queue to retrieve from</param>
     /// <param name="getMessagesFromQueueInfo">The criteria for the retrieve</param>
     /// <param name="cancellationToken"></param>
     /// <returns>Messages</returns>
-    Task<IReadOnlyList<Message>> GetMessagesFromQueueAsync(
+    public static Task<IReadOnlyList<Message>> GetMessagesFromQueueAsync(
+        this IManagementClient client,
         string vhostName,
         string queueName,
         GetMessagesFromQueueInfo getMessagesFromQueueInfo,
         CancellationToken cancellationToken = default
-    );
+    ) => client.PostAsync<GetMessagesFromQueueInfo, IReadOnlyList<Message>>(Queues / vhostName / queueName / "get", getMessagesFromQueueInfo, cancellationToken);
 
     /// <summary>
     ///     Create a binding between an exchange and a queue
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName">the vhost</param>
     /// <param name="exchangeName">the exchange</param>
     /// <param name="queueName">the queue</param>
     /// <param name="bindingInfo">properties of the binding</param>
     /// <param name="cancellationToken"></param>
     /// <returns>The binding that was created</returns>
-    Task CreateQueueBindingAsync(
+    public static Task CreateQueueBindingAsync(
+        this IManagementClient client,
         string vhostName,
         string exchangeName,
         string queueName,
         BindingInfo bindingInfo,
         CancellationToken cancellationToken = default
-    );
+    ) => client.PostAsync(Bindings / vhostName / "e" / exchangeName / "q" / queueName, bindingInfo, cancellationToken);
 
     /// <summary>
     ///     Create a binding between an exchange and an exchange
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName">the vhost</param>
     /// <param name="sourceExchangeName">the source exchange</param>
     /// <param name="destinationExchangeName">the destination exchange</param>
     /// <param name="bindingInfo">properties of the binding</param>
     /// <param name="cancellationToken"></param>
-    Task CreateExchangeBindingAsync(
+    public static Task CreateExchangeBindingAsync(
+        this IManagementClient client,
         string vhostName,
         string sourceExchangeName,
         string destinationExchangeName,
         BindingInfo bindingInfo,
         CancellationToken cancellationToken = default
-    );
+    ) => client.PostAsync(Bindings / vhostName / "e" / sourceExchangeName / "e" / destinationExchangeName, bindingInfo, cancellationToken);
 
     /// <summary>
     ///     A list of all bindings between an exchange and a queue.
     ///     Remember, an exchange and a queue can be bound together many times!
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName"></param>
     /// <param name="exchangeName"></param>
     /// <param name="queueName"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<IReadOnlyList<Binding>> GetQueueBindingsAsync(
+    public static Task<IReadOnlyList<Binding>> GetQueueBindingsAsync(
+        this IManagementClient client,
         string vhostName,
         string exchangeName,
         string queueName,
         CancellationToken cancellationToken = default
-    );
+    ) => client.GetAsync<IReadOnlyList<Binding>>(Bindings / vhostName / "e" / exchangeName / "q" / queueName, cancellationToken);
 
     /// <summary>
     ///     A list of all bindings between an exchange and an exchange.
     ///     Remember, an exchange and a exchange can be bound together many times!
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName"></param>
     /// <param name="sourceExchangeName"></param>
     /// <param name="destinationExchangeName"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<IReadOnlyList<Binding>> GetExchangeBindingsAsync(
+    public static Task<IReadOnlyList<Binding>> GetExchangeBindingsAsync(
+        this IManagementClient client,
         string vhostName,
         string sourceExchangeName,
         string destinationExchangeName,
         CancellationToken cancellationToken = default
-    );
+    ) => client.GetAsync<IReadOnlyList<Binding>>(Bindings / vhostName / "e" / sourceExchangeName / "e" / destinationExchangeName, cancellationToken);
 
     /// <summary>
     ///     Delete the given binding
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName"></param>
     /// <param name="exchangeName"></param>
     /// <param name="queueName"></param>
     /// <param name="propertiesKey"></param>
     /// <param name="cancellationToken"></param>
-    Task DeleteQueueBindingAsync(
+    public static Task DeleteQueueBindingAsync(
+        this IManagementClient client,
         string vhostName,
         string exchangeName,
         string queueName,
         string propertiesKey,
         CancellationToken cancellationToken = default
-    );
+    ) => client.DeleteAsync(Bindings / vhostName / "e" / exchangeName / "q" / queueName / propertiesKey, cancellationToken);
 
     /// <summary>
     ///     Delete the given binding
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName"></param>
     /// <param name="sourceExchangeName"></param>
     /// <param name="destinationExchangeName"></param>
     /// <param name="propertiesKey"></param>
     /// <param name="cancellationToken"></param>
-    Task DeleteExchangeBindingAsync(
+    public static Task DeleteExchangeBindingAsync(
+        this IManagementClient client,
         string vhostName,
         string sourceExchangeName,
         string destinationExchangeName,
         string propertiesKey,
         CancellationToken cancellationToken = default
-    );
+    ) => client.DeleteAsync(Bindings / vhostName / "e" / sourceExchangeName / "e" / destinationExchangeName / propertiesKey, cancellationToken);
 
     /// <summary>
     ///     Create a new virtual host
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName">The name of the new virtual host</param>
     /// <param name="cancellationToken"></param>
-    Task CreateVhostAsync(string vhostName, CancellationToken cancellationToken = default);
+    public static Task CreateVhostAsync(
+        this IManagementClient client,
+        string vhostName,
+        CancellationToken cancellationToken = default
+    ) => client.PutAsync(Vhosts / vhostName, cancellationToken);
 
     /// <summary>
     ///     Delete a virtual host
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName">The virtual host to delete</param>
     /// <param name="cancellationToken"></param>
-    Task DeleteVhostAsync(
+    public static Task DeleteVhostAsync(
+        this IManagementClient client,
         string vhostName,
         CancellationToken cancellationToken = default
-    );
+    ) => client.DeleteAsync(Vhosts / vhostName, cancellationToken);
 
     /// <summary>
     ///     Enable tracing on given virtual host.
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName">The virtual host on which to enable tracing</param>
     /// <param name="cancellationToken"></param>
-    Task EnableTracingAsync(
+    public static Task EnableTracingAsync(
+        this IManagementClient client,
         string vhostName,
         CancellationToken cancellationToken = default
-    );
+    ) => client.PutAsync(Vhosts / vhostName, new { Tracing = true }, cancellationToken);
 
     /// <summary>
     ///     Disables tracing on given virtual host.
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName">The virtual host on which to disable tracing</param>
     /// <param name="cancellationToken"></param>
-    Task DisableTracingAsync(
+    public static Task DisableTracingAsync(
+        this IManagementClient client,
         string vhostName,
         CancellationToken cancellationToken = default
-    );
+    ) => client.PutAsync(Vhosts / vhostName, new { Tracing = false }, cancellationToken);
 
     /// <summary>
     ///     Create a new user
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="userName">The user name to create</param>
     /// <param name="userInfo">The user info to create</param>
     /// <param name="cancellationToken"></param>
-    Task CreateUserAsync(
+    public static Task CreateUserAsync(
+        this IManagementClient client,
         string userName,
         UserInfo userInfo,
         CancellationToken cancellationToken = default
-    );
+    ) => client.PutAsync(Users / userName, userInfo, cancellationToken);
 
     /// <summary>
     ///     Delete a user
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="userName">The user to delete</param>
     /// <param name="cancellationToken"></param>
-    Task DeleteUserAsync(
+    public static Task DeleteUserAsync(
+        this IManagementClient client,
         string userName,
         CancellationToken cancellationToken = default
-    );
+    ) => client.DeleteAsync(Users / userName, cancellationToken);
 
     /// <summary>
     ///     Create a permission
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName"></param>
     /// <param name="userName"></param>
     /// <param name="permissionInfo"></param>
     /// <param name="cancellationToken"></param>
-    Task CreatePermissionAsync(
+    public static Task CreatePermissionAsync(
+        this IManagementClient client,
         string vhostName,
         string userName,
         PermissionInfo permissionInfo,
         CancellationToken cancellationToken = default
-    );
+    ) => client.PutAsync(Permissions / vhostName / userName, permissionInfo, cancellationToken);
 
     /// <summary>
     ///     Delete a permission
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName"></param>
     /// <param name="userName"></param>
     /// <param name="cancellationToken"></param>
-    Task DeletePermissionAsync(
+    public static Task DeletePermissionAsync(
+        this IManagementClient client,
         string vhostName,
         string userName,
         CancellationToken cancellationToken = default
-    );
+    ) => client.DeleteAsync(Permissions / vhostName / userName, cancellationToken);
 
     /// <summary>
     ///     Create a topic permission
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName"></param>
     /// <param name="userName"></param>
     /// <param name="topicPermissionInfo"></param>
     /// <param name="cancellationToken"></param>
-    Task CreateTopicPermissionAsync(
+    public static Task CreateTopicPermissionAsync(
+        this IManagementClient client,
         string vhostName,
         string userName,
         TopicPermissionInfo topicPermissionInfo,
         CancellationToken cancellationToken = default
-    );
+    ) => client.PutAsync(TopicPermissions / vhostName / userName, topicPermissionInfo, cancellationToken);
 
     /// <summary>
     ///     Delete a topic permission
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName"></param>
     /// <param name="userName"></param>
     /// <param name="cancellationToken"></param>
-    Task DeleteTopicPermissionAsync(
+    public static Task DeleteTopicPermissionAsync(
+        this IManagementClient client,
         string vhostName,
         string userName,
         CancellationToken cancellationToken = default
-    );
+    ) => client.DeleteAsync(TopicPermissions / vhostName / userName, cancellationToken);
 
     /// <summary>
     ///     Declares a test queue, then publishes and consumes a message. Intended for use
@@ -575,205 +818,272 @@ Task DeleteTopicPermissionAsync(
     ///     Note: the test queue will not be deleted (to prevent queue churn if this
     ///     is repeatedly pinged).
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName"></param>
     /// <param name="cancellationToken"></param>
-    Task<bool> IsAliveAsync(
+    public static Task<bool> IsAliveAsync(
+        this IManagementClient client,
         string vhostName,
         CancellationToken cancellationToken = default
-    );
+    ) => client.CheckAsync(AlivenessTest / vhostName, cancellationToken);
 
     /// <summary>
     ///     Get an individual exchange by name
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName">The virtual host that contains the exchange</param>
     /// <param name="exchangeName">The name of the exchange</param>
     /// <param name="ratesCriteria">Criteria for getting samples of rate data</param>
     /// <param name="cancellationToken"></param>
     /// <returns>The exchange</returns>
-    Task<Exchange> GetExchangeAsync(
+    public static Task<Exchange> GetExchangeAsync(
+        this IManagementClient client,
         string vhostName,
         string exchangeName,
         RatesCriteria? ratesCriteria = null,
         CancellationToken cancellationToken = default
-    );
+    ) => client.GetAsync<Exchange>(Exchanges / vhostName / exchangeName, ratesCriteria?.QueryParameters, cancellationToken);
 
     /// <summary>
     ///     Get an individual queue by name
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="queueName">The name of the queue</param>
     /// <param name="vhostName">The virtual host that contains the queue</param>
     /// <param name="lengthsCriteria">Criteria for getting samples of queue length data</param>
     /// <param name="ratesCriteria">Criteria for getting samples of rate data</param>
     /// <param name="cancellationToken"></param>
     /// <returns>The Queue</returns>
-    Task<Queue> GetQueueAsync(
+    public static Task<Queue> GetQueueAsync(
+        this IManagementClient client,
         string vhostName,
         string queueName,
         LengthsCriteria? lengthsCriteria = null,
         RatesCriteria? ratesCriteria = null,
         CancellationToken cancellationToken = default
-    );
+    )
+    {
+        var queryParameters =
+            ConcatNullableQueryParameters(lengthsCriteria?.QueryParameters, ratesCriteria?.QueryParameters);
+        return client.GetAsync<Queue>(Queues / vhostName / queueName, queryParameters, cancellationToken);
+    }
 
     /// <summary>
     ///     Get an individual vhost by name
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName">The VHost</param>
     /// <param name="cancellationToken"></param>
-    Task<Vhost> GetVhostAsync(
+    public static Task<Vhost> GetVhostAsync(
+        this IManagementClient client,
         string vhostName,
         CancellationToken cancellationToken = default
-    );
+    ) => client.GetAsync<Vhost>(Vhosts / vhostName, cancellationToken);
 
     /// <summary>
     ///     Get a user by name
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="userName">The name of the user</param>
     /// <param name="cancellationToken"></param>
     /// <returns>The User</returns>
-    Task<User> GetUserAsync(
+    public static Task<User> GetUserAsync(
+        this IManagementClient client,
         string userName,
         CancellationToken cancellationToken = default
-    );
+    ) => client.GetAsync<User>(Users / userName, cancellationToken);
 
     /// <summary>
     ///     Get collection of Policies on the cluster
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="cancellationToken"></param>
     /// <returns>Policies</returns>
-    Task<IReadOnlyList<Policy>> GetPoliciesAsync(CancellationToken cancellationToken = default);
+    public static Task<IReadOnlyList<Policy>> GetPoliciesAsync(
+        this IManagementClient client,
+        CancellationToken cancellationToken = default
+    ) => client.GetAsync<IReadOnlyList<Policy>>(Policies, cancellationToken);
 
     /// <summary>
     ///     Creates a policy on the cluster
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName"></param>
     /// <param name="policyName"></param>
     /// <param name="policyInfo"></param>
     /// <param name="cancellationToken"></param>
-    Task CreatePolicyAsync(
+    public static Task CreatePolicyAsync(
+        this IManagementClient client,
         string vhostName,
         string policyName,
         PolicyInfo policyInfo,
         CancellationToken cancellationToken = default
-    );
+    ) => client.PutAsync(Policies / vhostName / policyName, policyInfo, cancellationToken);
 
     /// <summary>
     ///     Delete a policy from the cluster
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName">vhost on which the policy resides</param>
     /// <param name="policyName">Policy name</param>
     /// <param name="cancellationToken"></param>
-    Task DeletePolicyAsync(
+    public static Task DeletePolicyAsync(
+        this IManagementClient client,
         string vhostName,
         string policyName,
         CancellationToken cancellationToken = default
-    );
+    ) => client.DeleteAsync(Policies / vhostName / policyName, cancellationToken);
 
     /// <summary>
     ///     Get specific parameters on the cluster
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName"></param>
     /// <param name="componentName"></param>
     /// <param name="parameterName"></param>
     /// <param name="cancellationToken"></param>
-    public Task<Parameter> GetParameterAsync(
+    public static Task<Parameter> GetParameterAsync(
+        this IManagementClient client,
         string vhostName,
         string componentName,
         string parameterName,
         CancellationToken cancellationToken = default
-    );
+    ) => client.GetAsync<Parameter>(Parameters / componentName / vhostName / parameterName, cancellationToken);
 
     /// <summary>
     ///     Get all parameters on the cluster
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="cancellationToken"></param>
-    Task<IReadOnlyList<Parameter>> GetParametersAsync(CancellationToken cancellationToken = default);
+    public static Task<IReadOnlyList<Parameter>> GetParametersAsync(
+        this IManagementClient client,
+        CancellationToken cancellationToken = default
+    ) => client.GetAsync<IReadOnlyList<Parameter>>(Parameters, cancellationToken);
 
     /// <summary>
     ///     Creates a parameter on the cluster
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="componentName"></param>
     /// <param name="vhostName"></param>
     /// <param name="parameterName"></param>
     /// <param name="parameterValue"></param>
     /// <param name="cancellationToken"></param>
-    Task CreateParameterAsync(
+    public static Task CreateParameterAsync(
+        this IManagementClient client,
         string componentName,
         string vhostName,
         string parameterName,
         object parameterValue,
         CancellationToken cancellationToken = default
-    );
+    ) => client.PutAsync(Parameters / componentName / vhostName / parameterName, new { Value = parameterValue }, cancellationToken);
 
     /// <summary>
     ///     Delete a parameter from the cluster
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="componentName"></param>
     /// <param name="vhostName"></param>
     /// <param name="parameterName"></param>
     /// <param name="cancellationToken"></param>
-    Task DeleteParameterAsync(
+    public static Task DeleteParameterAsync(
+        this IManagementClient client,
         string componentName,
         string vhostName,
         string parameterName,
         CancellationToken cancellationToken = default
-    );
+    ) => client.DeleteAsync(Parameters / componentName / vhostName / parameterName, cancellationToken);
 
     /// <summary>
     ///     Get list of federations
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<IReadOnlyList<Federation>> GetFederationsAsync(CancellationToken cancellationToken = default);
+    public static Task<IReadOnlyList<Federation>> GetFederationsAsync(
+        this IManagementClient client,
+        CancellationToken cancellationToken = default
+    ) => client.GetAsync<IReadOnlyList<Federation>>(FederationLinks, cancellationToken);
 
     /// <summary>
     ///     Returns true if there are any alarms in effect in the cluster
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<bool> HaveAnyClusterAlarmsAsync(CancellationToken cancellationToken = default);
+    public static async Task<bool> HaveAnyClusterAlarmsAsync(
+        this IManagementClient client,
+        CancellationToken cancellationToken = default
+    ) => !await client.CheckAsync(Health / "checks" / "alarms", cancellationToken).ConfigureAwait(false);
 
     /// <summary>
     ///     Returns true if there are any alarms in effect in on a target node
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<bool> HaveAnyLocalAlarmsAsync(CancellationToken cancellationToken = default);
+    public static async Task<bool> HaveAnyLocalAlarmsAsync(
+        this IManagementClient client,
+        CancellationToken cancellationToken = default
+    ) => !await client.CheckAsync(Health / "checks" / "local-alarms", cancellationToken).ConfigureAwait(false);
+
 
     /// <summary>
     ///     Returns true if there are classic mirrored queues without synchronised mirrors online (queues that would potentially lose data if the target node is shut down).
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<bool> HaveAnyClassicQueuesWithoutSynchronisedMirrorsAsync(CancellationToken cancellationToken = default);
+    public static async Task<bool> HaveAnyClassicQueuesWithoutSynchronisedMirrorsAsync(
+        this IManagementClient client,
+        CancellationToken cancellationToken = default
+    ) => !await client.CheckAsync(Health / "checks" / "node-is-mirror-sync-critical", cancellationToken).ConfigureAwait(false);
 
     /// <summary>
     ///     Returns true if there are quorum queues with minimum online quorum (queues that would lose their quorum and availability if the target node is shut down)
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<bool> HaveAnyQuorumQueuesInCriticalStateAsync(CancellationToken cancellationToken = default);
+    public static async Task<bool> HaveAnyQuorumQueuesInCriticalStateAsync(
+        this IManagementClient client,
+        CancellationToken cancellationToken = default
+    ) => !await client.CheckAsync(Health / "checks" / "node-is-quorum-critical", cancellationToken).ConfigureAwait(false);
 
     /// <summary>
     ///     Rebalances all queues in all vhosts. This operation is asynchronous therefore please check the RabbitMQ log file for messages regarding the success or failure of the operation.
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task RebalanceQueuesAsync(CancellationToken cancellationToken = default);
+    public static Task RebalanceQueuesAsync(
+        this IManagementClient client,
+        CancellationToken cancellationToken = default
+    ) => client.PostAsync(Rebalance / "queues", cancellationToken);
 
     /// <summary>
     ///     A list of all shovel statuses.
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<IReadOnlyList<ShovelStatus>> GetShovelStatusesAsync(CancellationToken cancellationToken = default);
+    public static Task<IReadOnlyList<ShovelStatus>> GetShovelStatusesAsync(
+        this IManagementClient client,
+        CancellationToken cancellationToken = default
+    ) => client.GetAsync<IReadOnlyList<ShovelStatus>>(ShovelStatuses, cancellationToken);
 
     /// <summary>
     ///     A list of all shovel statuses for a virtual host.
     /// </summary>
+    /// <param name="client"></param>
     /// <param name="vhostName"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<IReadOnlyList<ShovelStatus>> GetShovelStatusesAsync(string vhostName, CancellationToken cancellationToken = default);
+    public static Task<IReadOnlyList<ShovelStatus>> GetShovelStatusesAsync(
+        this IManagementClient client,
+        string vhostName,
+        CancellationToken cancellationToken = default
+    ) => client.GetAsync<IReadOnlyList<ShovelStatus>>(ShovelStatuses / vhostName, cancellationToken);
 
     // Current implementation in RabbitMQ has a lot of bugs
     // 
diff --git a/Source/EasyNetQ.Management.Client/Internals/QueryStringHelpers.cs b/Source/EasyNetQ.Management.Client/Internals/QueryStringHelpers.cs
index aa3d4876..25bd23d3 100644
--- a/Source/EasyNetQ.Management.Client/Internals/QueryStringHelpers.cs
+++ b/Source/EasyNetQ.Management.Client/Internals/QueryStringHelpers.cs
@@ -4,21 +4,19 @@ namespace EasyNetQ.Management.Client.Internals;
 
 internal static class QueryStringHelpers
 {
-    public static string AddQueryString(string uri, IReadOnlyDictionary<string, string>? queryString)
+    public static string AddQueryString(string uri, IEnumerable<KeyValuePair<string, string>>? queryParameters)
     {
-        if (queryString == null || queryString.Count == 0) return uri;
+        if (queryParameters == null) return uri;
 
-        var queryIndex = uri.IndexOf('?');
-        var hasQuery = queryIndex != -1;
-        var sb = new StringBuilder();
-        sb.Append(uri);
-        foreach (var parameter in queryString)
+        var queryParameterSeparator = uri.Contains('?') ? '&' : '?';
+        var sb = new StringBuilder(uri);
+        foreach (var parameter in queryParameters)
         {
-            sb.Append(hasQuery ? '&' : '?');
+            sb.Append(queryParameterSeparator);
             sb.Append(Uri.EscapeDataString(parameter.Key));
             sb.Append('=');
             sb.Append(Uri.EscapeDataString(parameter.Value));
-            hasQuery = true;
+            queryParameterSeparator = '&';
         }
         return sb.ToString();
     }
diff --git a/Source/EasyNetQ.Management.Client/LengthsCriteria.cs b/Source/EasyNetQ.Management.Client/LengthsCriteria.cs
new file mode 100644
index 00000000..2f6e133a
--- /dev/null
+++ b/Source/EasyNetQ.Management.Client/LengthsCriteria.cs
@@ -0,0 +1,11 @@
+namespace EasyNetQ.Management.Client;
+
+public record LengthsCriteria(int LengthsAge, int LengthsIncr)
+{
+    public readonly IEnumerable<KeyValuePair<string, string>> QueryParameters =
+        new KeyValuePair<string, string>[]
+        {
+            new KeyValuePair<string, string>("lengths_age", LengthsAge.ToString()),
+            new KeyValuePair<string, string>("lengths_incr", LengthsIncr.ToString())
+        };
+}
diff --git a/Source/EasyNetQ.Management.Client/ManagementClient.cs b/Source/EasyNetQ.Management.Client/ManagementClient.cs
index 7372d5bb..96b4ba29 100644
--- a/Source/EasyNetQ.Management.Client/ManagementClient.cs
+++ b/Source/EasyNetQ.Management.Client/ManagementClient.cs
@@ -5,7 +5,6 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using EasyNetQ.Management.Client.Internals;
-using EasyNetQ.Management.Client.Model;
 using EasyNetQ.Management.Client.Serialization;
 
 #if NET6_0
@@ -24,33 +23,6 @@ public class ManagementClient : IManagementClient
     private static readonly MediaTypeWithQualityHeaderValue JsonMediaTypeHeaderValue = new("application/json");
     private static readonly TimeSpan DefaultTimeout = TimeSpan.FromSeconds(20);
 
-    private static readonly RelativePath Api = new("api");
-    private static readonly RelativePath Vhosts = Api / "vhosts";
-    private static readonly RelativePath AlivenessTest = Api / "aliveness-test";
-    private static readonly RelativePath Connections = Api / "connections";
-    private static readonly RelativePath Consumers = Api / "consumers";
-    private static readonly RelativePath Channels = Api / "channels";
-    private static readonly RelativePath Users = Api / "users";
-    private static readonly RelativePath Permissions = Api / "permissions";
-    private static readonly RelativePath Parameters = Api / "parameters";
-    private static readonly RelativePath Bindings = Api / "bindings";
-    private static readonly RelativePath Queues = Api / "queues";
-    private static readonly RelativePath Exchanges = Api / "exchanges";
-    private static readonly RelativePath TopicPermissions = Api / "topic-permissions";
-    private static readonly RelativePath Policies = Api / "policies";
-    private static readonly RelativePath FederationLinks = Api / "federation-links";
-    private static readonly RelativePath Overview = Api / "overview";
-    private static readonly RelativePath Nodes = Api / "nodes";
-    private static readonly RelativePath Definitions = Api / "definitions";
-    private static readonly RelativePath Health = Api / "health";
-    private static readonly RelativePath Rebalance = Api / "rebalance";
-    private static readonly RelativePath ShovelStatuses = Api / "shovels";
-
-    private static readonly Dictionary<string, string> GetQueuesWithoutStatsQueryParameters = new Dictionary<string, string> {
-        { "disable_stats", "true" },
-        { "enable_queue_totals", "true" }
-    };
-
     internal static readonly JsonSerializerOptions SerializerOptions;
 
     private readonly HttpClient httpClient;
@@ -190,597 +162,32 @@ public ManagementClient(HttpClient httpClient, string username, string password)
 
     public Uri Endpoint => httpClient.BaseAddress!;
 
-    public Task<Overview> GetOverviewAsync(
-        LengthsCriteria? lengthsCriteria = null,
-        RatesCriteria? ratesCriteria = null,
-        CancellationToken cancellationToken = default
-    )
-    {
-        var queryParameters = MergeQueryParameters(
-            lengthsCriteria?.ToQueryParameters(), ratesCriteria?.ToQueryParameters()
-        );
-        return GetAsync<Overview>(Overview, queryParameters, cancellationToken);
-    }
-
-    public Task<IReadOnlyList<Node>> GetNodesAsync(CancellationToken cancellationToken = default)
-    {
-        return GetAsync<IReadOnlyList<Node>>(Nodes, cancellationToken);
-    }
-
-    public Task<Definitions> GetDefinitionsAsync(CancellationToken cancellationToken = default)
-    {
-        return GetAsync<Definitions>(Definitions, cancellationToken);
-    }
-
-    public Task<IReadOnlyList<Connection>> GetConnectionsAsync(CancellationToken cancellationToken = default)
-    {
-        return GetAsync<IReadOnlyList<Connection>>(Connections, cancellationToken);
-    }
-
-    public Task<IReadOnlyList<Connection>> GetConnectionsAsync(string vhostName, CancellationToken cancellationToken = default)
-    {
-        return GetAsync<IReadOnlyList<Connection>>(Vhosts / vhostName / "connections", cancellationToken);
-    }
-
-    public Task CloseConnectionAsync(string connectionName, CancellationToken cancellationToken = default)
-    {
-        return DeleteAsync(Connections / connectionName, cancellationToken);
-    }
-
-    public Task<IReadOnlyList<Channel>> GetChannelsAsync(CancellationToken cancellationToken = default)
-    {
-        return GetAsync<IReadOnlyList<Channel>>(Channels, cancellationToken);
-    }
-
-    public Task<IReadOnlyList<Channel>> GetChannelsAsync(string connectionName, CancellationToken cancellationToken = default)
-    {
-        return GetAsync<IReadOnlyList<Channel>>(Connections / connectionName / "channels", cancellationToken);
-    }
-
-    public Task<Channel> GetChannelAsync(
-        string channelName,
-        RatesCriteria? ratesCriteria = null,
-        CancellationToken cancellationToken = default
-    )
-    {
-        return GetAsync<Channel>(Channels / channelName, ratesCriteria?.ToQueryParameters(), cancellationToken);
-    }
-
-    public Task<IReadOnlyList<Exchange>> GetExchangesAsync(CancellationToken cancellationToken = default)
-    {
-        return GetAsync<IReadOnlyList<Exchange>>(Exchanges, cancellationToken);
-    }
-
-    public Task<PageResult<Exchange>> GetExchangesByPageAsync(PageCriteria pageCriteria, CancellationToken cancellationToken = default)
-    {
-        return GetAsync<PageResult<Exchange>>(Exchanges, pageCriteria.ToQueryParameters(), cancellationToken);
-    }
-
-    public Task<IReadOnlyList<Exchange>> GetExchangesAsync(string vhostName, CancellationToken cancellationToken = default)
-    {
-        return GetAsync<IReadOnlyList<Exchange>>(Exchanges / vhostName, cancellationToken);
-    }
-
-    public Task<PageResult<Exchange>> GetExchangesByPageAsync(
-        string vhostName,
-        PageCriteria pageCriteria,
-        CancellationToken cancellationToken = default
-    )
-    {
-        return GetAsync<PageResult<Exchange>>(Exchanges / vhostName, pageCriteria.ToQueryParameters(), cancellationToken);
-    }
-
-    public Task<Exchange> GetExchangeAsync(
-        string vhostName,
-        string exchangeName,
-        RatesCriteria? ratesCriteria = null,
-        CancellationToken cancellationToken = default
-    )
-    {
-        return GetAsync<Exchange>(
-            Exchanges / vhostName / exchangeName,
-            ratesCriteria?.ToQueryParameters(),
-            cancellationToken
-        );
-    }
-
-    public Task<Queue> GetQueueAsync(
-        string vhostName,
-        string queueName,
-        LengthsCriteria? lengthsCriteria = null,
-        RatesCriteria? ratesCriteria = null,
-        CancellationToken cancellationToken = default
-    )
-    {
-        var queryParameters = MergeQueryParameters(
-            lengthsCriteria?.ToQueryParameters(), ratesCriteria?.ToQueryParameters()
-        );
-        return GetAsync<Queue>(
-            Queues / vhostName / queueName,
-            queryParameters,
-            cancellationToken
-        );
-    }
-
-    public Task CreateExchangeAsync(
-        string vhostName,
-        string exchangeName,
-        ExchangeInfo exchangeInfo,
-        CancellationToken cancellationToken = default
-    )
-    {
-        return PutAsync(
-            Exchanges / vhostName / exchangeName,
-            exchangeInfo,
-            cancellationToken
-        );
-    }
-
-    public Task DeleteExchangeAsync(string vhostName, string exchangeName, CancellationToken cancellationToken = default)
-    {
-        return DeleteAsync(
-            Exchanges / vhostName / exchangeName,
-            cancellationToken
-        );
-    }
-
-    public Task<IReadOnlyList<Binding>> GetBindingsWithSourceAsync(
-        string vhostName,
-        string exchangeName,
-        CancellationToken cancellationToken = default
-    )
-    {
-        return GetAsync<IReadOnlyList<Binding>>(
-            Exchanges / vhostName / exchangeName / "bindings" / "source",
-            cancellationToken
-        );
-    }
-
-    public Task<IReadOnlyList<Binding>> GetBindingsWithDestinationAsync(
-        string vhostName,
-        string exchangeName,
-        CancellationToken cancellationToken = default
-    )
-    {
-        return GetAsync<IReadOnlyList<Binding>>(
-            Exchanges / vhostName / exchangeName / "bindings" / "destination",
-            cancellationToken
-        );
-    }
-
-    public Task<PublishResult> PublishAsync(
-        string vhostName,
-        string exchangeName,
-        PublishInfo publishInfo,
-        CancellationToken cancellationToken = default
-    )
-    {
-        return PostAsync<PublishInfo, PublishResult>(
-            Exchanges / vhostName / exchangeName / "publish",
-            publishInfo,
-            cancellationToken
-        );
-    }
-
-
-    public Task<IReadOnlyList<Queue>> GetQueuesAsync(CancellationToken cancellationToken = default)
-    {
-        return GetAsync<IReadOnlyList<Queue>>(Queues, cancellationToken);
-    }
-
-    public Task<PageResult<Queue>> GetQueuesByPageAsync(PageCriteria pageCriteria, CancellationToken cancellationToken = default)
-    {
-        return GetAsync<PageResult<Queue>>(Queues, pageCriteria.ToQueryParameters(), cancellationToken);
-    }
-
-    public Task<IReadOnlyList<Queue>> GetQueuesAsync(string vhostName, CancellationToken cancellationToken = default)
-    {
-        return GetAsync<IReadOnlyList<Queue>>(Queues / vhostName, cancellationToken);
-    }
-
-    public Task<PageResult<Queue>> GetQueuesByPageAsync(string vhostName, PageCriteria pageCriteria, CancellationToken cancellationToken = default)
-    {
-        return GetAsync<PageResult<Queue>>(Queues / vhostName, pageCriteria.ToQueryParameters(), cancellationToken);
-    }
-
-    public Task<IReadOnlyList<QueueWithoutStats>> GetQueuesWithoutStatsAsync(CancellationToken cancellationToken = default)
-    {
-        return GetAsync<IReadOnlyList<QueueWithoutStats>>(Queues, GetQueuesWithoutStatsQueryParameters, cancellationToken);
-    }
-
-    public Task CreateQueueAsync(
-        string vhostName,
-        string queueName,
-        QueueInfo queueInfo,
-        CancellationToken cancellationToken = default
-    )
-    {
-        return PutAsync(
-            Queues / vhostName / queueName,
-            queueInfo,
-            cancellationToken
-        );
-    }
-
-    public Task DeleteQueueAsync(string vhostName, string queueName, CancellationToken cancellationToken = default)
-    {
-        return DeleteAsync(
-            Queues / vhostName / queueName, cancellationToken
-        );
-    }
-
-    public Task<IReadOnlyList<Binding>> GetBindingsForQueueAsync(
-        string vhostName, string queueName, CancellationToken cancellationToken = default
-    )
-    {
-        return GetAsync<IReadOnlyList<Binding>>(
-            Queues / vhostName / queueName / "bindings", cancellationToken
-        );
-    }
-
-    public Task PurgeAsync(string vhostName, string queueName, CancellationToken cancellationToken = default)
-    {
-        return DeleteAsync(
-            Queues / vhostName / queueName / "contents", cancellationToken
-        );
-    }
-
-    public Task<IReadOnlyList<Message>> GetMessagesFromQueueAsync(
-        string vhostName,
-        string queueName,
-        GetMessagesFromQueueInfo getMessagesFromQueueInfo,
-        CancellationToken cancellationToken = default
-    )
-    {
-        return PostAsync<GetMessagesFromQueueInfo, IReadOnlyList<Message>>(
-            Queues / vhostName / queueName / "get",
-            getMessagesFromQueueInfo,
-            cancellationToken
-        );
-    }
-
-    public Task<IReadOnlyList<Binding>> GetBindingsAsync(CancellationToken cancellationToken = default)
-    {
-        return GetAsync<IReadOnlyList<Binding>>(Bindings, cancellationToken);
-    }
-
-    public Task<IReadOnlyList<Binding>> GetBindingsAsync(string vhostName, CancellationToken cancellationToken = default)
-    {
-        return GetAsync<IReadOnlyList<Binding>>(Bindings / vhostName, cancellationToken);
-    }
-
-    public Task CreateQueueBindingAsync(
-        string vhostName,
-        string exchangeName,
-        string queueName,
-        BindingInfo bindingInfo,
-        CancellationToken cancellationToken = default
-    )
-    {
-        return PostAsync(
-            Bindings / vhostName / "e" / exchangeName / "q" / queueName,
-            bindingInfo,
-            cancellationToken
-        );
-    }
-
-    public Task CreateExchangeBindingAsync(
-        string vhostName,
-        string sourceExchangeName,
-        string destinationExchangeName,
-        BindingInfo bindingInfo,
-        CancellationToken cancellationToken = default
-    )
-    {
-        return PostAsync(
-            Bindings / vhostName / "e" / sourceExchangeName / "e" / destinationExchangeName,
-            bindingInfo,
-            cancellationToken
-        );
-    }
-
-    public Task<IReadOnlyList<Binding>> GetQueueBindingsAsync(
-        string vhostName,
-        string exchangeName,
-        string queueName,
-        CancellationToken cancellationToken = default
-    )
-    {
-        return GetAsync<IReadOnlyList<Binding>>(
-            Bindings / vhostName / "e" / exchangeName / "q" / queueName,
-            cancellationToken
-        );
-    }
-
-    public Task<IReadOnlyList<Binding>> GetExchangeBindingsAsync(
-        string vhostName,
-        string sourceExchangeName,
-        string destinationExchangeName,
-        CancellationToken cancellationToken = default
-    )
-    {
-        return GetAsync<IReadOnlyList<Binding>>(
-            Bindings / vhostName / "e" / sourceExchangeName / "e" / destinationExchangeName,
-            cancellationToken
-        );
-    }
-
-    public Task DeleteQueueBindingAsync(
-        string vhostName,
-        string exchangeName,
-        string queueName,
-        string propertiesKey,
-        CancellationToken cancellationToken = default
-    )
-    {
-        return DeleteAsync(
-            Bindings / vhostName / "e" / exchangeName / "q" / queueName / propertiesKey,
-            cancellationToken
-        );
-    }
-
-    public Task DeleteExchangeBindingAsync(
-        string vhostName,
-        string sourceExchangeName,
-        string destinationExchangeName,
-        string propertiesKey,
-        CancellationToken cancellationToken = default
-    )
-    {
-        return DeleteAsync(
-            Bindings / vhostName / "e" / sourceExchangeName / "e" / destinationExchangeName / propertiesKey,
-            cancellationToken
-        );
-    }
-
-    public Task<IReadOnlyList<Vhost>> GetVhostsAsync(CancellationToken cancellationToken = default)
-    {
-        return GetAsync<IReadOnlyList<Vhost>>(Vhosts, cancellationToken);
-    }
-
-    public Task<Vhost> GetVhostAsync(string vhostName, CancellationToken cancellationToken = default)
-    {
-        return GetAsync<Vhost>(Vhosts / vhostName, cancellationToken);
-    }
-
-    public Task CreateVhostAsync(string vhostName, CancellationToken cancellationToken = default)
-    {
-        return PutAsync(Vhosts / vhostName, cancellationToken);
-    }
-
-    public Task DeleteVhostAsync(string vhostName, CancellationToken cancellationToken = default)
-    {
-        return DeleteAsync(Vhosts / vhostName, cancellationToken);
-    }
-
-    public Task EnableTracingAsync(string vhostName, CancellationToken cancellationToken = default)
-    {
-        return PutAsync(Vhosts / vhostName, new { Tracing = true }, cancellationToken);
-    }
-
-    public Task DisableTracingAsync(string vhostName, CancellationToken cancellationToken = default)
-    {
-        return PutAsync(Vhosts / vhostName, new { Tracing = false }, cancellationToken);
-    }
-
-    public Task<IReadOnlyList<User>> GetUsersAsync(CancellationToken cancellationToken = default)
-    {
-        return GetAsync<IReadOnlyList<User>>(Users, cancellationToken);
-    }
-
-    public Task<User> GetUserAsync(string userName, CancellationToken cancellationToken = default)
-    {
-        return GetAsync<User>(Users / userName, cancellationToken);
-    }
-
-    public Task<IReadOnlyList<Policy>> GetPoliciesAsync(CancellationToken cancellationToken = default)
-    {
-        return GetAsync<IReadOnlyList<Policy>>(Policies, cancellationToken);
-    }
-
-    public Task CreatePolicyAsync(
-        string vhostName,
-        string policyName,
-        PolicyInfo policyInfo,
-        CancellationToken cancellationToken = default
-    )
-    {
-        return PutAsync(Policies / vhostName / policyName, policyInfo, cancellationToken);
-    }
-
-    public Task DeletePolicyAsync(string vhostName, string policyName, CancellationToken cancellationToken = default)
-    {
-        return DeleteAsync(Policies / vhostName / policyName, cancellationToken);
-    }
-
-    public Task<Parameter> GetParameterAsync(
-        string vhostName,
-        string componentName,
-        string parameterName,
-        CancellationToken cancellationToken = default
-    )
-    {
-        return GetAsync<Parameter>(Parameters / componentName / vhostName / parameterName, cancellationToken);
-    }
-
-    public Task<IReadOnlyList<Parameter>> GetParametersAsync(CancellationToken cancellationToken = default)
-    {
-        return GetAsync<IReadOnlyList<Parameter>>(Parameters, cancellationToken);
-    }
-
-    public Task CreateParameterAsync(
-        string componentName,
-        string vhostName,
-        string parameterName,
-        object parameterValue,
-        CancellationToken cancellationToken = default
-    )
-    {
-        return PutAsync(
-            Parameters / componentName / vhostName / parameterName,
-            new { Value = parameterValue },
-            cancellationToken
-        );
-    }
-
-    public Task DeleteParameterAsync(
-        string componentName,
-        string vhostName,
-        string parameterName,
-        CancellationToken cancellationToken = default
-    )
-    {
-        return DeleteAsync(Parameters / componentName / vhostName / parameterName, cancellationToken);
-    }
-
-    public Task CreateUserAsync(string userName, UserInfo userInfo, CancellationToken cancellationToken = default)
-    {
-        return PutAsync(Users / userName, userInfo, cancellationToken);
-    }
-
-    public Task DeleteUserAsync(string userName, CancellationToken cancellationToken = default)
-    {
-        return DeleteAsync(Users / userName, cancellationToken);
-    }
-
-    public Task<IReadOnlyList<Permission>> GetPermissionsAsync(CancellationToken cancellationToken = default)
-    {
-        return GetAsync<IReadOnlyList<Permission>>(Permissions, cancellationToken);
-    }
-
-    public Task CreatePermissionAsync(string vhostName, string userName, PermissionInfo permissionInfo, CancellationToken cancellationToken = default)
-    {
-        return PutAsync(
-            Permissions / vhostName / userName,
-            permissionInfo,
-            cancellationToken
-        );
-    }
-
-    public Task DeletePermissionAsync(string vhostName, string userName, CancellationToken cancellationToken = default)
-    {
-        return DeleteAsync(Permissions / vhostName / userName, cancellationToken);
-    }
-
-    public Task<IReadOnlyList<TopicPermission>> GetTopicPermissionsAsync(CancellationToken cancellationToken = default)
-    {
-        return GetAsync<IReadOnlyList<TopicPermission>>(TopicPermissions, cancellationToken);
-    }
-
-    public Task CreateTopicPermissionAsync(
-        string vhostName,
-        string userName,
-        TopicPermissionInfo topicPermissionInfo,
-        CancellationToken cancellationToken = default
-    )
-    {
-        return PutAsync(
-            TopicPermissions / vhostName / userName,
-            topicPermissionInfo,
-            cancellationToken
-        );
-    }
-
-    public Task DeleteTopicPermissionAsync(string vhostName, string userName, CancellationToken cancellationToken = default)
-    {
-        return DeleteAsync(TopicPermissions / vhostName / userName, cancellationToken);
-    }
-
-    public Task<IReadOnlyList<Federation>> GetFederationsAsync(CancellationToken cancellationToken = default)
-    {
-        return GetAsync<IReadOnlyList<Federation>>(FederationLinks, cancellationToken);
-    }
-
-    public Task<bool> IsAliveAsync(string vhostName, CancellationToken cancellationToken = default)
-    {
-        return GetAsync(AlivenessTest / vhostName, c => c == HttpStatusCode.OK, c => c == HttpStatusCode.ServiceUnavailable, cancellationToken);
-    }
-
-    public Task<IReadOnlyList<Consumer>> GetConsumersAsync(CancellationToken cancellationToken = default)
-    {
-        return GetAsync<IReadOnlyList<Consumer>>(Consumers, cancellationToken);
-    }
-
-    public Task<IReadOnlyList<Consumer>> GetConsumersAsync(string vhostName, CancellationToken cancellationToken = default)
-    {
-        return GetAsync<IReadOnlyList<Consumer>>(Consumers / vhostName, cancellationToken);
-    }
-
-    public Task<bool> HaveAnyClusterAlarmsAsync(CancellationToken cancellationToken = default)
-    {
-        return GetAsync(
-            Health / "checks" / "alarms",
-            c => c == HttpStatusCode.ServiceUnavailable,
-            c => c == HttpStatusCode.OK,
-            cancellationToken
-        );
-    }
-
-    public Task<bool> HaveAnyLocalAlarmsAsync(CancellationToken cancellationToken = default)
-    {
-        return GetAsync(
-            Health / "checks" / "local-alarms",
-            c => c == HttpStatusCode.ServiceUnavailable,
-            c => c == HttpStatusCode.OK,
-            cancellationToken
-        );
-    }
-
-    public Task<bool> HaveAnyClassicQueuesWithoutSynchronisedMirrorsAsync(CancellationToken cancellationToken = default)
-    {
-        return GetAsync(
-            Health / "checks" / "node-is-mirror-sync-critical",
-            c => c == HttpStatusCode.ServiceUnavailable,
-            c => c == HttpStatusCode.OK,
-            cancellationToken
-        );
-    }
-
-    public Task<bool> HaveAnyQuorumQueuesInCriticalStateAsync(CancellationToken cancellationToken = default)
-    {
-        return GetAsync(
-            Health / "checks" / "node-is-quorum-critical",
-            c => c == HttpStatusCode.ServiceUnavailable,
-            c => c == HttpStatusCode.OK,
-            cancellationToken
-        );
-    }
-
-    public Task RebalanceQueuesAsync(CancellationToken cancellationToken = default)
-    {
-        return PostAsync(Rebalance / "queues", cancellationToken);
-    }
-
     public void Dispose()
     {
         if (disposeHttpClient)
             httpClient.Dispose();
     }
 
-    private async Task<bool> GetAsync(
+    public async Task<bool> CheckAsync(
         RelativePath path,
-        Func<HttpStatusCode, bool> trueCondition,
-        Func<HttpStatusCode, bool> falseCondition,
         CancellationToken cancellationToken = default
     )
     {
         using var request = CreateRequest(HttpMethod.Get, path);
         using var response = await httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
 
-        if (trueCondition(response.StatusCode))
+        if (response.StatusCode == HttpStatusCode.OK)
             return true;
 
-        if (falseCondition(response.StatusCode))
+        if (response.StatusCode == HttpStatusCode.ServiceUnavailable)
             return false;
 
         throw new UnexpectedHttpStatusCodeException(response);
     }
 
-    private Task<T> GetAsync<T>(RelativePath path, CancellationToken cancellationToken = default) => GetAsync<T>(path, null, cancellationToken);
-
-    private async Task<T> GetAsync<T>(
+    public async Task<TResult> GetAsync<TResult>(
         RelativePath path,
-        IReadOnlyDictionary<string, string>? queryParameters,
+        IEnumerable<KeyValuePair<string, string>>? queryParameters,
         CancellationToken cancellationToken = default
     )
     {
@@ -791,7 +198,7 @@ private async Task<T> GetAsync<T>(
 
         try
         {
-            return (await response.Content.ReadFromJsonAsync<T>(SerializerOptions, cancellationToken).ConfigureAwait(false))!;
+            return (await response.Content.ReadFromJsonAsync<TResult>(SerializerOptions, cancellationToken).ConfigureAwait(false))!;
         }
         catch (Exception e) when (e is ArgumentNullException || e is JsonException)
         {
@@ -800,7 +207,7 @@ private async Task<T> GetAsync<T>(
         }
     }
 
-    private async Task<TResult> PostAsync<TItem, TResult>(
+    public async Task<TResult> PostAsync<TItem, TResult>(
         RelativePath path,
         TItem item,
         CancellationToken cancellationToken = default
@@ -823,7 +230,7 @@ private async Task<TResult> PostAsync<TItem, TResult>(
         }
     }
 
-    private async Task PostAsync<TItem>(
+    public async Task PostAsync<TItem>(
         RelativePath path,
         TItem item,
         CancellationToken cancellationToken = default
@@ -836,7 +243,7 @@ private async Task PostAsync<TItem>(
         response.EnsureExpectedStatusCode(statusCode => statusCode is HttpStatusCode.OK or HttpStatusCode.Created or HttpStatusCode.NoContent);
     }
 
-    private async Task PostAsync(
+    public async Task PostAsync(
         RelativePath path,
         CancellationToken cancellationToken = default
     )
@@ -847,7 +254,7 @@ private async Task PostAsync(
         response.EnsureExpectedStatusCode(statusCode => statusCode is HttpStatusCode.OK or HttpStatusCode.Created or HttpStatusCode.NoContent);
     }
 
-    private async Task DeleteAsync(RelativePath path, CancellationToken cancellationToken = default)
+    public async Task DeleteAsync(RelativePath path, CancellationToken cancellationToken = default)
     {
         using var request = CreateRequest(HttpMethod.Delete, path);
         using var response = await httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
@@ -855,9 +262,9 @@ private async Task DeleteAsync(RelativePath path, CancellationToken cancellation
         response.EnsureExpectedStatusCode(statusCode => statusCode == HttpStatusCode.NoContent);
     }
 
-    private async Task PutAsync<T>(
+    public async Task PutAsync<TBody>(
         RelativePath path,
-        T item,
+        TBody item,
         CancellationToken cancellationToken = default
     )
     {
@@ -868,7 +275,7 @@ private async Task PutAsync<T>(
         response.EnsureExpectedStatusCode(statusCode => statusCode is HttpStatusCode.Created or HttpStatusCode.NoContent);
     }
 
-    private async Task PutAsync(RelativePath path, CancellationToken cancellationToken = default)
+    public async Task PutAsync(RelativePath path, CancellationToken cancellationToken = default)
     {
         using var request = CreateRequest(HttpMethod.Put, path);
         using var response = await httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
@@ -879,7 +286,7 @@ private async Task PutAsync(RelativePath path, CancellationToken cancellationTok
     private HttpRequestMessage CreateRequest(
         HttpMethod httpMethod,
         in RelativePath path,
-        IReadOnlyDictionary<string, string>? queryParameters = null,
+        IEnumerable<KeyValuePair<string, string>>? queryParameters = null,
         HttpContent? content = null
     )
     {
@@ -889,32 +296,4 @@ private HttpRequestMessage CreateRequest(
         configureHttpRequestMessage?.Invoke(request);
         return request;
     }
-
-    private static IReadOnlyDictionary<string, string>? MergeQueryParameters(params IReadOnlyDictionary<string, string>?[]? multipleQueryParameters)
-    {
-        if (multipleQueryParameters == null || multipleQueryParameters.Length == 0)
-            return null;
-
-        var mergedQueryParameters = new Dictionary<string, string>();
-        foreach (var queryParameters in multipleQueryParameters)
-        {
-            if (queryParameters == null)
-                continue;
-
-            foreach (var kvp in queryParameters)
-                mergedQueryParameters[kvp.Key] = kvp.Value;
-        }
-
-        return mergedQueryParameters;
-    }
-
-    public Task<IReadOnlyList<ShovelStatus>> GetShovelStatusesAsync(CancellationToken cancellationToken = default)
-    {
-        return GetAsync<IReadOnlyList<ShovelStatus>>(ShovelStatuses, cancellationToken);
-    }
-
-    public Task<IReadOnlyList<ShovelStatus>> GetShovelStatusesAsync(string vhostName, CancellationToken cancellationToken = default)
-    {
-        return GetAsync<IReadOnlyList<ShovelStatus>>(ShovelStatuses / vhostName, cancellationToken);
-    }
 }
diff --git a/Source/EasyNetQ.Management.Client/Model/LengthsCriteria.cs b/Source/EasyNetQ.Management.Client/Model/LengthsCriteria.cs
deleted file mode 100644
index 7e17a053..00000000
--- a/Source/EasyNetQ.Management.Client/Model/LengthsCriteria.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace EasyNetQ.Management.Client.Model;
-
-public record LengthsCriteria(int LengthsAge, int LengthsIncr)
-{
-    public IReadOnlyDictionary<string, string> ToQueryParameters()
-    {
-        return new Dictionary<string, string>
-        {
-            { "lengths_age", LengthsAge.ToString() },
-            { "lengths_incr", LengthsIncr.ToString() }
-        };
-    }
-}
diff --git a/Source/EasyNetQ.Management.Client/Model/PageCriteria.cs b/Source/EasyNetQ.Management.Client/Model/PageCriteria.cs
deleted file mode 100644
index 4758bdcf..00000000
--- a/Source/EasyNetQ.Management.Client/Model/PageCriteria.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace EasyNetQ.Management.Client.Model;
-
-public record PageCriteria(int Page, int PageSize, string? Name = null, bool UseRegex = false)
-{
-    public IReadOnlyDictionary<string, string> ToQueryParameters()
-    {
-        return new Dictionary<string, string>
-        {
-            { "page", Page.ToString() },
-            { "page_size", PageSize.ToString() },
-            { "name", Name ?? "" },
-            { "use_regex", UseRegex.ToString().ToLower() },
-            { "pagination", "true" }
-        };
-    }
-}
diff --git a/Source/EasyNetQ.Management.Client/Model/Queue.cs b/Source/EasyNetQ.Management.Client/Model/Queue.cs
index b7f6d672..b65759f6 100755
--- a/Source/EasyNetQ.Management.Client/Model/Queue.cs
+++ b/Source/EasyNetQ.Management.Client/Model/Queue.cs
@@ -7,9 +7,11 @@ namespace EasyNetQ.Management.Client.Model;
 public record Queue(
     string Name,
     string Vhost,
+
     QueueType Type,
     string? Node,
     string? State,
+    [property: JsonConverter(typeof(StringObjectReadOnlyDictionaryConverter))]
     IReadOnlyDictionary<string, object?> Arguments,
     bool Durable,
     bool Exclusive,
@@ -17,7 +19,6 @@ public record Queue(
     long MessagesReady,
     long MessagesUnacknowledged,
     long Messages,
-
     long Memory,
     string? IdleSince,
     string? Policy,
@@ -34,7 +35,7 @@ public record Queue(
     LengthsDetails? MessagesReadyDetails,
     LengthsDetails? MessagesUnacknowledgedDetails,
     MessageStats? MessageStats
-) : QueueWithoutStats(Name, Vhost, Type, Node, State, Arguments, Durable, Exclusive, AutoDelete, MessagesReady, MessagesUnacknowledged, Messages)
+) : QueueName(Name, Vhost)
 {
     [JsonExtensionData()]
     public IDictionary<string, JsonElement>? JsonExtensionData { get; set; }
diff --git a/Source/EasyNetQ.Management.Client/Model/QueueWithoutStats.cs b/Source/EasyNetQ.Management.Client/Model/QueueWithoutStats.cs
deleted file mode 100644
index 2c398975..00000000
--- a/Source/EasyNetQ.Management.Client/Model/QueueWithoutStats.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Text.Json.Serialization;
-using EasyNetQ.Management.Client.Serialization;
-
-namespace EasyNetQ.Management.Client.Model;
-
-public record QueueWithoutStats(
-    string Name,
-    string Vhost,
-
-    QueueType Type,
-    string? Node,
-    string? State,
-    [property: JsonConverter(typeof(StringObjectReadOnlyDictionaryConverter))]
-    IReadOnlyDictionary<string, object?> Arguments,
-    bool Durable,
-    bool Exclusive,
-    bool AutoDelete,
-    long MessagesReady,
-    long MessagesUnacknowledged,
-    long Messages
-) : QueueName(Name, Vhost);
diff --git a/Source/EasyNetQ.Management.Client/Model/RatesCriteria.cs b/Source/EasyNetQ.Management.Client/Model/RatesCriteria.cs
deleted file mode 100644
index c61c23aa..00000000
--- a/Source/EasyNetQ.Management.Client/Model/RatesCriteria.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace EasyNetQ.Management.Client.Model;
-
-public record RatesCriteria(int MsgRatesAge, int MsgRatesIncr)
-{
-    public IReadOnlyDictionary<string, string> ToQueryParameters()
-    {
-        return new Dictionary<string, string>
-        {
-            { "msg_rates_age", MsgRatesAge.ToString() },
-            { "msg_rates_incr", MsgRatesIncr.ToString() }
-        };
-    }
-}
diff --git a/Source/EasyNetQ.Management.Client/PageCriteria.cs b/Source/EasyNetQ.Management.Client/PageCriteria.cs
new file mode 100644
index 00000000..7fa78595
--- /dev/null
+++ b/Source/EasyNetQ.Management.Client/PageCriteria.cs
@@ -0,0 +1,14 @@
+namespace EasyNetQ.Management.Client;
+
+public record PageCriteria(int Page, int PageSize, string? Name = null, bool UseRegex = false)
+{
+    public readonly IEnumerable<KeyValuePair<string, string>> QueryParameters =
+        new KeyValuePair<string, string>[]
+        {
+            new KeyValuePair<string, string>("page", Page.ToString()),
+            new KeyValuePair<string, string>("page_size", PageSize.ToString()),
+            new KeyValuePair<string, string>("name", Name ?? ""),
+            new KeyValuePair<string, string>("use_regex", UseRegex.ToString().ToLower()),
+            new KeyValuePair<string, string>("pagination", "true")
+        };
+}
diff --git a/Source/EasyNetQ.Management.Client/RatesCriteria.cs b/Source/EasyNetQ.Management.Client/RatesCriteria.cs
new file mode 100644
index 00000000..cca53d1e
--- /dev/null
+++ b/Source/EasyNetQ.Management.Client/RatesCriteria.cs
@@ -0,0 +1,11 @@
+namespace EasyNetQ.Management.Client;
+
+public record RatesCriteria(int MsgRatesAge, int MsgRatesIncr)
+{
+    public readonly IEnumerable<KeyValuePair<string, string>> QueryParameters =
+        new KeyValuePair<string, string>[]
+        {
+            new KeyValuePair<string, string>("msg_rates_age", MsgRatesAge.ToString()),
+            new KeyValuePair<string, string>("msg_rates_incr", MsgRatesIncr.ToString())
+        };
+}
diff --git a/Source/EasyNetQ.Management.Client/Internals/RelativePath.cs b/Source/EasyNetQ.Management.Client/RelativePath.cs
similarity index 67%
rename from Source/EasyNetQ.Management.Client/Internals/RelativePath.cs
rename to Source/EasyNetQ.Management.Client/RelativePath.cs
index de701584..3f43b0b6 100644
--- a/Source/EasyNetQ.Management.Client/Internals/RelativePath.cs
+++ b/Source/EasyNetQ.Management.Client/RelativePath.cs
@@ -1,22 +1,22 @@
-namespace EasyNetQ.Management.Client.Internals;
+namespace EasyNetQ.Management.Client;
 
-internal readonly struct RelativePath
+public readonly struct RelativePath
 {
     private readonly string[] segments;
 
     public RelativePath(string segment) => segments = new[] { segment };
 
-    public string Build() => string.Join("/", (segments ?? Array.Empty<string>()).Select(Uri.EscapeDataString));
+    public string Build() => string.Join("/", segments.Select(Uri.EscapeDataString));
 
     public static RelativePath operator /(RelativePath parent, string segment) => parent.Add(segment);
 
-    public static RelativePath operator /(RelativePath parent, char segment) => parent.Add(segment + "");
+    public static RelativePath operator /(RelativePath parent, char segment) => parent.Add(segment.ToString());
 
     private RelativePath(string[] segments) => this.segments = segments;
 
     private RelativePath Add(string segment)
     {
-        var old = segments ?? Array.Empty<string>();
+        var old = segments;
         var current = new string[old.Length + 1];
         Array.Copy(old, 0, current, 0, old.Length);
         current[old.Length] = segment;
diff --git a/Source/EasyNetQ.Management.Client/StatsCriteria.cs b/Source/EasyNetQ.Management.Client/StatsCriteria.cs
new file mode 100644
index 00000000..41e60a4b
--- /dev/null
+++ b/Source/EasyNetQ.Management.Client/StatsCriteria.cs
@@ -0,0 +1,21 @@
+namespace EasyNetQ.Management.Client;
+
+public record StatsCriteria(bool DisableStats, bool EnableQueueTotals)
+{
+    public readonly IEnumerable<KeyValuePair<string, string>>? QueryParameters =
+        ((DisableStats, EnableQueueTotals)) switch
+        {
+            (true, false) => new KeyValuePair<string, string>[] {
+                new KeyValuePair<string, string>("disable_stats", "true")
+            },
+            (true, true) => new KeyValuePair<string, string>[] {
+                new KeyValuePair<string, string>("disable_stats", "true"),
+                new KeyValuePair<string, string>("enable_queue_totals", "true")
+            },
+            (false, false) => null,
+            (false, true) => throw new NotSupportedException()
+        };
+
+    public static StatsCriteria Disable = new StatsCriteria(true, false);
+    public static StatsCriteria QueueTotalsOnly = new StatsCriteria(true, true);
+}