diff --git a/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/Template/ButtonTemplateMessage.cs b/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/Template/ButtonTemplateMessage.cs
index fbc2f9d6..4c92a3fb 100644
--- a/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/Template/ButtonTemplateMessage.cs
+++ b/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/Template/ButtonTemplateMessage.cs
@@ -18,6 +18,9 @@ public class ButtonTemplateMessage : IRichMessage, ITemplateMessage
 
     [JsonPropertyName("buttons")]
     public ButtonElement[] Buttons { get; set; } = new ButtonElement[0];
+
+    [JsonPropertyName("is_horizontal")]
+    public bool IsHorizontal { get; set; }
 }
 
 public class ButtonElement
@@ -34,4 +37,7 @@ public class ButtonElement
     public string? Payload { get; set; }
 
     public string Title { get; set; } = string.Empty;
+
+    [JsonPropertyName("is_primary")]
+    public bool IsPrimary { get; set; }
 }
diff --git a/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/Template/GenericTemplateMessage.cs b/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/Template/GenericTemplateMessage.cs
index 32d6a4f6..db581f78 100644
--- a/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/Template/GenericTemplateMessage.cs
+++ b/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/Template/GenericTemplateMessage.cs
@@ -16,6 +16,9 @@ public class GenericTemplateMessage<T> : IRichMessage, ITemplateMessage
     [JsonPropertyName("elements")]
     public List<T> Elements { get; set; } = new List<T>();
 
+    [JsonPropertyName("is_horizontal")]
+    public bool IsHorizontal { get; set; }
+
     [JsonPropertyName("element_type")]
     public string ElementType => typeof(T).Name;
 }
diff --git a/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/Template/MultiSelectTemplateMessage.cs b/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/Template/MultiSelectTemplateMessage.cs
index b838ba03..5e72f1b1 100644
--- a/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/Template/MultiSelectTemplateMessage.cs
+++ b/src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/Template/MultiSelectTemplateMessage.cs
@@ -11,7 +11,12 @@ public class MultiSelectTemplateMessage : IRichMessage, ITemplateMessage
 
     [JsonPropertyName("template_type")]
     public string TemplateType => TemplateTypeEnum.MultiSelect;
+
+    [JsonPropertyName("options")]
     public List<OptionElement> Options { get; set; } = new List<OptionElement>();
+
+    [JsonPropertyName("is_horizontal")]
+    public bool IsHorizontal { get; set; }
 }
 
 public class OptionElement