diff --git a/Toolkit.Foundation/DecoratorService.cs b/Toolkit.Foundation/DecoratorService.cs
index f3fcfb7..0958361 100644
--- a/Toolkit.Foundation/DecoratorService.cs
+++ b/Toolkit.Foundation/DecoratorService.cs
@@ -3,7 +3,7 @@
 public class DecoratorService<T> :
     IDecoratorService<T>
 {
-    public T? Value { get; private set; }
+    public T? Service { get; private set; }
 
-    public void Set(T value) => Value = value;
+    public void Set(T value) => Service = value;
 }
\ No newline at end of file
diff --git a/Toolkit.Foundation/IDecoratorService.cs b/Toolkit.Foundation/IDecoratorService.cs
index 4205fb3..b558d8d 100644
--- a/Toolkit.Foundation/IDecoratorService.cs
+++ b/Toolkit.Foundation/IDecoratorService.cs
@@ -2,7 +2,7 @@
 
 public interface IDecoratorService<T>
 {
-    T? Value { get; }
+    T? Service { get; }
 
-    void Set(T value);
+    void Set(T service);
 }
\ No newline at end of file
diff --git a/Toolkit.Foundation/Query.cs b/Toolkit.Foundation/Query.cs
new file mode 100644
index 0000000..def084a
--- /dev/null
+++ b/Toolkit.Foundation/Query.cs
@@ -0,0 +1,10 @@
+namespace Toolkit.Foundation;
+
+public class Query
+{
+    public static QueryEventArgs<TValue> As<TValue>(TValue value) =>
+        new(value);
+
+    public static QueryEventArgs<TValue> As<TValue>() where TValue : new() =>
+        new(new TValue());
+}
\ No newline at end of file
diff --git a/Toolkit.Foundation/QueryEventArgs.cs b/Toolkit.Foundation/QueryEventArgs.cs
new file mode 100644
index 0000000..91a3852
--- /dev/null
+++ b/Toolkit.Foundation/QueryEventArgs.cs
@@ -0,0 +1,3 @@
+namespace Toolkit.Foundation;
+
+public record QueryEventArgs<TValue>(TValue Value);
\ No newline at end of file
diff --git a/Toolkit.Foundation/RequestEventArgs.cs b/Toolkit.Foundation/RequestEventArgs.cs
index b625de6..109508e 100644
--- a/Toolkit.Foundation/RequestEventArgs.cs
+++ b/Toolkit.Foundation/RequestEventArgs.cs
@@ -1,3 +1,3 @@
 namespace Toolkit.Foundation;
 
-public record RequestEventArgs<TValue>(TValue Value);
\ No newline at end of file
+public record RequestEventArgs<TValue>(TValue Value);