diff --git a/Scr/Sdk4me.GraphQL.Tests/KnowledgeArticleTemplateTest.cs b/Scr/Sdk4me.GraphQL.Tests/KnowledgeArticleTemplateTest.cs
new file mode 100644
index 0000000..63b050b
--- /dev/null
+++ b/Scr/Sdk4me.GraphQL.Tests/KnowledgeArticleTemplateTest.cs
@@ -0,0 +1,22 @@
+namespace Sdk4me.GraphQL.Tests
+{
+    [TestClass]
+    public class KnowledgeArticleTemplateTest
+    {
+        private readonly Sdk4meClient client = Client.Get();
+
+        [TestMethod]
+        public void Get()
+        {
+            DataList<KnowledgeArticleTemplate> knowledgeArticleTemplates = client.Get(Query.KnowledgeArticleTemplate
+                .View(KnowledgeArticleTemplateView.All)
+                .SelectAll()
+                .SelectServiceInstances(new ServiceInstanceQuery()
+                    .SelectAll())
+                ).Result;
+
+            Assert.IsNotNull(knowledgeArticleTemplates);
+            Console.WriteLine($"Count: {knowledgeArticleTemplates.Count}");
+        }
+    }
+}
diff --git a/Scr/Sdk4me.GraphQL.Tests/KnowledgeArticleTest.cs b/Scr/Sdk4me.GraphQL.Tests/KnowledgeArticleTest.cs
index 4388ab5..24136f8 100644
--- a/Scr/Sdk4me.GraphQL.Tests/KnowledgeArticleTest.cs
+++ b/Scr/Sdk4me.GraphQL.Tests/KnowledgeArticleTest.cs
@@ -11,6 +11,8 @@ public void Get()
             DataList<KnowledgeArticle> knowledgeArticles = client.Get(Query.KnowledgeArticle
                 .View(KnowledgeArticleView.All)
                 .SelectAll()
+                .SelectCustomFieldsAttachments(new AttachmentQuery()
+                    .SelectAll())
                 .SelectDescriptionAttachments(new AttachmentQuery()
                     .SelectAll())
                 .SelectInstructionsAttachments(new AttachmentQuery()
diff --git a/Scr/Sdk4me.GraphQL.Tests/NoteTest.cs b/Scr/Sdk4me.GraphQL.Tests/NoteTest.cs
index 91f31fc..155e589 100644
--- a/Scr/Sdk4me.GraphQL.Tests/NoteTest.cs
+++ b/Scr/Sdk4me.GraphQL.Tests/NoteTest.cs
@@ -12,7 +12,7 @@ public void AddNote()
             {
                 Text = "Hello World !!!",
                 Internal = true,
-                OwnerId = "NG1lMjQuMjMwMzE5MjI1MDU5QDRtZS1kZW1vLmNvbS9SZXEvNzA1MzE"
+                OwnerId = "NG1lMjQuMjMwNDEwMDAyODU3QDRtZS1kZW1vLmNvbS9SZXEvNzA1MzE"
             }
             ).Result;
 
diff --git a/Scr/Sdk4me.GraphQL/Entities/KnowledgeArticle.cs b/Scr/Sdk4me.GraphQL/Entities/KnowledgeArticle.cs
index 916002f..2f16116 100644
--- a/Scr/Sdk4me.GraphQL/Entities/KnowledgeArticle.cs
+++ b/Scr/Sdk4me.GraphQL/Entities/KnowledgeArticle.cs
@@ -35,6 +35,23 @@ public class KnowledgeArticle : Node
         [JsonProperty("createdBy")]
         public Person? CreatedBy { get; internal set; }
 
+        /// <summary>
+        /// Values of custom fields.
+        /// </summary>
+        [JsonProperty("customFields")]
+        public CustomFieldCollection? CustomFields { get; internal set; }
+
+        [JsonProperty("customFieldsAttachments")]
+        internal NodeCollection<Attachment>? CustomFieldsAttachmentsCollection { get; set; }
+
+        /// <summary>
+        /// Inline images linked to one of the custom fields.
+        /// </summary>
+        public DataList<Attachment>? CustomFieldsAttachments
+        {
+            get => CustomFieldsAttachmentsCollection?.Data;
+        }
+
         /// <summary>
         /// Describes the situation and/or environment in which the instructions of the knowledge article may be helpful.
         /// </summary>
@@ -120,7 +137,7 @@ public DataList<Request>? Requests
         internal NodeCollection<ServiceInstance>? ServiceInstancesCollection { get; set; }
 
         /// <summary>
-        /// Services linked to this knowledge article.
+        /// Service instances linked to this knowledge article.
         /// </summary>
         public DataList<ServiceInstance>? ServiceInstances
         {
@@ -151,6 +168,12 @@ public DataList<ServiceInstance>? ServiceInstances
         [JsonProperty("subject"), Sdk4meField(true)]
         public string? Subject { get; internal set; }
 
+        /// <summary>
+        /// The knowledge article template that this knowledge article is based on.
+        /// </summary>
+        [JsonProperty("template")]
+        public KnowledgeArticleTemplate? Template { get; internal set; }
+
         [JsonProperty("translations")]
         internal NodeCollection<Translation>? TranslationsCollection { get; set; }
 
@@ -177,6 +200,7 @@ public DataList<Translation>? Translations
         internal override HashSet<QueryPageInfo> GetQueryPageInfo(string fieldName, int depth)
         {
             HashSet<QueryPageInfo> retval = new();
+            retval.AddRange(CustomFieldsAttachmentsCollection?.GetQueryPageInfo("customFieldsAttachments", depth + 1));
             retval.AddRange(DescriptionAttachmentsCollection?.GetQueryPageInfo("descriptionAttachments", depth + 1));
             retval.AddRange(InstructionsAttachmentsCollection?.GetQueryPageInfo("instructionsAttachments", depth + 1));
             retval.AddRange(RequestsCollection?.GetQueryPageInfo("requests", depth + 1));
@@ -187,6 +211,7 @@ internal override HashSet<QueryPageInfo> GetQueryPageInfo(string fieldName, int
 
         internal override void AddToCollection(object data)
         {
+            CustomFieldsAttachments?.AddRange((data as KnowledgeArticle)?.CustomFieldsAttachments);
             DescriptionAttachments?.AddRange((data as KnowledgeArticle)?.DescriptionAttachments);
             InstructionsAttachments?.AddRange((data as KnowledgeArticle)?.InstructionsAttachments);
             Requests?.AddRange((data as KnowledgeArticle)?.Requests);
diff --git a/Scr/Sdk4me.GraphQL/Entities/KnowledgeArticleCreateInput.cs b/Scr/Sdk4me.GraphQL/Entities/KnowledgeArticleCreateInput.cs
index 874e5c8..17d516d 100644
--- a/Scr/Sdk4me.GraphQL/Entities/KnowledgeArticleCreateInput.cs
+++ b/Scr/Sdk4me.GraphQL/Entities/KnowledgeArticleCreateInput.cs
@@ -7,6 +7,9 @@ public class KnowledgeArticleCreateInput : PropertyChangeSet
     {
         private string? source;
         private string? sourceID;
+        private CustomFieldCollection? customFields;
+        private List<AttachmentInput>? customFieldsAttachments;
+        private DateOnly? archiveDate;
         private bool? coveredSpecialists;
         private string? createdById;
         private string? description;
@@ -17,10 +20,10 @@ public class KnowledgeArticleCreateInput : PropertyChangeSet
         private bool? keyContacts;
         private string? keywords;
         private string? serviceId;
+        private List<string>? serviceInstanceIds;
         private KnowledgeArticleStatus? status;
         private string? subject;
-        private DateOnly? archiveDate;
-        private List<string>? serviceInstanceIds;
+        private string? templateId;
         private string? clientMutationId;
 
         /// <summary>
@@ -43,6 +46,36 @@ public string? SourceID
             set => sourceID = Set("sourceID", value);
         }
 
+        /// <summary>
+        /// Values for custom fields to be used by the UI Extension that is linked to the record.
+        /// </summary>
+        [JsonProperty("customFields")]
+        public CustomFieldCollection? CustomFields
+        {
+            get => customFields;
+            set => customFields = Set("customFields", value);
+        }
+
+        /// <summary>
+        /// The attachments used in the custom fields' values.
+        /// </summary>
+        [JsonProperty("customFieldsAttachments")]
+        public List<AttachmentInput>? CustomFieldsAttachments
+        {
+            get => customFieldsAttachments;
+            set => customFieldsAttachments = Set("customFieldsAttachments", value);
+        }
+
+        /// <summary>
+        /// The date until which the knowledge article will be active. The knowledge article will be archived at the beginning of this day. When the knowledge article is archived, its status will automatically be set to "Archived".
+        /// </summary>
+        [JsonProperty("archiveDate")]
+        public DateOnly? ArchiveDate
+        {
+            get => archiveDate;
+            set => archiveDate = Set("archiveDate", value);
+        }
+
         /// <summary>
         /// Whether the knowledge article needs to be available to the people who are a member of the support team of one of the service instances that are selected in the Coverage section of an active SLA for the service that is linked to the article.
         /// </summary>
@@ -143,6 +176,16 @@ public string? ServiceId
             set => serviceId = Set("serviceId", value);
         }
 
+        /// <summary>
+        /// Identifiers of service instances linked to this knowledge article.
+        /// </summary>
+        [JsonProperty("serviceInstanceIds")]
+        public List<string>? ServiceInstanceIds
+        {
+            get => serviceInstanceIds;
+            set => serviceInstanceIds = Set("serviceInstanceIds", value);
+        }
+
         /// <summary>
         /// The current status of the knowledge article.
         /// </summary>
@@ -164,23 +207,13 @@ public string? Subject
         }
 
         /// <summary>
-        /// The date until which the knowledge article will be active. The knowledge article will be archived at the beginning of this day. When the knowledge article is archived, its status will automatically be set to "Archived".
+        /// Identifier of the knowledge article template that this knowledge article is based on.
         /// </summary>
-        [JsonProperty("archiveDate")]
-        public DateOnly? ArchiveDate
+        [JsonProperty("templateId")]
+        public string? TemplateId
         {
-            get => archiveDate;
-            set => archiveDate = Set("archiveDate", value);
-        }
-
-        /// <summary>
-        /// Identifiers of services linked to this knowledge article.
-        /// </summary>
-        [JsonProperty("serviceInstanceIds")]
-        public List<string>? ServiceInstanceIds
-        {
-            get => serviceInstanceIds;
-            set => serviceInstanceIds = Set("serviceInstanceIds", value);
+            get => templateId;
+            set => templateId = Set("templateId", value);
         }
 
         /// <summary>
diff --git a/Scr/Sdk4me.GraphQL/Entities/KnowledgeArticleTemplate.cs b/Scr/Sdk4me.GraphQL/Entities/KnowledgeArticleTemplate.cs
new file mode 100644
index 0000000..52da87d
--- /dev/null
+++ b/Scr/Sdk4me.GraphQL/Entities/KnowledgeArticleTemplate.cs
@@ -0,0 +1,85 @@
+namespace Sdk4me.GraphQL
+{
+    /// <summary>
+    /// The <see href="https://developer.4me.com/graphql/object/knowledgearticletemplate/">KnowledgeArticleTemplate</see> object.
+    /// </summary>
+    public class KnowledgeArticleTemplate : Node
+    {
+        /// <summary>
+        /// The account this record belongs to.
+        /// </summary>
+        [JsonProperty("account"), Sdk4meField(true)]
+        public Account? Account { get; internal set; }
+
+        /// <summary>
+        /// The date and time at which the record was created.
+        /// </summary>
+        [JsonProperty("createdAt"), Sdk4meField(true)]
+        public DateTime? CreatedAt { get; internal set; }
+
+        /// <summary>
+        /// Whether the knowledge article template may no longer be used to create knowledge articles.
+        /// </summary>
+        [JsonProperty("disabled"), Sdk4meField(true)]
+        public bool? Disabled { get; internal set; }
+
+        /// <summary>
+        /// Service that is applied to knowledge articles using this template.
+        /// </summary>
+        [JsonProperty("service"), Sdk4meField(true)]
+        public Service? Service { get; internal set; }
+
+        [JsonProperty("serviceInstances")]
+        internal NodeCollection<ServiceInstance>? ServiceInstancesCollection { get; set; }
+
+        /// <summary>
+        /// Service instances that are applied to knowledge articles using this template.
+        /// </summary>
+        public DataList<ServiceInstance>? ServiceInstances
+        {
+            get => ServiceInstancesCollection?.Data;
+        }
+
+        /// <summary>
+        /// An identifier for the client application submitting the resource or the name of an external system.
+        /// </summary>
+        [JsonProperty("source"), Sdk4meField(true)]
+        public string? Source { get; internal set; }
+
+        /// <summary>
+        /// The unique identifier of the resource in an external system.
+        /// </summary>
+        [JsonProperty("sourceID"), Sdk4meField(true)]
+        public string? SourceID { get; internal set; }
+
+        /// <summary>
+        /// A short description of the knowledge article template.
+        /// </summary>
+        [JsonProperty("subject"), Sdk4meField(true)]
+        public string? Subject { get; internal set; }
+
+        /// <summary>
+        /// The UI extension that is applied to knowledge articles using this template.
+        /// </summary>
+        [JsonProperty("uiExtension")]
+        public UiExtension? UiExtension { get; internal set; }
+
+        /// <summary>
+        /// The date and time of the last update of the record. If the record has no updates it contains the <c>createdAt</c> value.
+        /// </summary>
+        [JsonProperty("updatedAt"), Sdk4meField(true)]
+        public DateTime? UpdatedAt { get; internal set; }
+
+        internal override HashSet<QueryPageInfo> GetQueryPageInfo(string fieldName, int depth)
+        {
+            HashSet<QueryPageInfo> retval = new();
+            retval.AddRange(ServiceInstancesCollection?.GetQueryPageInfo("serviceInstances", depth + 1));
+            return retval;
+        }
+
+        internal override void AddToCollection(object data)
+        {
+            ServiceInstances?.AddRange((data as KnowledgeArticleTemplate)?.ServiceInstances);
+        }
+    }
+}
diff --git a/Scr/Sdk4me.GraphQL/Entities/KnowledgeArticleUpdateInput.cs b/Scr/Sdk4me.GraphQL/Entities/KnowledgeArticleUpdateInput.cs
index 3ce46d0..a2d1759 100644
--- a/Scr/Sdk4me.GraphQL/Entities/KnowledgeArticleUpdateInput.cs
+++ b/Scr/Sdk4me.GraphQL/Entities/KnowledgeArticleUpdateInput.cs
@@ -7,6 +7,9 @@ public class KnowledgeArticleUpdateInput : PropertyChangeSet
     {
         private string? source;
         private string? sourceID;
+        private CustomFieldCollection? customFields;
+        private List<AttachmentInput>? customFieldsAttachments;
+        private DateOnly? archiveDate;
         private bool? coveredSpecialists;
         private string? createdById;
         private string? description;
@@ -17,10 +20,10 @@ public class KnowledgeArticleUpdateInput : PropertyChangeSet
         private bool? keyContacts;
         private string? keywords;
         private string? serviceId;
+        private List<string>? serviceInstanceIds;
         private KnowledgeArticleStatus? status;
         private string? subject;
-        private DateOnly? archiveDate;
-        private List<string>? serviceInstanceIds;
+        private string? templateId;
         private string? id;
         private List<string>? translationsToDelete;
         private string? clientMutationId;
@@ -45,6 +48,36 @@ public string? SourceID
             set => sourceID = Set("sourceID", value);
         }
 
+        /// <summary>
+        /// Values for custom fields to be used by the UI Extension that is linked to the record.
+        /// </summary>
+        [JsonProperty("customFields")]
+        public CustomFieldCollection? CustomFields
+        {
+            get => customFields;
+            set => customFields = Set("customFields", value);
+        }
+
+        /// <summary>
+        /// The attachments used in the custom fields' values.
+        /// </summary>
+        [JsonProperty("customFieldsAttachments")]
+        public List<AttachmentInput>? CustomFieldsAttachments
+        {
+            get => customFieldsAttachments;
+            set => customFieldsAttachments = Set("customFieldsAttachments", value);
+        }
+
+        /// <summary>
+        /// The date until which the knowledge article will be active. The knowledge article will be archived at the beginning of this day. When the knowledge article is archived, its status will automatically be set to "Archived".
+        /// </summary>
+        [JsonProperty("archiveDate")]
+        public DateOnly? ArchiveDate
+        {
+            get => archiveDate;
+            set => archiveDate = Set("archiveDate", value);
+        }
+
         /// <summary>
         /// Whether the knowledge article needs to be available to the people who are a member of the support team of one of the service instances that are selected in the Coverage section of an active SLA for the service that is linked to the article.
         /// </summary>
@@ -145,6 +178,16 @@ public string? ServiceId
             set => serviceId = Set("serviceId", value);
         }
 
+        /// <summary>
+        /// Identifiers of service instances linked to this knowledge article.
+        /// </summary>
+        [JsonProperty("serviceInstanceIds")]
+        public List<string>? ServiceInstanceIds
+        {
+            get => serviceInstanceIds;
+            set => serviceInstanceIds = Set("serviceInstanceIds", value);
+        }
+
         /// <summary>
         /// The current status of the knowledge article.
         /// </summary>
@@ -166,23 +209,13 @@ public string? Subject
         }
 
         /// <summary>
-        /// The date until which the knowledge article will be active. The knowledge article will be archived at the beginning of this day. When the knowledge article is archived, its status will automatically be set to "Archived".
+        /// Identifier of the knowledge article template that this knowledge article is based on.
         /// </summary>
-        [JsonProperty("archiveDate")]
-        public DateOnly? ArchiveDate
+        [JsonProperty("templateId")]
+        public string? TemplateId
         {
-            get => archiveDate;
-            set => archiveDate = Set("archiveDate", value);
-        }
-
-        /// <summary>
-        /// Identifiers of services linked to this knowledge article.
-        /// </summary>
-        [JsonProperty("serviceInstanceIds")]
-        public List<string>? ServiceInstanceIds
-        {
-            get => serviceInstanceIds;
-            set => serviceInstanceIds = Set("serviceInstanceIds", value);
+            get => templateId;
+            set => templateId = Set("templateId", value);
         }
 
         /// <summary>
diff --git a/Scr/Sdk4me.GraphQL/Enumerators/Enumerators.cs b/Scr/Sdk4me.GraphQL/Enumerators/Enumerators.cs
index 753ce91..12562b0 100644
--- a/Scr/Sdk4me.GraphQL/Enumerators/Enumerators.cs
+++ b/Scr/Sdk4me.GraphQL/Enumerators/Enumerators.cs
@@ -2553,6 +2553,11 @@ public enum UiExtensionCategory
         [EnumMember(Value = "custom_collection")]
         CustomCollection,
         /// <summary>
+        /// Knowledge Article Template.
+        /// </summary>
+        [EnumMember(Value = "knowledge_article_template")]
+        KnowledgeArticleTemplate,
+        /// <summary>
         /// Organization.
         /// </summary>
         [EnumMember(Value = "organization")]
diff --git a/Scr/Sdk4me.GraphQL/Enumerators/FieldEnumerators.cs b/Scr/Sdk4me.GraphQL/Enumerators/FieldEnumerators.cs
index 5c91445..623a30c 100644
--- a/Scr/Sdk4me.GraphQL/Enumerators/FieldEnumerators.cs
+++ b/Scr/Sdk4me.GraphQL/Enumerators/FieldEnumerators.cs
@@ -2486,6 +2486,16 @@ public enum KnowledgeArticleField
         [EnumMember(Value = "createdBy")]
         CreatedBy,
         /// <summary>
+        /// The custom fields field.
+        /// </summary>
+        [EnumMember(Value = "customFields")]
+        CustomFields,
+        /// <summary>
+        /// The custom fields attachments field.
+        /// </summary>
+        [EnumMember(Value = "customFieldsAttachments")]
+        CustomFieldsAttachments,
+        /// <summary>
         /// The description field.
         /// </summary>
         [EnumMember(Value = "description")]
@@ -2571,6 +2581,11 @@ public enum KnowledgeArticleField
         [EnumMember(Value = "subject")]
         Subject,
         /// <summary>
+        /// The template field.
+        /// </summary>
+        [EnumMember(Value = "template")]
+        Template,
+        /// <summary>
         /// The translations field.
         /// </summary>
         [EnumMember(Value = "translations")]
@@ -2587,6 +2602,68 @@ public enum KnowledgeArticleField
         UpdatedBy,
     }
 
