diff --git a/src/Chat/IConditionContext.cs b/src/Chat/IConditionContext.cs
index a597d9c..4e53b02 100644
--- a/src/Chat/IConditionContext.cs
+++ b/src/Chat/IConditionContext.cs
@@ -8,17 +8,7 @@ public interface IConditionContext
 
     public Guid ChatId { get; }
 
-    public Guid UserId { get; }
-
-    public string? UserName { get; }
-
-    public string? UserEmail { get; }
-
-    public string? UserIpAddress { get; }
-
-    public TranslationLanguage UserLanguage { get; }
-
-    public TimeSpan UserTimeZoneOffset { get; }
+    public IUserContext User { get; }
 
     public bool IsPreview { get; }
 
diff --git a/src/Chat/IUserContext.cs b/src/Chat/IUserContext.cs
new file mode 100644
index 0000000..d96dc8f
--- /dev/null
+++ b/src/Chat/IUserContext.cs
@@ -0,0 +1,16 @@
+namespace ChatAIze.Abstractions.Chat;
+
+public interface IUserContext
+{
+    public Guid Id { get; }
+
+    public string? DisplayName { get; }
+
+    public string? Email { get; }
+
+    public string? IpAddress { get; }
+
+    public TranslationLanguage Language { get; }
+
+    public TimeSpan TimeZoneOffset { get; }
+}