diff --git a/Toolkit.Foundation/Validate.cs b/Toolkit.Foundation/Validate.cs
index 1a1e9d1..90894b1 100644
--- a/Toolkit.Foundation/Validate.cs
+++ b/Toolkit.Foundation/Validate.cs
@@ -2,9 +2,9 @@
 
 public record Validate
 {
-    public static ValidateEventArgs<TValue> As<TValue>(TValue value) =>
-        new(value);
+    public static ValidateEventArgs<TSender> As<TSender>(TSender sender) =>
+        new(sender);
 
-    public static ValidateEventArgs<TValue> As<TValue>() where TValue : new() =>
-        new(new TValue());
+    public static ValidateEventArgs<TSender> As<TSender>() where TSender : new() =>
+        new(new TSender());
 }
\ No newline at end of file
diff --git a/Toolkit.Foundation/ValidateEventArgs.cs b/Toolkit.Foundation/ValidateEventArgs.cs
index ec1b6e1..409a873 100644
--- a/Toolkit.Foundation/ValidateEventArgs.cs
+++ b/Toolkit.Foundation/ValidateEventArgs.cs
@@ -1,3 +1,3 @@
 namespace Toolkit.Foundation;
 
-public record ValidateEventArgs<TValue>(TValue Value);
\ No newline at end of file
+public record ValidateEventArgs<TSender>(TSender? Sender = default);
\ No newline at end of file