+    /// <summary>
+    /// The <see cref="KnowledgeArticleTemplate">KnowledgeArticleTemplate</see> fields.
+    /// </summary>
+    public enum KnowledgeArticleTemplateField
+    {
+        /// <summary>
+        /// The account field.
+        /// </summary>
+        [EnumMember(Value = "account")]
+        Account,
+        /// <summary>
+        /// The created at field.
+        /// </summary>
+        [EnumMember(Value = "createdAt")]
+        CreatedAt,
+        /// <summary>
+        /// The disabled field.
+        /// </summary>
+        [EnumMember(Value = "disabled")]
+        Disabled,
+        /// <summary>
+        /// The id field.
+        /// </summary>
+        [EnumMember(Value = "id")]
+        ID,
+        /// <summary>
+        /// The service field.
+        /// </summary>
+        [EnumMember(Value = "service")]
+        Service,
+        /// <summary>
+        /// The service instances field.
+        /// </summary>
+        [EnumMember(Value = "serviceInstances")]
+        ServiceInstances,
+        /// <summary>
+        /// The source field.
+        /// </summary>
+        [EnumMember(Value = "source")]
+        Source,
+        /// <summary>
+        /// The source id field.
+        /// </summary>
+        [EnumMember(Value = "sourceID")]
+        SourceID,
+        /// <summary>
+        /// The subject field.
+        /// </summary>
+        [EnumMember(Value = "subject")]
+        Subject,
+        /// <summary>
+        /// The ui extension field.
+        /// </summary>
+        [EnumMember(Value = "uiExtension")]
+        UiExtension,
+        /// <summary>
+        /// The updated at field.
+        /// </summary>
+        [EnumMember(Value = "updatedAt")]
+        UpdatedAt,
+    }
+
     /// <summary>
     /// The <see cref="Note">Note</see> fields.
     /// </summary>
