diff --git a/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.System_CommandLine_NamingConventionBinder_api_is_not_changed.approved.txt b/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.System_CommandLine_NamingConventionBinder_api_is_not_changed.approved.txt
index a8c045b3dd..613415b35f 100644
--- a/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.System_CommandLine_NamingConventionBinder_api_is_not_changed.approved.txt
+++ b/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.System_CommandLine_NamingConventionBinder_api_is_not_changed.approved.txt
@@ -1,74 +1,94 @@
-System.CommandLine.NamingConventionBinder
+System.CommandLine.Binding
+  public class BindingContext, System.IServiceProvider
+    public System.CommandLine.IConsole Console { get; }
+    public System.CommandLine.ParseResult ParseResult { get; }
+    public System.Void AddService(System.Type serviceType, System.Func<System.IServiceProvider,System.Object> factory)
+    public System.Void AddService<T>(Func<System.IServiceProvider,T> factory)
+    public System.Object GetService(System.Type serviceType)
+  public struct BoundValue : System.ValueType
+    public System.Object Value { get; }
+    public IValueDescriptor ValueDescriptor { get; }
+    public IValueSource ValueSource { get; }
+    public System.String ToString()
+  public interface IValueSource
+    public System.Boolean TryGetValue(IValueDescriptor valueDescriptor, BindingContext bindingContext, ref System.Object& boundValue)
+System.CommandLine.NamingConventionBinder
   public static class BindingContextExtensions
     public static System.Void AddModelBinder(this System.CommandLine.Binding.BindingContext bindingContext, ModelBinder binder)
+    public static System.CommandLine.Binding.BindingContext GetBindingContext(this System.CommandLine.Invocation.InvocationContext ctx)
     public static ModelBinder GetOrCreateModelBinder(this System.CommandLine.Binding.BindingContext bindingContext, System.CommandLine.Binding.IValueDescriptor valueDescriptor)
+  public abstract class BindingHandler, System.CommandLine.ICommandHandler
+    public System.CommandLine.Binding.BindingContext GetBindingContext(System.CommandLine.Invocation.InvocationContext invocationContext)
+    public System.Int32 Invoke(System.CommandLine.Invocation.InvocationContext context)
+    public System.Threading.Tasks.Task<System.Int32> InvokeAsync(System.CommandLine.Invocation.InvocationContext context, System.Threading.CancellationToken cancellationToken = null)
+    public System.CommandLine.Binding.BindingContext SetBindingContext(System.CommandLine.Binding.BindingContext bindingContext)
   public static class CommandHandler
