diff --git a/WhatsappBusiness.CloudApi/Interfaces/IWhatsAppBusinessClient.cs b/WhatsappBusiness.CloudApi/Interfaces/IWhatsAppBusinessClient.cs
index bd48154..abdd887 100644
--- a/WhatsappBusiness.CloudApi/Interfaces/IWhatsAppBusinessClient.cs
+++ b/WhatsappBusiness.CloudApi/Interfaces/IWhatsAppBusinessClient.cs
@@ -1241,14 +1241,32 @@ public interface IWhatsAppBusinessClient
         /// <returns>Template Message Creation Response</returns>
         Task<TemplateMessageCreationResponse> CreateTemplateMessageAsync(string whatsAppBusinessAccountId, object template, WhatsAppBusinessCloudApiConfig? cloudApiConfig = null, CancellationToken cancellationToken = default);
 
-		/// <summary>
-		/// Create Whatsapp template message
-		/// </summary>
-		/// <param name="whatsAppBusinessAccountId">Whatsapp Business Account Id</param>
-		/// <param name="template">Message template type</param>
-		/// <param name="cancellationToken">Cancellation token</param>
-		/// <returns>Template Message Creation Response</returns>
-		TemplateMessageCreationResponse CreateTemplateMessage(string whatsAppBusinessAccountId, object  template, WhatsAppBusinessCloudApiConfig? cloudApiConfig = null, CancellationToken cancellationToken = default);
+        /// <summary>
+        /// Create Whatsapp template message
+        /// </summary>
+        /// <param name="whatsAppBusinessAccountId">Whatsapp Business Account Id</param>
+        /// <param name="template">Message template type</param>
+        /// <param name="cancellationToken">Cancellation token</param>
+        /// <returns>Template Message Creation Response</returns>
+        Task<TemplateMessageCreationResponse> CreateTemplateMessageAsync(string whatsAppBusinessAccountId, BaseCreateTemplateMessageRequest template, WhatsAppBusinessCloudApiConfig? cloudApiConfig = null, CancellationToken cancellationToken = default);
+
+        /// <summary>
+        /// Create Whatsapp template message
+        /// </summary>
+        /// <param name="whatsAppBusinessAccountId">Whatsapp Business Account Id</param>
+        /// <param name="template">Message template type</param>
+        /// <param name="cancellationToken">Cancellation token</param>
+        /// <returns>Template Message Creation Response</returns>
+        TemplateMessageCreationResponse CreateTemplateMessage(string whatsAppBusinessAccountId, BaseCreateTemplateMessageRequest template, WhatsAppBusinessCloudApiConfig? cloudApiConfig = null, CancellationToken cancellationToken = default);
+
+        /// <summary>
+        /// Create Whatsapp template message
+        /// </summary>
+        /// <param name="whatsAppBusinessAccountId">Whatsapp Business Account Id</param>
+        /// <param name="template">Message template type</param>
+        /// <param name="cancellationToken">Cancellation token</param>
+        /// <returns>Template Message Creation Response</returns>
+        TemplateMessageCreationResponse CreateTemplateMessage(string whatsAppBusinessAccountId, object template, WhatsAppBusinessCloudApiConfig? cloudApiConfig = null, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Get Whatsapp template message by namespace
diff --git a/WhatsappBusiness.CloudApi/Messages/Requests/BaseCreateTemplateMessageRequest.cs b/WhatsappBusiness.CloudApi/Messages/Requests/BaseCreateTemplateMessageRequest.cs
new file mode 100644
index 0000000..8035813
--- /dev/null
+++ b/WhatsappBusiness.CloudApi/Messages/Requests/BaseCreateTemplateMessageRequest.cs
@@ -0,0 +1,29 @@
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace WhatsappBusiness.CloudApi.Messages.Requests
+{
+    public class BaseCreateTemplateMessageRequest
+    {
+        [JsonProperty("name")]
+        public string Name { get; set; }
+
+        [JsonProperty("category")]
+        public string Category { get; set; }
+
+        [JsonProperty("allow_category_change", NullValueHandling = NullValueHandling.Ignore)]
+        public bool? AllowCategoryChange { get; set; }
+
+        [JsonProperty("language")]
+        public string Language { get; set; }
+
+        [JsonProperty("library_template_name", NullValueHandling = NullValueHandling.Ignore)]
+        public string? LibraryTemplateName { get; set; }
+
+        [JsonProperty("LIBRARY_TEMPLATE_BUTTON_INPUTS", NullValueHandling = NullValueHandling.Ignore)]
+        public List<object>? LibraryTemplateButtonInputs { get; set; }
+
+        [JsonProperty("components")]
+        public List<object> Components { get; set; }
+    }
+}
diff --git a/WhatsappBusiness.CloudApi/WhatsAppBusinessClient.cs b/WhatsappBusiness.CloudApi/WhatsAppBusinessClient.cs
index 9f9f364..e011150 100644
--- a/WhatsappBusiness.CloudApi/WhatsAppBusinessClient.cs
+++ b/WhatsappBusiness.CloudApi/WhatsAppBusinessClient.cs
@@ -324,14 +324,32 @@ public async Task<TemplateMessageCreationResponse> CreateTemplateMessageAsync(st
 			return await WhatsAppBusinessPostAsync<TemplateMessageCreationResponse>(template, formattedWhatsAppEndpoint, cancellationToken);
 		}
 
-		/// <summary>
+        /// <summary>
 		/// Create Whatsapp template message
 		/// </summary>
 		/// <param name="whatsAppBusinessAccountId">Whatsapp Business Account Id</param>
 		/// <param name="template">Message template type</param>
 		/// <param name="cancellationToken">Cancellation token</param>
 		/// <returns>Template Message Creation Response</returns>
-		public TemplateMessageCreationResponse CreateTemplateMessage(string whatsAppBusinessAccountId, object template, WhatsAppBusinessCloudApiConfig? cloudApiConfig = null, CancellationToken cancellationToken = default)
+		public async Task<TemplateMessageCreationResponse> CreateTemplateMessageAsync(string whatsAppBusinessAccountId, BaseCreateTemplateMessageRequest template, WhatsAppBusinessCloudApiConfig? cloudApiConfig = null, CancellationToken cancellationToken = default)
+        {
+            if (cloudApiConfig is not null)
+            {
+                _whatsAppConfig = cloudApiConfig;
+            }
+
+            var formattedWhatsAppEndpoint = WhatsAppBusinessRequestEndpoint.CreateTemplateMessage.Replace("{{WABA-ID}}", whatsAppBusinessAccountId);
+            return await WhatsAppBusinessPostAsync<TemplateMessageCreationResponse>(template, formattedWhatsAppEndpoint, cancellationToken);
+        }
+
+        /// <summary>
+        /// Create Whatsapp template message
+        /// </summary>
+        /// <param name="whatsAppBusinessAccountId">Whatsapp Business Account Id</param>
+        /// <param name="template">Message template type</param>
+        /// <param name="cancellationToken">Cancellation token</param>
+        /// <returns>Template Message Creation Response</returns>
+        public TemplateMessageCreationResponse CreateTemplateMessage(string whatsAppBusinessAccountId, object template, WhatsAppBusinessCloudApiConfig? cloudApiConfig = null, CancellationToken cancellationToken = default)
         {
             if (cloudApiConfig is not null)
             {
@@ -342,14 +360,32 @@ public TemplateMessageCreationResponse CreateTemplateMessage(string whatsAppBusi
 			return WhatsAppBusinessPostAsync<TemplateMessageCreationResponse>(template, formattedWhatsAppEndpoint, cancellationToken).GetAwaiter().GetResult();
 		}
 
-		/// <summary>
-		/// To delete media, make a DELETE call to the ID of the media you want to delete.
-		/// </summary>
-		/// <param name="mediaId">ID for the media to send a media message or media template message to your customers.</param>
-		/// <param name="isMediaOwnershipVerified">Verify the media ownership using PHONE_NUMBER_ID</param>
-		/// <param name="cancellationToken">Cancellation token</param>
-		/// <returns>BaseSuccessResponse</returns>
-		public BaseSuccessResponse DeleteMedia(string mediaId, WhatsAppBusinessCloudApiConfig? cloudApiConfig = null, bool isMediaOwnershipVerified = false, CancellationToken cancellationToken = default)
+        /// <summary>
+        /// Create Whatsapp template message
+        /// </summary>
+        /// <param name="whatsAppBusinessAccountId">Whatsapp Business Account Id</param>
+        /// <param name="template">Message template type</param>
+        /// <param name="cancellationToken">Cancellation token</param>
+        /// <returns>Template Message Creation Response</returns>
+        public TemplateMessageCreationResponse CreateTemplateMessage(string whatsAppBusinessAccountId, BaseCreateTemplateMessageRequest template, WhatsAppBusinessCloudApiConfig? cloudApiConfig = null, CancellationToken cancellationToken = default)
+        {
+            if (cloudApiConfig is not null)
+            {
+                _whatsAppConfig = cloudApiConfig;
+            }
+
+            var formattedWhatsAppEndpoint = WhatsAppBusinessRequestEndpoint.CreateTemplateMessage.Replace("{{WABA-ID}}", whatsAppBusinessAccountId);
+            return WhatsAppBusinessPostAsync<TemplateMessageCreationResponse>(template, formattedWhatsAppEndpoint, cancellationToken).GetAwaiter().GetResult();
+        }
+
+        /// <summary>
+        /// To delete media, make a DELETE call to the ID of the media you want to delete.
+        /// </summary>
+        /// <param name="mediaId">ID for the media to send a media message or media template message to your customers.</param>
+        /// <param name="isMediaOwnershipVerified">Verify the media ownership using PHONE_NUMBER_ID</param>
+        /// <param name="cancellationToken">Cancellation token</param>
+        /// <returns>BaseSuccessResponse</returns>
+        public BaseSuccessResponse DeleteMedia(string mediaId, WhatsAppBusinessCloudApiConfig? cloudApiConfig = null, bool isMediaOwnershipVerified = false, CancellationToken cancellationToken = default)
         {
             if (cloudApiConfig is not null)
             {
diff --git a/WhatsappBusiness.CloudApi/WhatsappBusiness.CloudApi.csproj b/WhatsappBusiness.CloudApi/WhatsappBusiness.CloudApi.csproj
index e555e07..719c311 100644
--- a/WhatsappBusiness.CloudApi/WhatsappBusiness.CloudApi.csproj
+++ b/WhatsappBusiness.CloudApi/WhatsappBusiness.CloudApi.csproj
@@ -12,7 +12,7 @@
     <RepositoryUrl>https://github.com/gabrieldwight/Whatsapp-Business-Cloud-Api-Net</RepositoryUrl>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
-    <Version>1.0.32</Version>
+    <Version>1.0.33</Version>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'netstandard2.1'">