diff --git a/Scr/Sdk4me.GraphQL/Enumerators/OrderByEnumerators.cs b/Scr/Sdk4me.GraphQL/Enumerators/OrderByEnumerators.cs
index c0a98a7..94fc5d6 100644
--- a/Scr/Sdk4me.GraphQL/Enumerators/OrderByEnumerators.cs
+++ b/Scr/Sdk4me.GraphQL/Enumerators/OrderByEnumerators.cs
@@ -491,6 +491,38 @@ public enum KnowledgeArticleOrderField
         UpdatedAt,
     }
 
+    /// <summary>
+    /// The knowledge article template order.
+    /// </summary>
+    public enum KnowledgeArticleTemplateOrderField
+    {
+        /// <summary>
+        /// Order by created at.
+        /// </summary>
+        [EnumMember(Value = "createdAt")]
+        CreatedAt,
+        /// <summary>
+        /// Order by disabled.
+        /// </summary>
+        [EnumMember(Value = "disabled")]
+        Disabled,
+        /// <summary>
+        /// Order by service name.
+        /// </summary>
+        [EnumMember(Value = "serviceName")]
+        ServiceName,
+        /// <summary>
+        /// Order by subject.
+        /// </summary>
+        [EnumMember(Value = "subject")]
+        Subject,
+        /// <summary>
+        /// Order by updated at.
+        /// </summary>
+        [EnumMember(Value = "updatedAt")]
+        UpdatedAt,
+    }
+
     /// <summary>
     /// The organization order.
     /// </summary>