-    public static System.CommandLine.ICommandHandler Create(System.Delegate delegate)
-    public static System.CommandLine.ICommandHandler Create<T>(Action<T> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2>(Action<T1,T2> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3>(Action<T1,T2,T3> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4>(Action<T1,T2,T3,T4> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5>(Action<T1,T2,T3,T4,T5> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6>(Action<T1,T2,T3,T4,T5,T6> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7>(Action<T1,T2,T3,T4,T5,T6,T7> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8>(Action<T1,T2,T3,T4,T5,T6,T7,T8> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9>(Action<T1,T2,T3,T4,T5,T6,T7,T8,T9> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(Action<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>(Action<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>(Action<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>(Action<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>(Action<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>(Action<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>(Action<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16> action)
-    public static System.CommandLine.ICommandHandler Create<T>(Func<T,System.Int32> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2>(Func<T1,T2,System.Int32> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3>(Func<T1,T2,T3,System.Int32> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4>(Func<T1,T2,T3,T4,System.Int32> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5>(Func<T1,T2,T3,T4,T5,System.Int32> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6>(Func<T1,T2,T3,T4,T5,T6,System.Int32> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7>(Func<T1,T2,T3,T4,T5,T6,T7,System.Int32> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8>(Func<T1,T2,T3,T4,T5,T6,T7,T8,System.Int32> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,System.Int32> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,System.Int32> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,System.Int32> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,System.Int32> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,System.Int32> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,System.Int32> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,System.Int32> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,System.Int32> action)
-    public static System.CommandLine.ICommandHandler Create<T>(Func<T,System.Threading.Tasks.Task> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2>(Func<T1,T2,System.Threading.Tasks.Task> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3>(Func<T1,T2,T3,System.Threading.Tasks.Task> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4>(Func<T1,T2,T3,T4,System.Threading.Tasks.Task> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5>(Func<T1,T2,T3,T4,T5,System.Threading.Tasks.Task> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6>(Func<T1,T2,T3,T4,T5,T6,System.Threading.Tasks.Task> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7>(Func<T1,T2,T3,T4,T5,T6,T7,System.Threading.Tasks.Task> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8>(Func<T1,T2,T3,T4,T5,T6,T7,T8,System.Threading.Tasks.Task> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,System.Threading.Tasks.Task> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,System.Threading.Tasks.Task> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,System.Threading.Tasks.Task> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,System.Threading.Tasks.Task> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,System.Threading.Tasks.Task> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,System.Threading.Tasks.Task> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,System.Threading.Tasks.Task> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,System.Threading.Tasks.Task> action)
-    public static System.CommandLine.ICommandHandler Create<T>(Func<T,System.Threading.Tasks.Task<System.Int32>> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2>(Func<T1,T2,System.Threading.Tasks.Task<System.Int32>> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3>(Func<T1,T2,T3,System.Threading.Tasks.Task<System.Int32>> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4>(Func<T1,T2,T3,T4,System.Threading.Tasks.Task<System.Int32>> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5>(Func<T1,T2,T3,T4,T5,System.Threading.Tasks.Task<System.Int32>> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6>(Func<T1,T2,T3,T4,T5,T6,System.Threading.Tasks.Task<System.Int32>> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7>(Func<T1,T2,T3,T4,T5,T6,T7,System.Threading.Tasks.Task<System.Int32>> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8>(Func<T1,T2,T3,T4,T5,T6,T7,T8,System.Threading.Tasks.Task<System.Int32>> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,System.Threading.Tasks.Task<System.Int32>> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,System.Threading.Tasks.Task<System.Int32>> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,System.Threading.Tasks.Task<System.Int32>> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,System.Threading.Tasks.Task<System.Int32>> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,System.Threading.Tasks.Task<System.Int32>> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,System.Threading.Tasks.Task<System.Int32>> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,System.Threading.Tasks.Task<System.Int32>> action)
-    public static System.CommandLine.ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,System.Threading.Tasks.Task<System.Int32>> action)
-    public static System.CommandLine.ICommandHandler Create(System.Reflection.MethodInfo method, System.Object target = null)
+    public static BindingHandler Create(System.Delegate delegate)
+    public static BindingHandler Create<T>(Action<T> action)
+    public static BindingHandler Create<T1, T2>(Action<T1,T2> action)
+    public static BindingHandler Create<T1, T2, T3>(Action<T1,T2,T3> action)
+    public static BindingHandler Create<T1, T2, T3, T4>(Action<T1,T2,T3,T4> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5>(Action<T1,T2,T3,T4,T5> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6>(Action<T1,T2,T3,T4,T5,T6> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7>(Action<T1,T2,T3,T4,T5,T6,T7> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8>(Action<T1,T2,T3,T4,T5,T6,T7,T8> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9>(Action<T1,T2,T3,T4,T5,T6,T7,T8,T9> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(Action<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>(Action<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>(Action<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>(Action<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>(Action<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>(Action<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>(Action<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16> action)
+    public static BindingHandler Create<T>(Func<T,System.Int32> action)
+    public static BindingHandler Create<T1, T2>(Func<T1,T2,System.Int32> action)
+    public static BindingHandler Create<T1, T2, T3>(Func<T1,T2,T3,System.Int32> action)
+    public static BindingHandler Create<T1, T2, T3, T4>(Func<T1,T2,T3,T4,System.Int32> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5>(Func<T1,T2,T3,T4,T5,System.Int32> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6>(Func<T1,T2,T3,T4,T5,T6,System.Int32> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7>(Func<T1,T2,T3,T4,T5,T6,T7,System.Int32> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8>(Func<T1,T2,T3,T4,T5,T6,T7,T8,System.Int32> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,System.Int32> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,System.Int32> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,System.Int32> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,System.Int32> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,System.Int32> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,System.Int32> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,System.Int32> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,System.Int32> action)
+    public static BindingHandler Create<T>(Func<T,System.Threading.Tasks.Task> action)
+    public static BindingHandler Create<T1, T2>(Func<T1,T2,System.Threading.Tasks.Task> action)
+    public static BindingHandler Create<T1, T2, T3>(Func<T1,T2,T3,System.Threading.Tasks.Task> action)
+    public static BindingHandler Create<T1, T2, T3, T4>(Func<T1,T2,T3,T4,System.Threading.Tasks.Task> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5>(Func<T1,T2,T3,T4,T5,System.Threading.Tasks.Task> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6>(Func<T1,T2,T3,T4,T5,T6,System.Threading.Tasks.Task> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7>(Func<T1,T2,T3,T4,T5,T6,T7,System.Threading.Tasks.Task> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8>(Func<T1,T2,T3,T4,T5,T6,T7,T8,System.Threading.Tasks.Task> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,System.Threading.Tasks.Task> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,System.Threading.Tasks.Task> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,System.Threading.Tasks.Task> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,System.Threading.Tasks.Task> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,System.Threading.Tasks.Task> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,System.Threading.Tasks.Task> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,System.Threading.Tasks.Task> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,System.Threading.Tasks.Task> action)
+    public static BindingHandler Create<T>(Func<T,System.Threading.Tasks.Task<System.Int32>> action)
+    public static BindingHandler Create<T1, T2>(Func<T1,T2,System.Threading.Tasks.Task<System.Int32>> action)
+    public static BindingHandler Create<T1, T2, T3>(Func<T1,T2,T3,System.Threading.Tasks.Task<System.Int32>> action)
+    public static BindingHandler Create<T1, T2, T3, T4>(Func<T1,T2,T3,T4,System.Threading.Tasks.Task<System.Int32>> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5>(Func<T1,T2,T3,T4,T5,System.Threading.Tasks.Task<System.Int32>> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6>(Func<T1,T2,T3,T4,T5,T6,System.Threading.Tasks.Task<System.Int32>> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7>(Func<T1,T2,T3,T4,T5,T6,T7,System.Threading.Tasks.Task<System.Int32>> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8>(Func<T1,T2,T3,T4,T5,T6,T7,T8,System.Threading.Tasks.Task<System.Int32>> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,System.Threading.Tasks.Task<System.Int32>> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,System.Threading.Tasks.Task<System.Int32>> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,System.Threading.Tasks.Task<System.Int32>> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,System.Threading.Tasks.Task<System.Int32>> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,System.Threading.Tasks.Task<System.Int32>> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,System.Threading.Tasks.Task<System.Int32>> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,System.Threading.Tasks.Task<System.Int32>> action)
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>(Func<T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,System.Threading.Tasks.Task<System.Int32>> action)
+    public static BindingHandler Create(System.Reflection.MethodInfo method, System.Object target = null)
   public class ConstructorDescriptor, IMethodDescriptor
     public System.Collections.Generic.IReadOnlyList<ParameterDescriptor> ParameterDescriptors { get; }
     public ModelDescriptor Parent { get; }
@@ -78,7 +98,7 @@
     public static HandlerDescriptor FromMethodInfo(System.Reflection.MethodInfo methodInfo, System.Object target = null)
     public System.Collections.Generic.IReadOnlyList<ParameterDescriptor> ParameterDescriptors { get; }
     public ModelDescriptor Parent { get; }
-    public System.CommandLine.ICommandHandler GetCommandHandler()
+    public BindingHandler GetCommandHandler()
     public System.String ToString()
   public interface IMethodDescriptor
     public System.Collections.Generic.IReadOnlyList<ParameterDescriptor> ParameterDescriptors { get; }
@@ -95,7 +115,7 @@
     .ctor()
     public System.Void BindMemberFromValue<TValue>(Expression<Func<TModel,TValue>> property, System.CommandLine.Binding.IValueDescriptor valueDescriptor)
     public System.Void BindMemberFromValue<TValue>(Expression<Func<TModel,TValue>> property, Func<System.CommandLine.Binding.BindingContext,TValue> getValue)
-  public class ModelBindingCommandHandler, System.CommandLine.ICommandHandler
+  public class ModelBindingCommandHandler : BindingHandler, System.CommandLine.ICommandHandler
     public System.Void BindParameter(System.Reflection.ParameterInfo param, System.CommandLine.Argument argument)
     public System.Void BindParameter(System.Reflection.ParameterInfo param, System.CommandLine.Option option)
     public System.Int32 Invoke(System.CommandLine.Invocation.InvocationContext context)
diff --git a/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.System_CommandLine_api_is_not_changed.approved.txt b/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.System_CommandLine_api_is_not_changed.approved.txt
index a2fddaf5a3..2ea409d1ac 100644
--- a/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.System_CommandLine_api_is_not_changed.approved.txt
+++ b/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.System_CommandLine_api_is_not_changed.approved.txt
@@ -73,7 +73,7 @@ System.CommandLine
     public CommandLineBuilder UseHelp(System.Nullable<System.Int32> maxWidth = null)
     public CommandLineBuilder UseHelp(System.String name, System.String[] helpAliases)
     public CommandLineBuilder UseHelp(System.Action<System.CommandLine.Help.HelpContext> customize, System.Nullable<System.Int32> maxWidth = null)
-    public CommandLineBuilder UseHelpBuilder(System.Func<System.CommandLine.Binding.BindingContext,System.CommandLine.Help.HelpBuilder> getHelpBuilder)
+    public CommandLineBuilder UseHelpBuilder(System.Func<System.CommandLine.Invocation.InvocationContext,System.CommandLine.Help.HelpBuilder> getHelpBuilder)
     public CommandLineBuilder UseParseDirective(System.Int32 errorExitCode = 1)
     public CommandLineBuilder UseParseErrorReporting(System.Int32 errorExitCode = 1)
     public CommandLineBuilder UseSuggestDirective()
@@ -83,7 +83,7 @@ System.CommandLine
     public CommandLineBuilder UseVersionOption(System.String name, System.String[] aliases)
   public class CommandLineConfiguration
     public static CommandLineBuilder CreateBuilder(Command rootCommand)
-    .ctor(Command command, System.Boolean enablePosixBundling = True, System.Boolean enableTokenReplacement = True, System.Collections.Generic.IReadOnlyList<System.CommandLine.Invocation.InvocationMiddleware> middlewarePipeline = null, System.Func<System.CommandLine.Binding.BindingContext,System.CommandLine.Help.HelpBuilder> helpBuilderFactory = null, System.CommandLine.Parsing.TryReplaceToken tokenReplacer = null)
+    .ctor(Command command, System.Boolean enablePosixBundling = True, System.Boolean enableTokenReplacement = True, System.Collections.Generic.IReadOnlyList<System.CommandLine.Invocation.InvocationMiddleware> middlewarePipeline = null, System.Func<System.CommandLine.Invocation.InvocationContext,System.CommandLine.Help.HelpBuilder> helpBuilderFactory = null, System.CommandLine.Parsing.TryReplaceToken tokenReplacer = null)
     public System.Collections.Generic.IReadOnlyList<Directive> Directives { get; }
     public System.Boolean EnablePosixBundling { get; }
     public System.Boolean EnableTokenReplacement { get; }
@@ -172,24 +172,11 @@ System.CommandLine
     public System.Collections.Generic.IEnumerable<System.CommandLine.Completions.CompletionItem> GetCompletions(System.CommandLine.Completions.CompletionContext context)
     public System.String ToString()
 System.CommandLine.Binding
-  public class BindingContext, System.IServiceProvider
-    public System.CommandLine.IConsole Console { get; }
-    public System.CommandLine.ParseResult ParseResult { get; }
-    public System.Void AddService(System.Type serviceType, System.Func<System.IServiceProvider,System.Object> factory)
-    public System.Void AddService<T>(Func<System.IServiceProvider,T> factory)
-    public System.Object GetService(System.Type serviceType)
-  public struct BoundValue : System.ValueType
-    public System.Object Value { get; }
-    public IValueDescriptor ValueDescriptor { get; }
-    public IValueSource ValueSource { get; }
-    public System.String ToString()
   public interface IValueDescriptor
     public System.Boolean HasDefaultValue { get; }
     public System.String ValueName { get; }
     public System.Type ValueType { get; }
     public System.Object GetDefaultValue()
-  public interface IValueSource
-    public System.Boolean TryGetValue(IValueDescriptor valueDescriptor, BindingContext bindingContext, ref System.Object& boundValue)
 System.CommandLine.Completions
   public abstract class CompletionContext
     public static CompletionContext Empty { get; }
@@ -253,7 +240,6 @@ System.CommandLine.Help
 System.CommandLine.Invocation
   public class InvocationContext
     .ctor(System.CommandLine.ParseResult parseResult, System.CommandLine.IConsole console = null)
-    public System.CommandLine.Binding.BindingContext BindingContext { get; }
     public System.CommandLine.IConsole Console { get; set; }
     public System.Int32 ExitCode { get; set; }
     public System.CommandLine.Help.HelpBuilder HelpBuilder { get; }
diff --git a/src/System.CommandLine.Generator.Tests/GeneratedCommandHandlerTests.cs b/src/System.CommandLine.Generator.Tests/GeneratedCommandHandlerTests.cs
index c9a6e50fce..91796ac8f4 100644
--- a/src/System.CommandLine.Generator.Tests/GeneratedCommandHandlerTests.cs
+++ b/src/System.CommandLine.Generator.Tests/GeneratedCommandHandlerTests.cs
@@ -136,25 +136,22 @@ public async Task Can_generate_handler_with_well_know_parameters_types()
             IConsole? boundConsole = null;
             ParseResult? boundParseResult = null;
             HelpBuilder? boundHelpBuilder = null;
-            BindingContext? boundBindingContext = null;
 
             void Execute(
                 InvocationContext invocationContext,
                 IConsole console,
                 ParseResult parseResult,
-                HelpBuilder helpBuilder,
-                BindingContext bindingContext)
+                HelpBuilder helpBuilder)
             {
                 boundInvocationContext = invocationContext;
                 boundConsole = console;
                 boundParseResult = parseResult;
                 boundHelpBuilder = helpBuilder;
-                boundBindingContext = bindingContext;
             }
 
             var command = new Command("command");
 
-            command.SetHandler<Action<InvocationContext, IConsole, ParseResult, HelpBuilder, BindingContext>>(Execute);
+            command.SetHandler<Action<InvocationContext, IConsole, ParseResult, HelpBuilder>>(Execute);
 
             await command.InvokeAsync("command", _console);
 
@@ -162,7 +159,6 @@ void Execute(
             boundConsole.Should().Be(_console);
             boundParseResult.Should().NotBeNull();
             boundHelpBuilder.Should().NotBeNull();
-            boundBindingContext.Should().NotBeNull();
         }
 
         [Fact]
diff --git a/src/System.CommandLine.Generator/Parameters/BindingContextParameter.cs b/src/System.CommandLine.Generator/Parameters/BindingContextParameter.cs
index 4e8b75a9bd..2614007971 100644
--- a/src/System.CommandLine.Generator/Parameters/BindingContextParameter.cs
+++ b/src/System.CommandLine.Generator/Parameters/BindingContextParameter.cs
@@ -10,7 +10,7 @@ public BindingContextParameter(ITypeSymbol bindingContextType)
         }
 
         public override string GetValueFromContext()
-            => "context.BindingContext";
+            => "context.GetBindingContext()";
 
         public override int GetHashCode()
             => base.GetHashCode();
diff --git a/src/System.CommandLine.Generator/WellKnownTypes.cs b/src/System.CommandLine.Generator/WellKnownTypes.cs
index fda81b51ad..8586491283 100644
--- a/src/System.CommandLine.Generator/WellKnownTypes.cs
+++ b/src/System.CommandLine.Generator/WellKnownTypes.cs
@@ -13,7 +13,6 @@ internal class WellKnownTypes
         public INamedTypeSymbol ParseResult { get; }
         public INamedTypeSymbol InvocationContext { get; }
         public INamedTypeSymbol HelpBuilder { get; }
-        public INamedTypeSymbol BindingContext { get; }
         public IEqualityComparer<ISymbol?> Comparer { get; }
 
         public WellKnownTypes(Compilation compilation, IEqualityComparer<ISymbol?> comparer)
@@ -22,7 +21,6 @@ public WellKnownTypes(Compilation compilation, IEqualityComparer<ISymbol?> compa
             ParseResult = GetType("System.CommandLine.ParseResult");
             InvocationContext = GetType("System.CommandLine.Invocation.InvocationContext");
             HelpBuilder = GetType("System.CommandLine.Help.HelpBuilder");
-            BindingContext = GetType("System.CommandLine.Binding.BindingContext");
 
             INamedTypeSymbol GetType(string typeName)
                 => compilation.GetTypeByMetadataName(typeName)
@@ -59,9 +57,9 @@ internal bool TryGet(ISymbol symbol, out Parameter? parameter)
                 return true;
             }
 
-            if (Comparer.Equals(BindingContext, symbol))
+            if (symbol.MetadataName == "System.CommandLine.Binding.BindingContext" && symbol is INamedTypeSymbol bindingContext)
             {
-                parameter = new BindingContextParameter(BindingContext);
+                parameter = new BindingContextParameter(bindingContext);
                 return true;
             }
 
diff --git a/src/System.CommandLine.Hosting/HostingExtensions.cs b/src/System.CommandLine.Hosting/HostingExtensions.cs
index 93573e7332..9abf1a7554 100644
--- a/src/System.CommandLine.Hosting/HostingExtensions.cs
+++ b/src/System.CommandLine.Hosting/HostingExtensions.cs
@@ -31,10 +31,11 @@ public static CommandLineBuilder UseHost(this CommandLineBuilder builder,
                 {
                     config.AddCommandLineDirectives(invocation.ParseResult, configurationDirective);
                 });
+                var bindingContext = invocation.GetBindingContext();
                 hostBuilder.ConfigureServices(services =>
                 {
                     services.AddSingleton(invocation);
-                    services.AddSingleton(invocation.BindingContext);
+                    services.AddSingleton(bindingContext);
                     services.AddSingleton(invocation.Console);
                     services.AddTransient(_ => invocation.InvocationResult);
                     services.AddTransient(_ => invocation.ParseResult);
@@ -44,7 +45,7 @@ public static CommandLineBuilder UseHost(this CommandLineBuilder builder,
 
                 using var host = hostBuilder.Build();
 
-                invocation.BindingContext.AddService(typeof(IHost), _ => host);
+                bindingContext.AddService(typeof(IHost), _ => host);
 
                 await host.StartAsync(cancellationToken);
 
@@ -109,13 +110,16 @@ public static IHostBuilder UseCommandHandler(this IHostBuilder builder, Type com
                 && invocation.ParseResult.CommandResult.Command is Command command
                 && command.GetType() == commandType)
             {
-                invocation.BindingContext.AddService(handlerType, c => c.GetService<IHost>().Services.GetService(handlerType));
                 builder.ConfigureServices(services =>
                 {
                     services.AddTransient(handlerType);
                 });
 
-                command.Handler = CommandHandler.Create(handlerType.GetMethod(nameof(ICommandHandler.InvokeAsync)));
+                BindingHandler bindingHandler = CommandHandler.Create(handlerType.GetMethod(nameof(ICommandHandler.InvokeAsync)));
+                // NullBindingHandler that accumulated services registered so far, before handler creation
+                bindingHandler.SetBindingContext(command.Handler is BindingHandler pre ? pre.GetBindingContext(invocation) : null);
+                command.Handler = bindingHandler;
+                bindingHandler.GetBindingContext(invocation).AddService(handlerType, c => c.GetService<IHost>().Services.GetService(handlerType));
             }
 
             return builder;
@@ -147,7 +151,7 @@ public static IHost GetHost(this InvocationContext invocationContext)
         {
             _ = invocationContext ?? throw new ArgumentNullException(paramName: nameof(invocationContext));
             var hostModelBinder = new ModelBinder<IHost>();
-            return (IHost)hostModelBinder.CreateInstance(invocationContext.BindingContext);
+            return (IHost)hostModelBinder.CreateInstance(invocationContext.GetBindingContext());
         }
     }
 }
diff --git a/src/System.CommandLine.NamingConventionBinder.Tests/ModelBinderTests.cs b/src/System.CommandLine.NamingConventionBinder.Tests/ModelBinderTests.cs
index ab3be94522..5d2a97e273 100644
--- a/src/System.CommandLine.NamingConventionBinder.Tests/ModelBinderTests.cs
+++ b/src/System.CommandLine.NamingConventionBinder.Tests/ModelBinderTests.cs
@@ -33,7 +33,7 @@ public void Option_arguments_are_bound_by_name_to_constructor_parameters(
             OptionBuilder.CreateOption("--value", type)
         };
 
-        var bindingContext = new InvocationContext(command.Parse(commandLine)).BindingContext;
+        var bindingContext = new InvocationContext(command.Parse(commandLine)).GetBindingContext();
 
         var instance = binder.CreateInstance(bindingContext);
 
@@ -60,7 +60,7 @@ public void Command_arguments_are_bound_by_name_to_constructor_parameters(
             ArgumentBuilder.CreateArgument(type)
         };
 
-        var bindingContext = new InvocationContext(command.Parse(commandLine)).BindingContext;
+        var bindingContext = new InvocationContext(command.Parse(commandLine)).GetBindingContext();
 
         var instance = binder.CreateInstance(bindingContext);
 
@@ -83,7 +83,7 @@ public void Command_arguments_are_bound_by_name_to_complex_constructor_parameter
             ArgumentBuilder.CreateArgument(type)
         };
 
-        var bindingContext = new InvocationContext(command.Parse(commandLine)).BindingContext;
+        var bindingContext = new InvocationContext(command.Parse(commandLine)).GetBindingContext();
 
         var instance = binder.CreateInstance(bindingContext);
 
@@ -107,7 +107,7 @@ public void Explicitly_configured_default_values_can_be_bound_by_name_to_constru
         command.Options.Add(option);
         var binder = new ModelBinder(typeof(ClassWithMultiLetterCtorParameters));
 
-        var bindingContext = new InvocationContext(Parser.Parse(command, "")).BindingContext;
+        var bindingContext = new InvocationContext(Parser.Parse(command, "")).GetBindingContext();
 
         var instance = (ClassWithMultiLetterCtorParameters)binder.CreateInstance(bindingContext);
 
@@ -132,7 +132,7 @@ public void Option_arguments_are_bound_by_name_to_property_setters(
             OptionBuilder.CreateOption("--value", type)
         };
 
-        var bindingContext = new InvocationContext(command.Parse(commandLine)).BindingContext;
+        var bindingContext = new InvocationContext(command.Parse(commandLine)).GetBindingContext();
 
         var instance = binder.CreateInstance(bindingContext);
 
@@ -159,7 +159,7 @@ public void Command_arguments_are_bound_by_name_to_property_setters(
             ArgumentBuilder.CreateArgument(type)
         };
 
-        var bindingContext = new InvocationContext(command.Parse(commandLine)).BindingContext;
+        var bindingContext = new InvocationContext(command.Parse(commandLine)).GetBindingContext();
 
         var instance = binder.CreateInstance(bindingContext);
 
@@ -178,7 +178,7 @@ public void Types_having_constructors_accepting_a_single_string_are_bound_using_
         var command = new Command("the-command");
         command.Options.Add(option);
         var binder = new ModelBinder(typeof(ClassWithCtorParameter<DirectoryInfo>));
-        var bindingContext = new InvocationContext(command.Parse($"--value \"{tempPath}\"")).BindingContext;
+        var bindingContext = new InvocationContext(command.Parse($"--value \"{tempPath}\"")).GetBindingContext();
 
         var instance = (ClassWithCtorParameter<DirectoryInfo>)binder.CreateInstance(bindingContext);
 
@@ -194,7 +194,7 @@ public void Explicitly_configured_default_values_can_be_bound_by_name_to_propert
         command.Options.Add(option);
         var binder = new ModelBinder(typeof(ClassWithSetter<string>));
 
-        var bindingContext = new InvocationContext(command.Parse("")).BindingContext;
+        var bindingContext = new InvocationContext(command.Parse("")).GetBindingContext();
 
         var instance = (ClassWithSetter<string>)binder.CreateInstance(bindingContext);
 
@@ -212,7 +212,7 @@ public void Property_setters_with_no_default_value_and_no_matching_option_are_no
         var binder = new ModelBinder(typeof(ClassWithSettersAndCtorParametersWithDifferentNames));
 
         var bindingContext = new InvocationContext(
-            command.Parse("")).BindingContext;
+            command.Parse("")).GetBindingContext();
 
         var instance = (ClassWithSettersAndCtorParametersWithDifferentNames)binder.CreateInstance(bindingContext);
 
@@ -226,7 +226,7 @@ public void Parse_result_can_be_used_to_create_an_instance_without_doing_handler
         {
             new Option<int>("--int-option")
         };
-        var bindingContext = new InvocationContext(command.Parse("the-command --int-option 123")).BindingContext;
+        var bindingContext = new InvocationContext(command.Parse("the-command --int-option 123")).GetBindingContext();
         var binder = new ModelBinder(typeof(ClassWithMultiLetterSetters));
 
         var instance = (ClassWithMultiLetterSetters)binder.CreateInstance(bindingContext);
@@ -242,7 +242,7 @@ public void Parse_result_can_be_used_to_modify_an_existing_instance_without_doin
             new Option<int>("--int-option")
         };
         var instance = new ClassWithMultiLetterSetters();
-        var bindingContext = new InvocationContext(command.Parse("the-command --int-option 123")).BindingContext;
+        var bindingContext = new InvocationContext(command.Parse("the-command --int-option 123")).GetBindingContext();
         var binder = new ModelBinder(typeof(ClassWithMultiLetterSetters));
 
         binder.UpdateInstance(instance, bindingContext);
@@ -256,7 +256,7 @@ public void Modify_an_existing_instance_should_keep_all_default_values_if_no_arg
         Command parser = new ("the-command");
 
         var instance = new ClassWithComplexTypes();
-        var bindingContext = new InvocationContext(parser.Parse("the-command")).BindingContext;
+        var bindingContext = new InvocationContext(parser.Parse("the-command")).GetBindingContext();
         var binder = new ModelBinder(typeof(ClassWithComplexTypes));
 
         binder.UpdateInstance(instance, bindingContext);
@@ -277,7 +277,7 @@ public void Values_from_options_on_parent_commands_are_bound_by_name_by_default(
 
         var parseResult = parentCommand.Parse("parent-command --int-option 123 child-command");
 
-        var bindingContext = new InvocationContext(parseResult).BindingContext;
+        var bindingContext = new InvocationContext(parseResult).GetBindingContext();
 
         var instance = (ClassWithMultiLetterSetters)binder.CreateInstance(bindingContext);
 
@@ -300,7 +300,7 @@ public void Default_values_from_options_on_parent_commands_are_bound_by_name_by_
 
         var parseResult = parentCommand.Parse("parent-command child-command");
 
-        var bindingContext = new InvocationContext(parseResult).BindingContext;
+        var bindingContext = new InvocationContext(parseResult).GetBindingContext();
 
         var instance = (ClassWithMultiLetterSetters)binder.CreateInstance(bindingContext);
 
@@ -320,7 +320,7 @@ public void Values_from_parent_command_arguments_are_bound_by_name_by_default()
 
         var parseResult = parentCommand.Parse("parent-command 123 child-command");
 
-        var bindingContext = new InvocationContext(parseResult).BindingContext;
+        var bindingContext = new InvocationContext(parseResult).GetBindingContext();
 
         var instance = (ClassWithMultiLetterSetters)binder.CreateInstance(bindingContext);
 
@@ -343,7 +343,7 @@ public void Default_values_from_parent_command_arguments_are_bound_by_name_by_de
 
         var parseResult = parentCommand.Parse("parent-command child-command");
 
-        var bindingContext = new InvocationContext(parseResult).BindingContext;
+        var bindingContext = new InvocationContext(parseResult).GetBindingContext();
 
         var instance = (ClassWithMultiLetterSetters)binder.CreateInstance(bindingContext);
 
@@ -367,7 +367,7 @@ public void Values_from_options_on_parent_commands_can_be_bound_regardless_of_na
             c => c.IntOption,
             option);
 
-        var bindingContext = new InvocationContext(parentCommand.Parse("parent-command -x 123 child-command")).BindingContext;
+        var bindingContext = new InvocationContext(parentCommand.Parse("parent-command -x 123 child-command")).GetBindingContext();
 
         var instance = (ClassWithMultiLetterSetters)binder.CreateInstance(bindingContext);
 
@@ -385,7 +385,7 @@ public void Arbitrary_values_can_be_bound()
             c => c.IntOption,
             _ => 123);
 
-        var bindingContext = new InvocationContext(command.Parse("the-command")).BindingContext;
+        var bindingContext = new InvocationContext(command.Parse("the-command")).GetBindingContext();
 
         var instance = (ClassWithMultiLetterSetters)binder.CreateInstance(bindingContext);
 
@@ -407,7 +407,7 @@ public void PropertyInfo_can_be_bound_to_option()
             propertyInfo,
             option);
 
-        var bindingContext = new InvocationContext(command.Parse("the-command --fred 42")).BindingContext;
+        var bindingContext = new InvocationContext(command.Parse("the-command --fred 42")).GetBindingContext();
 
         var instance = (ClassWithMultiLetterSetters)binder.CreateInstance(bindingContext);
 
@@ -427,7 +427,7 @@ public void PropertyInfo_can_be_bound_to_argument()
 
         binder.BindMemberFromValue(propertyInfo, argument);
 
-        var bindingContext = new InvocationContext(command.Parse("the-command 42")).BindingContext;
+        var bindingContext = new InvocationContext(command.Parse("the-command 42")).GetBindingContext();
 
         var instance = (ClassWithMultiLetterSetters)binder.CreateInstance(bindingContext);
 
@@ -447,7 +447,7 @@ public void PropertyExpression_can_be_bound_to_option()
             i => i.IntOption,
             option);
 
-        var bindingContext = new InvocationContext(command.Parse("the-command --fred 42")).BindingContext;
+        var bindingContext = new InvocationContext(command.Parse("the-command --fred 42")).GetBindingContext();
 
         var instance = (ClassWithMultiLetterSetters)binder.CreateInstance(bindingContext);
 
@@ -467,7 +467,7 @@ public void PropertyExpression_can_be_bound_to_argument()
             i => i.IntOption,
             argument);
 
-        var bindingContext = new InvocationContext(command.Parse("the-command 42")).BindingContext;
+        var bindingContext = new InvocationContext(command.Parse("the-command 42")).GetBindingContext();
 
         var instance = (ClassWithMultiLetterSetters)binder.CreateInstance(bindingContext);
 
@@ -479,7 +479,7 @@ public void Option_argument_is_bound_to_longest_constructor()
     {
         var option = new Option<int>("--int-property");
 
-        var bindingContext = new InvocationContext(new RootCommand { option }.Parse("--int-property 42")).BindingContext;
+        var bindingContext = new InvocationContext(new RootCommand { option }.Parse("--int-property 42")).GetBindingContext();
         var binder = new ModelBinder<ClassWithMultipleCtor>();
         var instance = binder.CreateInstance(bindingContext) as ClassWithMultipleCtor;
 
@@ -493,7 +493,7 @@ public void Command_argument_is_bound_to_longest_constructor()
         var rootCommand = new RootCommand();
         rootCommand.Arguments.Add(new Argument<int>(nameof(ClassWithMultipleCtor.IntProperty)));
 
-        var bindingContext = new InvocationContext(rootCommand.Parse("42")).BindingContext;
+        var bindingContext = new InvocationContext(rootCommand.Parse("42")).GetBindingContext();
         var binder = new ModelBinder<ClassWithMultipleCtor>();
         var instance = binder.CreateInstance(bindingContext) as ClassWithMultipleCtor;
 
@@ -508,7 +508,7 @@ public void Explicit_model_binder_binds_only_to_configured_properties()
         var stringOption = new Option<string>("--string-property");
         RootCommand rootCommand = new RootCommand { intOption, stringOption };
 
-        var bindingContext = new InvocationContext(rootCommand.Parse("--int-property 42 --string-property Hello")).BindingContext;
+        var bindingContext = new InvocationContext(rootCommand.Parse("--int-property 42 --string-property Hello")).GetBindingContext();
         var binder = new ModelBinder<ClassWithMultiLetterSetters>
         {
             EnforceExplicitBinding = true
@@ -601,62 +601,6 @@ int Handler(IEnumerable<string> names)
         }
     }
 
-    [Fact]
-    public void Custom_ModelBinders_specified_via_BindingContext_can_be_used_for_option_binding()
-    {
-        ClassWithSetter<int> boundInstance = null;
-
-        var rootCommand = new RootCommand
-        {
-            new Option<int>("--value")
-        };
-
-        rootCommand.Handler = CommandHandler.Create<ClassWithSetter<int>>(x => boundInstance = x);
-
-        var config = new CommandLineBuilder(rootCommand)
-                     .AddMiddleware(context =>
-                     {
-                         var binder = new ModelBinder<ClassWithSetter<int>>();
-
-                         binder.BindMemberFromValue(instance => instance.Value, _ => 456);
-
-                         context.BindingContext.AddModelBinder(binder);
-                     })
-                     .Build();
-
-        config.Invoke("--value 123");
-
-        boundInstance.Value.Should().Be(456);
-    }
-
-    [Fact]
-    public void Custom_ModelBinders_specified_via_BindingContext_can_be_used_for_command_argument_binding()
-    {
-        ClassWithSetter<int> boundInstance = null;
-
-        var rootCommand = new RootCommand
-        {
-            new Argument<int>("arg")
-        };
-
-        rootCommand.Handler = CommandHandler.Create<ClassWithSetter<int>>(x => boundInstance = x);
-
-        var config = new CommandLineBuilder(rootCommand)
-                     .AddMiddleware(context =>
-                     {
-                         var binder = new ModelBinder<ClassWithSetter<int>>();
-
-                         binder.BindMemberFromValue(instance => instance.Value, _ => 456);
-
-                         context.BindingContext.AddModelBinder(binder);
-                     })
-                     .Build();
-
-        config.Invoke("123");
-
-        boundInstance.Value.Should().Be(456);
-    }
-
     [Fact]
     public void Default_values_from_options_with_the_same_type_are_bound_and_use_their_own_defaults()
     {
diff --git a/src/System.CommandLine/Binding/BindingContext.cs b/src/System.CommandLine.NamingConventionBinder/BindingContext.cs
similarity index 100%
rename from src/System.CommandLine/Binding/BindingContext.cs
rename to src/System.CommandLine.NamingConventionBinder/BindingContext.cs
diff --git a/src/System.CommandLine.NamingConventionBinder/BindingContextExtensions.cs b/src/System.CommandLine.NamingConventionBinder/BindingContextExtensions.cs
index 92d26539b2..54ccace357 100644
--- a/src/System.CommandLine.NamingConventionBinder/BindingContextExtensions.cs
+++ b/src/System.CommandLine.NamingConventionBinder/BindingContextExtensions.cs
@@ -2,6 +2,9 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.CommandLine.Binding;
+using System.CommandLine.Invocation;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace System.CommandLine.NamingConventionBinder;
 
@@ -10,6 +13,24 @@ namespace System.CommandLine.NamingConventionBinder;
 /// </summary>
 public static class BindingContextExtensions
 {
+    private sealed class DummyStateHoldingHandler : BindingHandler
+    {
+        public override int Invoke(InvocationContext context) => 0;
+
+        public override Task<int> InvokeAsync(InvocationContext context, CancellationToken cancellationToken = default) => Task.FromResult(0);
+    }
+
+    public static BindingContext GetBindingContext(this InvocationContext ctx)
+    {
+        // parsing resulted with no handler or it was not created yet, we fake it to just store the BindingContext between the calls
+        if (ctx.ParseResult.CommandResult.Command.Handler is null)
+        {
+            ctx.ParseResult.CommandResult.Command.Handler = new DummyStateHoldingHandler();
+        }
+
+        return ((BindingHandler)ctx.ParseResult.CommandResult.Command.Handler).GetBindingContext(ctx);
+    }
+
     /// <summary>
     /// Adds a model binder which can be used to bind a specific type.
     /// </summary>
diff --git a/src/System.CommandLine.NamingConventionBinder/BindingHandler.cs b/src/System.CommandLine.NamingConventionBinder/BindingHandler.cs
new file mode 100644
index 0000000000..a640932bf8
--- /dev/null
+++ b/src/System.CommandLine.NamingConventionBinder/BindingHandler.cs
@@ -0,0 +1,23 @@
+using System.CommandLine.Binding;
+using System.CommandLine.Invocation;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace System.CommandLine.NamingConventionBinder
+{
+    public abstract class BindingHandler : ICommandHandler
+    {
+        private BindingContext? _bindingContext;
+
+        /// <summary>
+        /// The binding context for the current invocation.
+        /// </summary>
+        public BindingContext GetBindingContext(InvocationContext invocationContext) => _bindingContext ??= new BindingContext(invocationContext);
+
+        public BindingContext SetBindingContext(BindingContext bindingContext) => _bindingContext = bindingContext;
+
+        public abstract int Invoke(InvocationContext context);
+
+        public abstract Task<int> InvokeAsync(InvocationContext context, CancellationToken cancellationToken = default);
+    }
+}
diff --git a/src/System.CommandLine/Binding/BoundValue.cs b/src/System.CommandLine.NamingConventionBinder/BoundValue.cs
similarity index 100%
rename from src/System.CommandLine/Binding/BoundValue.cs
rename to src/System.CommandLine.NamingConventionBinder/BoundValue.cs
diff --git a/src/System.CommandLine.NamingConventionBinder/CommandHandler.cs b/src/System.CommandLine.NamingConventionBinder/CommandHandler.cs
index dbcf4daed9..1f2b94eb75 100644
--- a/src/System.CommandLine.NamingConventionBinder/CommandHandler.cs
+++ b/src/System.CommandLine.NamingConventionBinder/CommandHandler.cs
@@ -16,8 +16,8 @@ public static class CommandHandler
     /// Creates a command handler based on a delegate.
     /// </summary>
     /// <param name="delegate">The delegate to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create(Delegate @delegate) =>
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create(Delegate @delegate) =>
         HandlerDescriptor.FromDelegate(@delegate).GetCommandHandler();
 
     /// <summary>
@@ -25,16 +25,16 @@ public static ICommandHandler Create(Delegate @delegate) =>
     /// </summary>
     /// <param name="method">The method to be called when the command handler is invoked.</param>
     /// <param name="target">A target instance to be used if the specified method is an instance method. This can be null if the method is static.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create(MethodInfo method, object? target = null) =>
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create(MethodInfo method, object? target = null) =>
         HandlerDescriptor.FromMethodInfo(method, target).GetCommandHandler();
 
     /// <summary>
     /// Creates a command handler based on an <see cref="Action{T}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Action{T}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T>(
         Action<T> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -42,8 +42,8 @@ public static ICommandHandler Create<T>(
     /// Creates a command handler based on an <see cref="Action{T1,T2}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Action{T1,T2}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2>(
         Action<T1, T2> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -51,8 +51,8 @@ public static ICommandHandler Create<T1, T2>(
     /// Creates a command handler based on an <see cref="Action{T1,T2,T3}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Action{T1,T2,T3}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3>(
         Action<T1, T2, T3> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -60,8 +60,8 @@ public static ICommandHandler Create<T1, T2, T3>(
     /// Creates a command handler based on an <see cref="Action{T1,T2,T3,T4}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Action{T1,T2,T3,T4}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4>(
         Action<T1, T2, T3, T4> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -69,8 +69,8 @@ public static ICommandHandler Create<T1, T2, T3, T4>(
     /// Creates a command handler based on an <see cref="Action{T1,T2,T3,T4,T5}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Action{T1,T2,T3,T4,T5}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5>(
         Action<T1, T2, T3, T4, T5> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -78,8 +78,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5>(
     /// Creates a command handler based on an <see cref="Action{T1,T2,T3,T4,T5,T6}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Action{T1,T2,T3,T4,T5,T6}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6>(
         Action<T1, T2, T3, T4, T5, T6> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -87,8 +87,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6>(
     /// Creates a command handler based on an <see cref="Action{T1,T2,T3,T4,T5,T6,T7}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Action{T1,T2,T3,T4,T5,T6,T7}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7>(
         Action<T1, T2, T3, T4, T5, T6, T7> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -96,8 +96,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7>(
     /// Creates a command handler based on an <see cref="Action{T1,T2,T3,T4,T5,T6,T7,T8}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Action{T1,T2,T3,T4,T5,T6,T7,T8}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8>(
         Action<T1, T2, T3, T4, T5, T6, T7, T8> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -105,8 +105,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8>(
     /// Creates a command handler based on an <see cref="Action{T1,T2,T3,T4,T5,T6,T7,T8,T9}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Action{T1,T2,T3,T4,T5,T6,T7,T8,T9}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9>(
         Action<T1, T2, T3, T4, T5, T6, T7, T8, T9> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -114,8 +114,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9>(
     /// Creates a command handler based on an <see cref="Action{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Action{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(
         Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -123,8 +123,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(
     /// Creates a command handler based on an <see cref="Action{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Action{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>(
         Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -132,8 +132,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T1
     /// Creates a command handler based on an <see cref="Action{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Action{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>(
         Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -141,8 +141,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T1
     /// Creates a command handler based on an <see cref="Action{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Action{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>(
         Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -150,8 +150,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T1
     /// Creates a command handler based on an <see cref="Action{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Action{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>(
         Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -159,8 +159,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T1
     /// Creates a command handler based on an <see cref="Action{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Action{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>(
         Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -168,8 +168,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T1
     /// Creates a command handler based on an <see cref="Action{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Action{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>(
         Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -177,8 +177,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T1
     /// Creates a command handler based on a <see cref="Func{T,Int32}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T,Int32}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T>(
         Func<T, int> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -186,8 +186,8 @@ public static ICommandHandler Create<T>(
     /// Creates a command handler based on a <see cref="Func{T1,T2,Int32}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,Int32}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2>(
         Func<T1, T2, int> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -195,8 +195,8 @@ public static ICommandHandler Create<T1, T2>(
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,Int32}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,Int32}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3>(
         Func<T1, T2, T3, int> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -204,8 +204,8 @@ public static ICommandHandler Create<T1, T2, T3>(
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,Int32}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,Int32}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4>(
         Func<T1, T2, T3, T4, int> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -213,8 +213,8 @@ public static ICommandHandler Create<T1, T2, T3, T4>(
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,Int32}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,Int32}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5>(
         Func<T1, T2, T3, T4, T5, int> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -222,8 +222,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5>(
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,T6,Int32}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,T6,Int32}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6>(
         Func<T1, T2, T3, T4, T5, T6, int> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -231,8 +231,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6>(
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,T6,T7,Int32}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,T6,T7,Int32}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7>(
         Func<T1, T2, T3, T4, T5, T6, T7, int> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -240,8 +240,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7>(
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,Int32}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,Int32}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8>(
         Func<T1, T2, T3, T4, T5, T6, T7, T8, int> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -249,8 +249,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8>(
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,Int32}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,Int32}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9>(
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, int> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -258,8 +258,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9>(
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,Int32}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,Int32}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, int> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -267,8 +267,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,Int32}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,Int32}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>(
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, int> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -276,8 +276,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T1
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,Int32}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,Int32}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>(
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, int> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -285,8 +285,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T1
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,Int32}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,Int32}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>(
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, int> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -294,8 +294,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T1
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,Int32}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,Int32}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>(
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, int> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -303,8 +303,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T1
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,Int32}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,Int32}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>(
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, int> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -312,8 +312,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T1
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,Int32}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,Int32}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>(
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, int> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
     
@@ -321,8 +321,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T1
     /// Creates a command handler based on a <see cref="Func{T,Task}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T,Task}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T>(
         Func<T, Task> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -330,8 +330,8 @@ public static ICommandHandler Create<T>(
     /// Creates a command handler based on a <see cref="Func{T1,T2,Task}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,Task}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2>(
         Func<T1, T2, Task> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -339,8 +339,8 @@ public static ICommandHandler Create<T1, T2>(
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,Task}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,Task}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3>(
         Func<T1, T2, T3, Task> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -348,8 +348,8 @@ public static ICommandHandler Create<T1, T2, T3>(
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,Task}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,Task}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4>(
         Func<T1, T2, T3, T4, Task> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -357,8 +357,8 @@ public static ICommandHandler Create<T1, T2, T3, T4>(
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,Task}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,Task}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5>(
         Func<T1, T2, T3, T4, T5, Task> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -366,8 +366,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5>(
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,T6,Task}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,T6,Task}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6>(
         Func<T1, T2, T3, T4, T5, T6, Task> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -375,8 +375,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6>(
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,T6,T7,Task}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,T6,T7,Task}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7>(
         Func<T1, T2, T3, T4, T5, T6, T7, Task> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -384,8 +384,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7>(
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,Task}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,Task}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8>(
         Func<T1, T2, T3, T4, T5, T6, T7, T8, Task> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -393,8 +393,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8>(
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,Task}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,Task}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9>(
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, Task> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -402,8 +402,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9>(
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,Task}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,Task}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, Task> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -411,8 +411,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,Task}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,Task}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>(
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, Task> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -420,8 +420,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T1
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,Task}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,Task}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>(
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, Task> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -429,8 +429,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T1
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,Task}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,Task}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>(
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, Task> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -438,8 +438,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T1
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,Task}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,Task}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>(
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, Task> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -447,8 +447,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T1
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,Task}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,Task}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>(
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, Task> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -456,8 +456,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T1
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,Task}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,Task}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>(
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, Task> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -465,8 +465,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T1
     /// Creates a command handler based on a <see cref="Func{T,Task}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T,Task}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T>(
         Func<T, Task<int>> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -474,8 +474,8 @@ public static ICommandHandler Create<T>(
     /// Creates a command handler based on a <see cref="Func{T1,T2,Task}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,Task}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2>(
         Func<T1, T2, Task<int>> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -483,8 +483,8 @@ public static ICommandHandler Create<T1, T2>(
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,Task}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,Task}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3>(
         Func<T1, T2, T3, Task<int>> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -492,8 +492,8 @@ public static ICommandHandler Create<T1, T2, T3>(
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,Task}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,Task}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4>(
         Func<T1, T2, T3, T4, Task<int>> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -501,8 +501,8 @@ public static ICommandHandler Create<T1, T2, T3, T4>(
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,Task}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,Task}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5>(
         Func<T1, T2, T3, T4, T5, Task<int>> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -510,8 +510,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5>(
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,T6,Task}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,T6,Task}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6>(
         Func<T1, T2, T3, T4, T5, T6, Task<int>> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -519,8 +519,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6>(
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,T6,T7,Task}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,T6,T7,Task}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7>(
         Func<T1, T2, T3, T4, T5, T6, T7, Task<int>> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -528,8 +528,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7>(
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,Task}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,Task}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8>(
         Func<T1, T2, T3, T4, T5, T6, T7, T8, Task<int>> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -537,8 +537,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8>(
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,Task}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,Task}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9>(
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, Task<int>> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -546,8 +546,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9>(
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,Task}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,Task}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, Task<int>> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -555,8 +555,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,Task}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,Task}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>(
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, Task<int>> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -564,8 +564,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T1
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,Task}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,Task}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>(
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, Task<int>> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -573,8 +573,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T1
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,Task}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,Task}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>(
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, Task<int>> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -582,8 +582,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T1
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,Task}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,Task}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>(
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, Task<int>> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -591,8 +591,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T1
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,Task}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,Task}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>(
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, Task<int>> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
@@ -600,8 +600,8 @@ public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T1
     /// Creates a command handler based on a <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,Task}"/>.
     /// </summary>
     /// <param name="action">The <see cref="Func{T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,Task}"/> to be called when the command handler is invoked.</param>
-    /// <returns>An instance of <see cref="ICommandHandler"/>.</returns>
-    public static ICommandHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>(
+    /// <returns>An instance of <see cref="BindingHandler"/>.</returns>
+    public static BindingHandler Create<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>(
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, Task<int>> action) =>
         HandlerDescriptor.FromDelegate(action).GetCommandHandler();
 
diff --git a/src/System.CommandLine.NamingConventionBinder/DelegateHandlerDescriptor.cs b/src/System.CommandLine.NamingConventionBinder/DelegateHandlerDescriptor.cs
index 03ce3d96e6..f3d545043c 100644
--- a/src/System.CommandLine.NamingConventionBinder/DelegateHandlerDescriptor.cs
+++ b/src/System.CommandLine.NamingConventionBinder/DelegateHandlerDescriptor.cs
@@ -15,7 +15,7 @@ public DelegateHandlerDescriptor(Delegate handlerDelegate)
         _handlerDelegate = handlerDelegate;
     }
 
-    public override ICommandHandler GetCommandHandler()
+    public override BindingHandler GetCommandHandler()
     {
         return new ModelBindingCommandHandler(
             _handlerDelegate,
diff --git a/src/System.CommandLine.NamingConventionBinder/HandlerDescriptor.cs b/src/System.CommandLine.NamingConventionBinder/HandlerDescriptor.cs
index 5cb37c1adb..c833924234 100644
--- a/src/System.CommandLine.NamingConventionBinder/HandlerDescriptor.cs
+++ b/src/System.CommandLine.NamingConventionBinder/HandlerDescriptor.cs
@@ -14,7 +14,7 @@ public abstract class HandlerDescriptor : IMethodDescriptor
     /// <summary>
     /// Gets a command handler that can bind to the specifications of the descriptor.
     /// </summary>
-    public abstract ICommandHandler GetCommandHandler();
+    public abstract BindingHandler GetCommandHandler();
 
     /// <inheritdoc />
     public abstract ModelDescriptor? Parent { get; }
diff --git a/src/System.CommandLine/Binding/IValueSource.cs b/src/System.CommandLine.NamingConventionBinder/IValueSource.cs
similarity index 100%
rename from src/System.CommandLine/Binding/IValueSource.cs
rename to src/System.CommandLine.NamingConventionBinder/IValueSource.cs
diff --git a/src/System.CommandLine.NamingConventionBinder/MethodInfoHandlerDescriptor.cs b/src/System.CommandLine.NamingConventionBinder/MethodInfoHandlerDescriptor.cs
index 6f4e09e744..004c1a0c47 100644
--- a/src/System.CommandLine.NamingConventionBinder/MethodInfoHandlerDescriptor.cs
+++ b/src/System.CommandLine.NamingConventionBinder/MethodInfoHandlerDescriptor.cs
@@ -21,7 +21,7 @@ public MethodInfoHandlerDescriptor(
         _invocationTarget = target;
     }
 
-    public override ICommandHandler GetCommandHandler()
+    public override BindingHandler GetCommandHandler()
     {
         if (_invocationTarget is null)
         {
diff --git a/src/System.CommandLine.NamingConventionBinder/ModelBindingCommandHandler.cs b/src/System.CommandLine.NamingConventionBinder/ModelBindingCommandHandler.cs
index 97bf39bae4..d69576fd56 100644
--- a/src/System.CommandLine.NamingConventionBinder/ModelBindingCommandHandler.cs
+++ b/src/System.CommandLine.NamingConventionBinder/ModelBindingCommandHandler.cs
@@ -14,7 +14,7 @@ namespace System.CommandLine.NamingConventionBinder;
 /// <summary>
 /// Instantiates values to be passed to a user-defined command handler method.
 /// </summary>
-public class ModelBindingCommandHandler : ICommandHandler
+public class ModelBindingCommandHandler : BindingHandler
 {
     private readonly Delegate? _handlerDelegate;
     private readonly object? _invocationTarget;
@@ -57,9 +57,9 @@ internal ModelBindingCommandHandler(
     /// <param name="context">The current invocation context.</param>
     /// <param name="cancellationToken">A token that can be used to cancel the invocation.</param>
     /// <returns>A task whose value can be used to set the process exit code.</returns>
-    public async Task<int> InvokeAsync(InvocationContext context, CancellationToken cancellationToken = default)
+    public override async Task<int> InvokeAsync(InvocationContext context, CancellationToken cancellationToken = default)
     {
-        var bindingContext = context.BindingContext;
+        var bindingContext = GetBindingContext(context);
 
         var (boundValues, _) = ModelBinder.GetBoundValues(
             _invokeArgumentBindingSources,
@@ -132,5 +132,5 @@ private void BindValueSource(ParameterInfo param, IValueSource valueSource)
                                                        x.ValueType == param.ParameterType);
 
     /// <inheritdoc />
-    public int Invoke(InvocationContext context) => InvokeAsync(context, CancellationToken.None).GetAwaiter().GetResult();
+    public override int Invoke(InvocationContext context) => InvokeAsync(context, CancellationToken.None).GetAwaiter().GetResult();
 }
\ No newline at end of file
diff --git a/src/System.CommandLine/Invocation/ServiceProvider.cs b/src/System.CommandLine.NamingConventionBinder/ServiceProvider.cs
similarity index 98%
rename from src/System.CommandLine/Invocation/ServiceProvider.cs
rename to src/System.CommandLine.NamingConventionBinder/ServiceProvider.cs
index 2e96f4abe9..b08fa94934 100644
--- a/src/System.CommandLine/Invocation/ServiceProvider.cs
+++ b/src/System.CommandLine.NamingConventionBinder/ServiceProvider.cs
@@ -18,7 +18,7 @@ internal ServiceProvider(BindingContext bindingContext)
                         {
                             [typeof(ParseResult)] = _ => bindingContext.ParseResult,
                             [typeof(IConsole)] = _ => bindingContext.Console,
-                            [typeof(HelpBuilder)] = _ => bindingContext.ParseResult.Configuration.HelpBuilderFactory(bindingContext),
+                            [typeof(HelpBuilder)] = _ => bindingContext.ParseResult.Configuration.HelpBuilderFactory(bindingContext.InvocationContext),
                             [typeof(BindingContext)] = _ => bindingContext
                         };
         }
diff --git a/src/System.CommandLine/Binding/ServiceProviderValueSource.cs b/src/System.CommandLine.NamingConventionBinder/ServiceProviderValueSource.cs
similarity index 100%
rename from src/System.CommandLine/Binding/ServiceProviderValueSource.cs
rename to src/System.CommandLine.NamingConventionBinder/ServiceProviderValueSource.cs
diff --git a/src/System.CommandLine.NamingConventionBinder/System.CommandLine.NamingConventionBinder.csproj b/src/System.CommandLine.NamingConventionBinder/System.CommandLine.NamingConventionBinder.csproj
index 3e9813d5f8..cf80841f38 100644
--- a/src/System.CommandLine.NamingConventionBinder/System.CommandLine.NamingConventionBinder.csproj
+++ b/src/System.CommandLine.NamingConventionBinder/System.CommandLine.NamingConventionBinder.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <IsPackable>true</IsPackable>
@@ -14,10 +14,6 @@
     <DebugType>portable</DebugType>
   </PropertyGroup>
    
-  <ItemGroup>
-    <Compile Include="..\System.Diagnostics.CodeAnalysis.cs" Link="System.Diagnostics.CodeAnalysis.cs" />
-  </ItemGroup>
-   
   <ItemGroup>
     <ProjectReference Include="..\System.CommandLine\System.CommandLine.csproj" />
   </ItemGroup>
diff --git a/src/System.CommandLine/Binding/ValueDescriptorDefaultValueSource.cs b/src/System.CommandLine.NamingConventionBinder/ValueDescriptorDefaultValueSource.cs
similarity index 100%
rename from src/System.CommandLine/Binding/ValueDescriptorDefaultValueSource.cs
rename to src/System.CommandLine.NamingConventionBinder/ValueDescriptorDefaultValueSource.cs
diff --git a/src/System.CommandLine.Rendering.Tests/ViewRenderingTests.cs b/src/System.CommandLine.Rendering.Tests/ViewRenderingTests.cs
index b3d004b58b..5dfc3e55ea 100644
--- a/src/System.CommandLine.Rendering.Tests/ViewRenderingTests.cs
+++ b/src/System.CommandLine.Rendering.Tests/ViewRenderingTests.cs
@@ -17,28 +17,18 @@ public class ViewRenderingTests
         private readonly TestTerminal _terminal = new();
 
         [Fact]
-        public void Views_can_be_registered_for_specific_types()
+        public void Views_can_be_used_for_specific_types()
         {
             ParseResult parseResult = null;
 
-            var command = new RootCommand
+            var command = new RootCommand();
+            command.SetHandler(ctx =>
             {
-                Handler = CommandHandler.Create<ParseResult, IConsole>(
-                    (r, c) =>
-                    {
-                        parseResult = r;
-                        c.Append(new ParseResultView(r));
-                    })
-            };
+                parseResult = ctx.ParseResult;
+                ctx.Console.Append(new ParseResultView(parseResult));
+            });
 
-            var config = new CommandLineBuilder(command)
-                         .AddMiddleware(c =>
-                         {
-                             c.BindingContext
-                              .AddService(
-                                  s => new ParseResultView(s.GetService<ParseResult>()));
-                         })
-                         .Build();
+            var config = new CommandLineBuilder(command).Build();
 
             var terminal = new TestTerminal
             {
diff --git a/src/System.CommandLine/Builder/CommandLineBuilder.cs b/src/System.CommandLine/Builder/CommandLineBuilder.cs
index 1941badfce..4c600066ad 100644
--- a/src/System.CommandLine/Builder/CommandLineBuilder.cs
+++ b/src/System.CommandLine/Builder/CommandLineBuilder.cs
@@ -36,7 +36,7 @@ public partial class CommandLineBuilder
         // that is why we don't use List<ValueTuple> for middleware
         private List<Tuple<InvocationMiddleware, int>>? _middlewareList;
         private Action<HelpContext>? _customizeHelpBuilder;
-        private Func<BindingContext, HelpBuilder>? _helpBuilderFactory;
+        private Func<InvocationContext, HelpBuilder>? _helpBuilderFactory;
 
         /// <param name="rootCommand">The root command of the application.</param>
         public CommandLineBuilder(Command rootCommand)
@@ -52,18 +52,18 @@ public CommandLineBuilder(Command rootCommand)
         internal void CustomizeHelpLayout(Action<HelpContext> customize) => 
             _customizeHelpBuilder = customize;
 
-        internal void UseHelpBuilderFactory(Func<BindingContext, HelpBuilder> factory) =>
+        internal void UseHelpBuilderFactory(Func<InvocationContext, HelpBuilder> factory) =>
             _helpBuilderFactory = factory;
 
-        private Func<BindingContext, HelpBuilder> GetHelpBuilderFactory()
+        private Func<InvocationContext, HelpBuilder> GetHelpBuilderFactory()
         {
             return CreateHelpBuilder;
 
-            HelpBuilder CreateHelpBuilder(BindingContext bindingContext)
+            HelpBuilder CreateHelpBuilder(InvocationContext invocationContext)
             {
                 var helpBuilder = _helpBuilderFactory is { }
-                                             ? _helpBuilderFactory(bindingContext)
-                                             : CommandLineConfiguration.DefaultHelpBuilderFactory(bindingContext, MaxHelpWidth);
+                                             ? _helpBuilderFactory(invocationContext)
+                                             : CommandLineConfiguration.DefaultHelpBuilderFactory(invocationContext, MaxHelpWidth);
 
                 helpBuilder.OnCustomize = _customizeHelpBuilder;
 
diff --git a/src/System.CommandLine/Builder/CommandLineBuilderExtensions.cs b/src/System.CommandLine/Builder/CommandLineBuilderExtensions.cs
index 211a97d09d..94e593c00f 100644
--- a/src/System.CommandLine/Builder/CommandLineBuilderExtensions.cs
+++ b/src/System.CommandLine/Builder/CommandLineBuilderExtensions.cs
@@ -252,7 +252,7 @@ internal CommandLineBuilder UseHelp(HelpOption helpOption, int? maxWidth = null)
         /// <param name="getHelpBuilder">A delegate that returns an instance of <see cref="HelpBuilder"/></param>
         /// <returns>The reference to this <see cref="CommandLineBuilder"/> instance.</returns>
         public CommandLineBuilder UseHelpBuilder(
-            Func<BindingContext, HelpBuilder> getHelpBuilder)
+            Func<InvocationContext, HelpBuilder> getHelpBuilder)
         {
             UseHelpBuilderFactory(getHelpBuilder);
 
diff --git a/src/System.CommandLine/CommandLineConfiguration.cs b/src/System.CommandLine/CommandLineConfiguration.cs
index efd791aa35..8d8fb8154c 100644
--- a/src/System.CommandLine/CommandLineConfiguration.cs
+++ b/src/System.CommandLine/CommandLineConfiguration.cs
@@ -37,7 +37,7 @@ public class CommandLineConfiguration
 
         internal readonly IReadOnlyList<InvocationMiddleware> Middleware;
 
-        private Func<BindingContext, HelpBuilder>? _helpBuilderFactory;
+        private Func<InvocationContext, HelpBuilder>? _helpBuilderFactory;
         private TryReplaceToken? _tokenReplacer;
 
         /// <summary>
@@ -54,7 +54,7 @@ public CommandLineConfiguration(
             bool enablePosixBundling = true,
             bool enableTokenReplacement = true,
             IReadOnlyList<InvocationMiddleware>? middlewarePipeline = null,
-            Func<BindingContext, HelpBuilder>? helpBuilderFactory = null,
+            Func<InvocationContext, HelpBuilder>? helpBuilderFactory = null,
             TryReplaceToken? tokenReplacer = null)
             : this(
                   command,
@@ -80,7 +80,7 @@ internal CommandLineConfiguration(
             int maxLevenshteinDistance,
             TimeSpan? processTerminationTimeout,
             IReadOnlyList<InvocationMiddleware>? middlewarePipeline,
-            Func<BindingContext, HelpBuilder>? helpBuilderFactory,
+            Func<InvocationContext, HelpBuilder>? helpBuilderFactory,
             TryReplaceToken? tokenReplacer,
             Action<Exception, InvocationContext>? exceptionHandler)
         {
@@ -100,7 +100,7 @@ internal CommandLineConfiguration(
 
         public static CommandLineBuilder CreateBuilder(Command rootCommand) => new CommandLineBuilder(rootCommand);
 
-        internal static HelpBuilder DefaultHelpBuilderFactory(BindingContext context, int? requestedMaxWidth = null)
+        internal static HelpBuilder DefaultHelpBuilderFactory(InvocationContext context, int? requestedMaxWidth = null)
         {
             int maxWidth = requestedMaxWidth ?? int.MaxValue;
             if (requestedMaxWidth is null && context.Console is SystemConsole systemConsole)
@@ -132,7 +132,7 @@ internal static HelpBuilder DefaultHelpBuilderFactory(BindingContext context, in
         /// </remarks>
         public bool EnableTokenReplacement { get; }
 
-        internal Func<BindingContext, HelpBuilder> HelpBuilderFactory => _helpBuilderFactory ??= context => DefaultHelpBuilderFactory(context);
+        internal Func<InvocationContext, HelpBuilder> HelpBuilderFactory => _helpBuilderFactory ??= context => DefaultHelpBuilderFactory(context);
 
         internal TryReplaceToken? TokenReplacer =>
             EnableTokenReplacement
diff --git a/src/System.CommandLine/Invocation/InvocationContext.cs b/src/System.CommandLine/Invocation/InvocationContext.cs
index 03de4d652f..90edfdd009 100644
--- a/src/System.CommandLine/Invocation/InvocationContext.cs
+++ b/src/System.CommandLine/Invocation/InvocationContext.cs
@@ -1,10 +1,8 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Binding;
 using System.CommandLine.Help;
 using System.CommandLine.IO;
-using System.CommandLine.Parsing;
 
 namespace System.CommandLine.Invocation
 {
@@ -14,7 +12,6 @@ namespace System.CommandLine.Invocation
     public sealed class InvocationContext
     {
         private HelpBuilder? _helpBuilder;
-        private BindingContext? _bindingContext;
         private IConsole? _console;
 
         /// <param name="parseResult">The result of the current parse operation.</param>
@@ -25,11 +22,6 @@ public InvocationContext(ParseResult parseResult, IConsole? console = null)
             _console = console;
         }
 
-        /// <summary>
-        /// The binding context for the current invocation.
-        /// </summary>
-        public BindingContext BindingContext => _bindingContext ??= new BindingContext(this);
-
         /// <summary>
         /// The console to which output should be written during the current invocation.
         /// </summary>
@@ -42,7 +34,7 @@ public IConsole Console
         /// <summary>
         /// Enables writing help output.
         /// </summary>
-        public HelpBuilder HelpBuilder => _helpBuilder ??= ParseResult.Configuration.HelpBuilderFactory(BindingContext);
+        public HelpBuilder HelpBuilder => _helpBuilder ??= ParseResult.Configuration.HelpBuilderFactory(this);
 
         /// <summary>
         /// The parse result for the current invocation.