diff --git a/Scr/Sdk4me.GraphQL/Enumerators/ViewEnumerators.cs b/Scr/Sdk4me.GraphQL/Enumerators/ViewEnumerators.cs
index f991d63..6f35950 100644
--- a/Scr/Sdk4me.GraphQL/Enumerators/ViewEnumerators.cs
+++ b/Scr/Sdk4me.GraphQL/Enumerators/ViewEnumerators.cs
@@ -219,6 +219,23 @@ public enum InvoiceView
         All,
     }
 
+    /// <summary>
+    /// The knowledge article template view.
+    /// </summary>
+    public enum KnowledgeArticleTemplateView
+    {
+        /// <summary>
+        /// All knowledge article templates which account equals the value supplied via the `x-4me-account` header.
+        /// </summary>
+        [EnumMember(Value = "current_account")]
+        CurrentAccount,
+        /// <summary>
+        /// Knowledge article templates.
+        /// </summary>
+        [EnumMember(Value = "all")]
+        All,
+    }
+
     /// <summary>
     /// The knowledge article view.
     /// </summary>
diff --git a/Scr/Sdk4me.GraphQL/Extensions/Sdk4meClientQueryExtension.cs b/Scr/Sdk4me.GraphQL/Extensions/Sdk4meClientQueryExtension.cs
index bf9c804..34b79f5 100644
--- a/Scr/Sdk4me.GraphQL/Extensions/Sdk4meClientQueryExtension.cs
+++ b/Scr/Sdk4me.GraphQL/Extensions/Sdk4meClientQueryExtension.cs
@@ -221,6 +221,18 @@ public static async Task<DataList<Invoice>> Get(this Sdk4meClient client, Invoic
             return await client.Get<Invoice>(query);
         }
 
+        /// <summary>
+        /// Root connection for retrieving KnowledgeArticleTemplate records.
+        /// </summary>
+        /// <param name="client">The <see cref="Sdk4meClient"/>.</param>
+        /// <param name="query">The query to execute.</param>
+        /// <returns>The task object representing the asynchronous operation.</returns>
+        /// <exception cref="Sdk4meException"></exception>
+        public static async Task<DataList<KnowledgeArticleTemplate>> Get(this Sdk4meClient client, KnowledgeArticleTemplateQuery query)
+        {
+            return await client.Get<KnowledgeArticleTemplate>(query);
+        }
+
         /// <summary>
         /// Root connection for retrieving KnowledgeArticle records.
         /// </summary>
diff --git a/Scr/Sdk4me.GraphQL/Queries/KnowledgeArticleQuery.cs b/Scr/Sdk4me.GraphQL/Queries/KnowledgeArticleQuery.cs
index 1978c65..4421c33 100644
--- a/Scr/Sdk4me.GraphQL/Queries/KnowledgeArticleQuery.cs
+++ b/Scr/Sdk4me.GraphQL/Queries/KnowledgeArticleQuery.cs
@@ -13,6 +13,15 @@ public KnowledgeArticleQuery()
         {
         }
 
+        /// <summary>
+        /// Inline images linked to one of the custom fields.
+        /// </summary>
+        public KnowledgeArticleQuery SelectCustomFieldsAttachments(AttachmentQuery query)
+        {
+            query.FieldName = "customFieldsAttachments";
+            return Select(query);
+        }
+
         /// <summary>
         /// Inline images linked to the Description field.
         /// </summary>
@@ -41,7 +50,7 @@ public KnowledgeArticleQuery SelectRequests(RequestQuery query)
         }
 
         /// <summary>
-        /// Services linked to this knowledge article.
+        /// Service instances linked to this knowledge article.
         /// </summary>
         public KnowledgeArticleQuery SelectServiceInstances(ServiceInstanceQuery query)
         {
@@ -57,5 +66,42 @@ public KnowledgeArticleQuery SelectTranslations(TranslationQuery query)
             query.FieldName = "translations";
             return Select(query);
         }
+
+        /// <summary>
+        /// <br>Filter the 'KnowledgeArticle' by their custom fields that have been marked as 'Filterable' in their UI Extension.</br>
+        /// <br>Additional information is available on the <see href="https://developer.4me.com/graphql/input_object/knowledgearticlecustomfilter/">4me developer site</see>.</br>
+        /// </summary>
+        /// <param name="name">The name of the custom filter (i.e. value of the data-filterable-name attribute of the field in the UI Extension).</param>
+        /// <param name="filterOperator">The filter operator.</param>
+        /// <param name="values">The filter values.
+        /// <br>Use value <c>null</c> to indicate "None".</br>
+        /// <br></br>
+        /// <br>For "text" fields:</br>
+        /// <br>• One can start the value with <c>~</c> to get partial matches (start with <c>'~</c> to match on a value starting with <c>~</c>).</br>
+        /// <br></br>
+        /// <br>For "number" and "time" fields:</br>
+        /// <br>• One can start the value with <c>&lt;</c>, <c>&gt;</c>, <c>&lt;=</c>, <c>&gt;=</c> to get relative matches.</br>
+        /// <br>• Times should be formatted as HH:mm:ss (e.g. <c>16:00:00</c>). The seconds part, <c>:ss</c>, is optional so <c>16:00</c> is also valid.</br>
+        /// <br>• <c>&gt;{lower}&lt;{upper}</c> can be used to get matches where the value is more than '{lower}' and less than '{upper}'.</br>
+        /// <br>• <c>&gt;={lower}&lt;={upper}</c> can be used to get matches where the value is between '{lower}' and '{upper}'.</br>
+        /// <br>• <c>&gt;={lower}&lt;{upper}</c> can be used to get matches where the value is at least '{lower}' and less than '{upper}'.</br>
+        /// <br></br>
+        /// <br>For "date" and "date-time" fields:</br>
+        /// <br>• One must supply a single value (and <c>null</c> is not supported).</br>
+        /// <br>• Matches are always relative with an optional upper bound.</br>
+        /// <br>• Dates should be formatted as <c>yyyy-MM-dd</c> (e.g. <c>2020-05-20</c>).</br>
+        /// <br>• Date and time should be formatted as <c>yyyy-MM-ddTHH:mm:ssZ</c> (e.g. <c>2020-05-20T16:00:00Z</c>).</br>
+        /// <br>• <c>&gt;={lower}</c> should be used to get matches where the value is at least '{lower}'.</br>
+        /// <br>• <c>&gt;={lower}&lt;{upper}</c> can be used to get matches where the value is at least '{lower}' and before '{upper}'.</br>
+        /// <br></br>
+        /// <br>For "select" fields:</br>
+        /// <br>• One must supply labels to match in the language of the account (i.e. not the value attributes of the HTML options).</br>
+        /// <br>• Matches are case-sensitive.</br>
+        /// </param>
+        /// <exception cref="NullReferenceException"></exception>
+        public KnowledgeArticleQuery CustomFilter(string name, FilterOperator filterOperator, params string[] values)
+        {
+            return AddCustomFilter(name, filterOperator, values);
+        }
     }
 }
diff --git a/Scr/Sdk4me.GraphQL/Queries/KnowledgeArticleTemplateQuery.cs b/Scr/Sdk4me.GraphQL/Queries/KnowledgeArticleTemplateQuery.cs
new file mode 100644
index 0000000..b8843f0
--- /dev/null
+++ b/Scr/Sdk4me.GraphQL/Queries/KnowledgeArticleTemplateQuery.cs
@@ -0,0 +1,25 @@
+namespace Sdk4me.GraphQL
+{
+    /// <summary>
+    /// Root connection for retrieving KnowledgeArticleTemplate records.
+    /// </summary>
+    public class KnowledgeArticleTemplateQuery : Query<KnowledgeArticleTemplateQuery, KnowledgeArticleTemplateField, KnowledgeArticleTemplateView, KnowledgeArticleTemplateOrderField>
+    {
+        /// <summary>
+        /// Initialize a new knowledge article template query instance.
+        /// </summary>
+        public KnowledgeArticleTemplateQuery()
+            : base("knowledgeArticleTemplates", typeof(KnowledgeArticleTemplate), true)
+        {
+        }
+
+        /// <summary>
+        /// Service instances that are applied to knowledge articles using this template.
+        /// </summary>
+        public KnowledgeArticleTemplateQuery SelectServiceInstances(ServiceInstanceQuery query)
+        {
+            query.FieldName = "serviceInstances";
+            return Select(query);
+        }
+    }
+}
diff --git a/Scr/Sdk4me.GraphQL/Queries/Queries.cs b/Scr/Sdk4me.GraphQL/Queries/Queries.cs
index a607c87..aeee68b 100644
--- a/Scr/Sdk4me.GraphQL/Queries/Queries.cs
+++ b/Scr/Sdk4me.GraphQL/Queries/Queries.cs
@@ -95,6 +95,11 @@ public sealed class Query
         /// </summary>
         public static InvoiceQuery Invoice => new();
 
+        /// <summary>
+        /// Returns a new instance of the <see cref="KnowledgeArticleTemplate"/> with a default field selection.
+        /// </summary>
+        public static KnowledgeArticleTemplateQuery KnowledgeArticleTemplate => new();
+
         /// <summary>
         /// Returns a new instance of the <see cref="KnowledgeArticle"/> with a default field selection.
         /// </summary>