diff --git a/Examples/ApiExamples/ApiExamples/ExCharts.cs b/Examples/ApiExamples/ApiExamples/ExCharts.cs
index b75c9493..bb4870bb 100644
--- a/Examples/ApiExamples/ApiExamples/ExCharts.cs
+++ b/Examples/ApiExamples/ApiExamples/ExCharts.cs
@@ -123,9 +123,13 @@ public void AxisProperties()
             //ExFor:ChartAxis.MinorTickMark
             //ExFor:ChartAxis.MajorUnit
             //ExFor:ChartAxis.MinorUnit
+            //ExFor:AxisTickLabels
             //ExFor:AxisTickLabels.Offset
             //ExFor:AxisTickLabels.Position
             //ExFor:AxisTickLabels.IsAutoSpacing
+            //ExFor:AxisTickLabels.Alignment
+            //ExFor:AxisTickLabels.Font
+            //ExFor:AxisTickLabels.Spacing
             //ExFor:ChartAxis.TickMarkSpacing
             //ExFor:AxisCategoryType
             //ExFor:AxisCrosses
@@ -171,6 +175,9 @@ public void AxisProperties()
             yAxis.MajorUnit = 100.0d;
             yAxis.MinorUnit = 20.0d;
             yAxis.TickLabels.Position = AxisTickLabelPosition.NextToAxis;
+            yAxis.TickLabels.Alignment = ParagraphAlignment.Center;
+            yAxis.TickLabels.Font.Color = Color.Red;
+            yAxis.TickLabels.Spacing = 1;
 
             // Column charts do not have a Z-axis.
             Assert.Null(chart.AxisZ);
@@ -201,6 +208,9 @@ public void AxisProperties()
             Assert.AreEqual(100.0d, chart.AxisY.MajorUnit);
             Assert.AreEqual(20.0d, chart.AxisY.MinorUnit);
             Assert.AreEqual(AxisTickLabelPosition.NextToAxis, chart.AxisY.TickLabels.Position);
+            Assert.AreEqual(ParagraphAlignment.Center, chart.AxisY.TickLabels.Alignment);
+            Assert.AreEqual(Color.Red.ToArgb(), chart.AxisY.TickLabels.Font.Color.ToArgb());
+            Assert.AreEqual(1, chart.AxisY.TickLabels.Spacing);
         }
 
         [Test]
@@ -1223,6 +1233,7 @@ public void MarkerFormatting()
             //ExFor:Stroke.BackColor
             //ExFor:Stroke.Visible
             //ExFor:Stroke.Transparency
+            //ExFor:PresetTexture
             //ExFor:Fill.PresetTextured(PresetTexture)
             //ExSummary:Show how to set marker formatting.
             Document doc = new Document();
@@ -1357,6 +1368,7 @@ public void LegendFont()
         {
             //ExStart:LegendFont
             //GistId:470c0da51e4317baae82ad9495747fed
+            //ExFor:ChartLegendEntry
             //ExFor:ChartLegendEntry.Font
             //ExFor:ChartLegend.Font
             //ExSummary:Shows how to work with a legend font.
@@ -1404,6 +1416,7 @@ public void RemoveSpecificChartSeries()
         public void PopulateChartWithData()
         {
             //ExStart
+            //ExFor:ChartXValue
             //ExFor:ChartXValue.FromDouble(Double)
             //ExFor:ChartYValue.FromDouble(Double)
             //ExFor:ChartSeries.Add(ChartXValue, ChartYValue)
@@ -1681,6 +1694,7 @@ public void DataTable()
         {
             //ExStart:DataTable
             //GistId:a775441ecb396eea917a2717cb9e8f8f
+            //ExFor:Chart.DataTable
             //ExFor:ChartDataTable
             //ExFor:ChartDataTable.Show
             //ExSummary:Shows how to show data table with chart series data.
@@ -1718,6 +1732,7 @@ public void ChartFormat()
         {
             //ExStart:ChartFormat
             //GistId:5f20ac02cb42c6b08481aa1c5b0cd3db
+            //ExFor:ChartFormat
             //ExFor:Chart.Format
             //ExFor:ChartTitle.Format
             //ExFor:ChartAxisTitle.Format
@@ -1819,6 +1834,7 @@ public void ConfigureGapOverlap()
         {
             //ExStart:ConfigureGapOverlap
             //GistId:6e4482e7434754c31c6f2f6e4bf48bb1
+            //ExFor:Chart.SeriesGroups
             //ExFor:ChartSeriesGroup.GapWidth
             //ExFor:ChartSeriesGroup.Overlap
             //ExSummary:Show how to configure gap width and overlap.
@@ -1885,7 +1901,10 @@ public void TreemapChart()
             //ExStart:TreemapChart
             //GistId:65919861586e42e24f61a3ccb65f8f4e
             //ExFor:ChartSeriesCollection.Add(String, ChartMultilevelValue[], double[])
+            //ExFor:ChartMultilevelValue
+            //ExFor:ChartMultilevelValue.#ctor(String, String, String)
             //ExFor:ChartMultilevelValue.#ctor(String, String)
+            //ExFor:ChartMultilevelValue.#ctor(String)
             //ExSummary:Shows how to create treemap chart.
             Document doc = new Document();
             DocumentBuilder builder = new DocumentBuilder(doc);
@@ -1921,7 +1940,7 @@ public void TreemapChart()
                     new ChartMultilevelValue("Latin America", "Brazil"),
                     new ChartMultilevelValue("Latin America", "Mexico"),
                     new ChartMultilevelValue("Latin America", "Other"),
-                    new ChartMultilevelValue("Northern America", "United States"),
+                    new ChartMultilevelValue("Northern America", "United States", "Other"),
                     new ChartMultilevelValue("Northern America", "Other"),
                     new ChartMultilevelValue("Oceania")
                 },
diff --git a/Examples/ApiExamples/ApiExamples/ExComment.cs b/Examples/ApiExamples/ApiExamples/ExComment.cs
index e96a7a14..d1941a8f 100644
--- a/Examples/ApiExamples/ApiExamples/ExComment.cs
+++ b/Examples/ApiExamples/ApiExamples/ExComment.cs
@@ -67,6 +67,7 @@ public void PrintAllComments()
             //ExFor:Comment.Ancestor
             //ExFor:Comment.Author
             //ExFor:Comment.Replies
+            //ExFor:CompositeNode.GetEnumerator
             //ExFor:CompositeNode.GetChildNodes(NodeType, Boolean)
             //ExSummary:Shows how to print all of a document's comments and their replies.
             Document doc = new Document(MyDir + "Comments.docx");
diff --git a/Examples/ApiExamples/ApiExamples/ExDocSaveOptions.cs b/Examples/ApiExamples/ApiExamples/ExDocSaveOptions.cs
index 413a26d8..964f5f89 100644
--- a/Examples/ApiExamples/ApiExamples/ExDocSaveOptions.cs
+++ b/Examples/ApiExamples/ApiExamples/ExDocSaveOptions.cs
@@ -27,6 +27,7 @@ public void SaveAsDoc()
             //ExFor:DocSaveOptions.Password
             //ExFor:DocSaveOptions.SaveFormat
             //ExFor:DocSaveOptions.SaveRoutingSlip
+            //ExFor:IncorrectPasswordException
             //ExSummary:Shows how to set save options for older Microsoft Word formats.
             Document doc = new Document();
             DocumentBuilder builder = new DocumentBuilder(doc);
diff --git a/Examples/ApiExamples/ApiExamples/ExDocument.cs b/Examples/ApiExamples/ApiExamples/ExDocument.cs
index cb49329f..62340efc 100644
--- a/Examples/ApiExamples/ApiExamples/ExDocument.cs
+++ b/Examples/ApiExamples/ApiExamples/ExDocument.cs
@@ -429,6 +429,7 @@ public void OpenFromStreamWithBaseUri()
             //ExFor:Document.#ctor(Stream,LoadOptions)
             //ExFor:LoadOptions.#ctor
             //ExFor:LoadOptions.BaseUri
+            //ExFor:ShapeBase.IsImage
             //ExSummary:Shows how to open an HTML document with images from a stream using a base URI.
             using (Stream stream = File.OpenRead(MyDir + "Document.html"))
             {
@@ -1603,6 +1604,7 @@ public void SetInvalidateFieldTypes()
         {
             //ExStart
             //ExFor:Document.NormalizeFieldTypes
+            //ExFor:Range.NormalizeFieldTypes
             //ExSummary:Shows how to get the keep a field's type up to date with its field code.
             Document doc = new Document();
             DocumentBuilder builder = new DocumentBuilder(doc);
@@ -2158,6 +2160,7 @@ public void CreateWebExtension()
             //ExStart
             //ExFor:BaseWebExtensionCollection`1.Add(`0)
             //ExFor:BaseWebExtensionCollection`1.Clear
+            //ExFor:Document.WebExtensionTaskPanes
             //ExFor:TaskPane
             //ExFor:TaskPane.DockState
             //ExFor:TaskPane.IsVisible
@@ -2350,6 +2353,7 @@ public void ImageWatermark()
         {
             //ExStart
             //ExFor:Watermark.SetImage(Image, ImageWatermarkOptions)
+            //ExFor:ImageWatermarkOptions
             //ExFor:ImageWatermarkOptions.Scale
             //ExFor:ImageWatermarkOptions.IsWashout
             //ExFor:Watermark.SetImage(Image)
@@ -2642,6 +2646,7 @@ public void PageIsInColor()
         {
             //ExStart
             //ExFor:PageInfo.Colored
+            //ExFor:Document.GetPageInfo(Int32)
             //ExSummary:Shows how to check whether the page is in color or not.
             Document doc = new Document(MyDir + "Document.docx");
 
diff --git a/Examples/ApiExamples/ApiExamples/ExDocumentBuilder.cs b/Examples/ApiExamples/ApiExamples/ExDocumentBuilder.cs
index 6c11305a..3db7bef3 100644
--- a/Examples/ApiExamples/ApiExamples/ExDocumentBuilder.cs
+++ b/Examples/ApiExamples/ApiExamples/ExDocumentBuilder.cs
@@ -164,6 +164,7 @@ public void InsertHorizontalRule()
             //ExFor:DocumentBuilder.InsertHorizontalRule
             //ExFor:ShapeBase.IsHorizontalRule
             //ExFor:Shape.HorizontalRuleFormat
+            //ExFor:HorizontalRuleAlignment
             //ExFor:HorizontalRuleFormat
             //ExFor:HorizontalRuleFormat.Alignment
             //ExFor:HorizontalRuleFormat.WidthPercent
@@ -3014,6 +3015,7 @@ public void EmphasesWarningSourceMarkdown()
         {
             //ExStart
             //ExFor:WarningInfo.Source
+            //ExFor:WarningSource
             //ExSummary:Shows how to work with the warning source.
             Document doc = new Document(MyDir + "Emphases markdown warning.docx");
             
diff --git a/Examples/ApiExamples/ApiExamples/ExDocumentVisitor.cs b/Examples/ApiExamples/ApiExamples/ExDocumentVisitor.cs
index 66771920..c9be18d5 100644
--- a/Examples/ApiExamples/ApiExamples/ExDocumentVisitor.cs
+++ b/Examples/ApiExamples/ApiExamples/ExDocumentVisitor.cs
@@ -19,10 +19,14 @@ namespace ApiExamples
 {
     [TestFixture]
     public class ExDocumentVisitor : ApiExampleBase
-    {
-        //ExStart
-        //ExFor:Document.Accept(DocumentVisitor)
-        //ExFor:SubDocument.Accept(DocumentVisitor)
+    {
+        //ExStart
+        //ExFor:Document.Accept(DocumentVisitor)
+        //ExFor:SubDocument.Accept(DocumentVisitor)
+        //ExFor:CompositeNode.AcceptEnd(DocumentVisitor)
+        //ExFor:CompositeNode.AcceptStart(DocumentVisitor)
+        //ExFor:Document.AcceptEnd(DocumentVisitor)
+        //ExFor:Document.AcceptStart(DocumentVisitor)
         //ExFor:DocumentVisitor
         //ExFor:DocumentVisitor.VisitRun(Run)
         //ExFor:DocumentVisitor.VisitDocumentEnd(Document)
@@ -34,6 +38,8 @@ public class ExDocumentVisitor : ApiExampleBase
         //ExFor:DocumentVisitor.VisitParagraphStart(Paragraph)
         //ExFor:DocumentVisitor.VisitParagraphEnd(Paragraph)
         //ExFor:DocumentVisitor.VisitSubDocument(SubDocument)
+        //ExFor:DocumentVisitor.VisitStructuredDocumentTagRangeEnd(StructuredDocumentTagRangeEnd)
+        //ExFor:DocumentVisitor.VisitStructuredDocumentTagRangeStart(StructuredDocumentTagRangeStart)
         //ExSummary:Shows how to use a document visitor to print a document's node structure.
         [Test] //ExSkip
         public void DocStructureToText()
@@ -182,6 +188,26 @@ public override VisitorAction VisitSubDocument(SubDocument subDocument)
                 return VisitorAction.Continue;
             }
 
+            /// <summary>
+            /// Called when a SubDocument node is encountered in the document.
+            /// </summary>
+            public override VisitorAction VisitStructuredDocumentTagRangeStart(StructuredDocumentTagRangeStart sdtRangeStart)
+            {
+                IndentAndAppendLine("[SdtRangeStart]");
+
+                return VisitorAction.Continue;
+            }
+
+            /// <summary>
+            /// Called when a SubDocument node is encountered in the document.
+            /// </summary>
+            public override VisitorAction VisitStructuredDocumentTagRangeEnd(StructuredDocumentTagRangeEnd sdtRangeEnd)
+            {
+                IndentAndAppendLine("[SdtRangeEnd]");
+
+                return VisitorAction.Continue;
+            }
+
             /// <summary>
             /// Append a line to the StringBuilder and indent it depending on how deep the visitor is into the document tree.
             /// </summary>
@@ -651,6 +677,8 @@ private static void TestFieldToText(FieldStructurePrinter visitor)
         //ExFor:DocumentVisitor.VisitHeaderFooterStart(HeaderFooter)
         //ExFor:DocumentVisitor.VisitHeaderFooterEnd(HeaderFooter)
         //ExFor:HeaderFooter.Accept(DocumentVisitor)
+        //ExFor:HeaderFooter.AcceptStart(DocumentVisitor)
+        //ExFor:HeaderFooter.AcceptEnd(DocumentVisitor)
         //ExFor:HeaderFooterCollection.ToArray
         //ExFor:Run.Accept(DocumentVisitor)
         //ExFor:Run.GetText
@@ -861,6 +889,8 @@ private static void TestEditableRangeToText(EditableRangeStructurePrinter visito
         //ExFor:DocumentVisitor.VisitFootnoteEnd(Footnote)
         //ExFor:DocumentVisitor.VisitFootnoteStart(Footnote)
         //ExFor:Footnote.Accept(DocumentVisitor)
+        //ExFor:Footnote.AcceptStart(DocumentVisitor)
+        //ExFor:Footnote.AcceptEnd(DocumentVisitor)
         //ExSummary:Shows how to print the node structure of every footnote in a document.
         [Test] //ExSkip
         public void FootnoteToText()
@@ -955,15 +985,17 @@ private static void TestFootnoteToText(FootnoteStructurePrinter visitor)
             Assert.True(visitorText.Contains("[Footnote start] Type: Footnote"));
             Assert.True(visitorText.Contains("[Footnote end]"));
             Assert.True(visitorText.Contains("[Run]"));
-        }
-        
-        //ExStart
-        //ExFor:DocumentVisitor.VisitOfficeMathEnd(OfficeMath)
-        //ExFor:DocumentVisitor.VisitOfficeMathStart(OfficeMath)
-        //ExFor:MathObjectType
-        //ExFor:OfficeMath.Accept(DocumentVisitor)
-        //ExFor:OfficeMath.MathObjectType
-        //ExSummary:Shows how to print the node structure of every office math node in a document.
+        }
+
+        //ExStart
+        //ExFor:DocumentVisitor.VisitOfficeMathEnd(OfficeMath)
+        //ExFor:DocumentVisitor.VisitOfficeMathStart(OfficeMath)
+        //ExFor:MathObjectType
+        //ExFor:OfficeMath.Accept(DocumentVisitor)
+        //ExFor:OfficeMath.AcceptStart(DocumentVisitor)
+        //ExFor:OfficeMath.AcceptEnd(DocumentVisitor)
+        //ExFor:OfficeMath.MathObjectType
+        //ExSummary:Shows how to print the node structure of every office math node in a document.
         [Test] //ExSkip
         public void OfficeMathToText()
         {
@@ -1174,6 +1206,8 @@ private static void TestSmartTagToText(SmartTagStructurePrinter visitor)
 
         //ExStart
         //ExFor:StructuredDocumentTag.Accept(DocumentVisitor)
+        //ExFor:StructuredDocumentTag.AcceptStart(DocumentVisitor)
+        //ExFor:StructuredDocumentTag.AcceptEnd(DocumentVisitor)
         //ExFor:DocumentVisitor.VisitStructuredDocumentTagEnd(StructuredDocumentTag)
         //ExFor:DocumentVisitor.VisitStructuredDocumentTagStart(StructuredDocumentTag)
         //ExSummary:Shows how to print the node structure of every structured document tag in a document.
diff --git a/Examples/ApiExamples/ApiExamples/ExDrawing.cs b/Examples/ApiExamples/ApiExamples/ExDrawing.cs
index e7a2bfa7..754d826c 100644
--- a/Examples/ApiExamples/ApiExamples/ExDrawing.cs
+++ b/Examples/ApiExamples/ApiExamples/ExDrawing.cs
@@ -238,7 +238,10 @@ public void FillSolid()
         {
             //ExStart
             //ExFor:Fill.Color()
-            //ExFor:Fill.Solid(Color)
+            //ExFor:FillType
+            //ExFor:Fill.FillType
+            //ExFor:Fill.Solid
+            //ExFor:Fill.Transparency
             //ExFor:Font.Fill
             //ExSummary:Shows how to convert any of the fills back to solid fill.
             Document doc = new Document(MyDir + "Two color gradient.docx");
@@ -252,7 +255,7 @@ public void FillSolid()
             Console.WriteLine("The fill is transparent at {0}%", fill.Transparency * 100);
 
             // Change type of the fill to Solid with uniform green color.
-            fill.Solid(Color.Green);
+            fill.Solid();
             Console.WriteLine("\nThe fill is changed:");
             Console.WriteLine("The type of the fill is: {0}", fill.FillType);
             Console.WriteLine("The foreground color of the fill is: {0}", fill.ForeColor);
@@ -341,6 +344,8 @@ public void StrokePattern()
         //ExFor:GroupShape
         //ExFor:GroupShape.#ctor(DocumentBase)
         //ExFor:GroupShape.Accept(DocumentVisitor)
+        //ExFor:GroupShape.AcceptStart(DocumentVisitor)
+        //ExFor:GroupShape.AcceptEnd(DocumentVisitor)
         //ExFor:ShapeBase.IsGroup
         //ExFor:ShapeBase.ShapeType
         //ExSummary:Shows how to create a group of shapes, and print its contents using a document visitor.
diff --git a/Examples/ApiExamples/ApiExamples/ExField.cs b/Examples/ApiExamples/ApiExamples/ExField.cs
index b70fa643..74eceeee 100644
--- a/Examples/ApiExamples/ApiExamples/ExField.cs
+++ b/Examples/ApiExamples/ApiExamples/ExField.cs
@@ -468,6 +468,9 @@ public void FieldDatabase()
             //ExFor:FieldDatabase.LastRecord
             //ExFor:FieldDatabase.Query
             //ExFor:FieldDatabase.TableFormat
+            //ExFor:FieldDatabaseDataTable
+            //ExFor:IFieldDatabaseProvider
+            //ExFor:IFieldDatabaseProvider.GetQueryResult(String,String,String,FieldDatabase)
             //ExSummary:Shows how to extract data from a database and insert it as a field into a document.
             Document doc = new Document();
             DocumentBuilder builder = new DocumentBuilder(doc);
@@ -2536,6 +2539,7 @@ public void FieldCitation()
 
         //ExStart
         //ExFor:IBibliographyStylesProvider
+        //ExFor:IBibliographyStylesProvider.GetStyle(String)
         //ExFor:FieldOptions.BibliographyStylesProvider
         //ExSummary:Shows how to override built-in styles or provide custom one.
         [Test] //ExSkip
@@ -4896,6 +4900,7 @@ public void FieldBuilder()
             //ExFor:FieldBuilder.AddSwitch(String, String)
             //ExFor:FieldBuilder.BuildAndInsert(Paragraph)
             //ExFor:FieldArgumentBuilder
+            //ExFor:FieldArgumentBuilder.#ctor
             //ExFor:FieldArgumentBuilder.AddField(FieldBuilder)
             //ExFor:FieldArgumentBuilder.AddText(String)
             //ExFor:FieldArgumentBuilder.AddNode(Inline)
@@ -6878,6 +6883,7 @@ public void FieldEQAsOfficeMath()
         {
             //ExStart
             //ExFor:FieldEQ
+            //ExFor:FieldEQ.AsOfficeMath
             //ExSummary:Shows how to replace the EQ field with Office Math.
             Document doc = new Document(MyDir + "Field sample - EQ.docx");
             FieldEQ fieldEQ = doc.Range.Fields.OfType<FieldEQ>().First();
@@ -7336,6 +7342,7 @@ public void Legacy()
         public void SetFieldIndexFormat()
         {
             //ExStart
+            //ExFor:FieldIndexFormat
             //ExFor:FieldOptions.FieldIndexFormat
             //ExSummary:Shows how to formatting FieldIndex fields.
             Document doc = new Document();
@@ -7363,6 +7370,8 @@ public void SetFieldIndexFormat()
         //ExFor:ComparisonExpression.ComparisonOperator
         //ExFor:ComparisonExpression.RightExpression
         //ExFor:FieldOptions.ComparisonExpressionEvaluator
+        //ExFor:IComparisonExpressionEvaluator
+        //ExFor:IComparisonExpressionEvaluator.Evaluate(Field,ComparisonExpression)
         //ExSummary:Shows how to implement custom evaluation for the IF and COMPARE fields.
         [TestCase(" IF {0} {1} {2} \"true argument\" \"false argument\" ", 1, null, "true argument")] //ExSkip
         [TestCase(" IF {0} {1} {2} \"true argument\" \"false argument\" ", 0, null, "false argument")] //ExSkip
@@ -7536,9 +7545,12 @@ public void ComparisonExpressionEvaluatorHeaderFooterFields()
         }
 
         //ExStart
+        //ExFor:FieldOptions.FieldUpdatingCallback
+        //ExFor:FieldOptions.FieldUpdatingProgressCallback
         //ExFor:IFieldUpdatingCallback
         //ExFor:IFieldUpdatingProgressCallback
         //ExFor:IFieldUpdatingProgressCallback.Notify(FieldUpdatingProgressArgs)
+        //ExFor:FieldUpdatingProgressArgs
         //ExFor:FieldUpdatingProgressArgs.UpdateCompleted
         //ExFor:FieldUpdatingProgressArgs.TotalFieldsCount
         //ExFor:FieldUpdatingProgressArgs.UpdatedFieldsCount
@@ -7611,6 +7623,7 @@ public void BibliographySources()
         {
             //ExStart:BibliographySources
             //GistId:eeeec1fbf118e95e7df3f346c91ed726
+            //ExFor:Document.Bibliography
             //ExFor:Bibliography
             //ExFor:Bibliography.Sources
             //ExFor:Source.Title
diff --git a/Examples/ApiExamples/ApiExamples/ExFont.cs b/Examples/ApiExamples/ApiExamples/ExFont.cs
index 47774413..68e3094a 100644
--- a/Examples/ApiExamples/ApiExamples/ExFont.cs
+++ b/Examples/ApiExamples/ApiExamples/ExFont.cs
@@ -1066,6 +1066,8 @@ public void SetFontAutoColor()
         //ExStart
         //ExFor:Font.Hidden
         //ExFor:Paragraph.Accept(DocumentVisitor)
+        //ExFor:Paragraph.AcceptStart(DocumentVisitor)
+        //ExFor:Paragraph.AcceptEnd(DocumentVisitor)
         //ExFor:DocumentVisitor.VisitParagraphStart(Paragraph)
         //ExFor:DocumentVisitor.VisitFormField(FormField)
         //ExFor:DocumentVisitor.VisitTableEnd(Table)
diff --git a/Examples/ApiExamples/ApiExamples/ExHtmlLoadOptions.cs b/Examples/ApiExamples/ApiExamples/ExHtmlLoadOptions.cs
index 1c4972f0..767f862f 100644
--- a/Examples/ApiExamples/ApiExamples/ExHtmlLoadOptions.cs
+++ b/Examples/ApiExamples/ApiExamples/ExHtmlLoadOptions.cs
@@ -29,6 +29,7 @@ internal class ExHtmlLoadOptions : ApiExampleBase
         public void SupportVml(bool supportVml)
         {
             //ExStart
+            //ExFor:HtmlLoadOptions
             //ExFor:HtmlLoadOptions.#ctor
             //ExFor:HtmlLoadOptions.SupportVml
             //ExSummary:Shows how to support conditional comments while loading an HTML document.
@@ -212,6 +213,7 @@ public void GetSelectAsSdt()
         {
             //ExStart
             //ExFor:HtmlLoadOptions.PreferredControlType
+            //ExFor:HtmlControlType
             //ExSummary:Shows how to set preferred type of document nodes that will represent imported <input> and <select> elements.
             const string html = @"
                 <html>
diff --git a/Examples/ApiExamples/ApiExamples/ExLayout.cs b/Examples/ApiExamples/ApiExamples/ExLayout.cs
index 9c4c56a7..024cf035 100644
--- a/Examples/ApiExamples/ApiExamples/ExLayout.cs
+++ b/Examples/ApiExamples/ApiExamples/ExLayout.cs
@@ -244,10 +244,12 @@ private static void PrintCurrentEntity(LayoutEnumerator layoutEnumerator, int in
         //ExStart
         //ExFor:IPageLayoutCallback
         //ExFor:IPageLayoutCallback.Notify(PageLayoutCallbackArgs)
+        //ExFor:PageLayoutCallbackArgs
         //ExFor:PageLayoutCallbackArgs.Event
         //ExFor:PageLayoutCallbackArgs.Document
         //ExFor:PageLayoutCallbackArgs.PageIndex
         //ExFor:PageLayoutEvent
+        //ExFor:LayoutOptions.Callback
         //ExSummary:Shows how to track layout changes with a layout callback.
         [Test]//ExSkip
         public void PageLayoutCallback()
diff --git a/Examples/ApiExamples/ApiExamples/ExLoadOptions.cs b/Examples/ApiExamples/ApiExamples/ExLoadOptions.cs
index 24775a7a..da5950f1 100644
--- a/Examples/ApiExamples/ApiExamples/ExLoadOptions.cs
+++ b/Examples/ApiExamples/ApiExamples/ExLoadOptions.cs
@@ -333,6 +333,8 @@ public void OpenChmFile()
         //ExFor:LoadOptions.ProgressCallback
         //ExFor:IDocumentLoadingCallback
         //ExFor:IDocumentLoadingCallback.Notify
+        //ExFor:DocumentLoadingArgs
+        //ExFor:DocumentLoadingArgs.EstimatedProgress
         //ExSummary:Shows how to notify the user if document loading exceeded expected loading time.
         [Test]//ExSkip
         public void ProgressCallback()
diff --git a/Examples/ApiExamples/ApiExamples/ExMailMerge.cs b/Examples/ApiExamples/ApiExamples/ExMailMerge.cs
index 7ac6d77f..09edd3b1 100644
--- a/Examples/ApiExamples/ApiExamples/ExMailMerge.cs
+++ b/Examples/ApiExamples/ApiExamples/ExMailMerge.cs
@@ -1213,6 +1213,7 @@ public void TestMailMergeGetRegionsHierarchy()
             //ExFor:MailMergeRegionInfo.StartField
             //ExFor:MailMergeRegionInfo.EndField
             //ExFor:MailMergeRegionInfo.Level
+            //ExFor:MailMergeRegionInfo.MustacheTags
             //ExSummary:Shows how to verify mail merge regions.
             Document doc = new Document(MyDir + "Mail merge regions.docx");
 
@@ -1236,6 +1237,7 @@ public void TestMailMergeGetRegionsHierarchy()
             Assert.AreEqual("NestedRegion2", nestedRegions[1].Name);
             Assert.AreEqual(2, nestedRegions[0].Level);
             Assert.AreEqual(2, nestedRegions[1].Level);
+            Assert.AreEqual(0, nestedRegions[1].MustacheTags.Count);
 
             // Get list of fields inside the first top region.
             IList<Field> fieldList = topRegions[0].Fields;
diff --git a/Examples/ApiExamples/ApiExamples/ExMailMergeCustom.cs b/Examples/ApiExamples/ApiExamples/ExMailMergeCustom.cs
index 6a61e126..95f2807b 100644
--- a/Examples/ApiExamples/ApiExamples/ExMailMergeCustom.cs
+++ b/Examples/ApiExamples/ApiExamples/ExMailMergeCustom.cs
@@ -23,6 +23,7 @@ public class ExMailMergeCustom : ApiExampleBase
         //ExFor:IMailMergeDataSource.MoveNext
         //ExFor:IMailMergeDataSource.GetValue
         //ExFor:IMailMergeDataSource.GetChildDataSource
+        //ExFor:MailMerge.Execute(IMailMergeDataSource)
         //ExSummary:Shows how to execute a mail merge with a data source in the form of a custom object.
         [Test] //ExSkip
         public void CustomDataSource()
diff --git a/Examples/ApiExamples/ApiExamples/ExMarkdownLoadOptions.cs b/Examples/ApiExamples/ApiExamples/ExMarkdownLoadOptions.cs
index 4b9ef254..4d8e5713 100644
--- a/Examples/ApiExamples/ApiExamples/ExMarkdownLoadOptions.cs
+++ b/Examples/ApiExamples/ApiExamples/ExMarkdownLoadOptions.cs
@@ -16,6 +16,7 @@ public void PreserveEmptyLines()
             //ExStart:PreserveEmptyLines
             //GistId:a775441ecb396eea917a2717cb9e8f8f
             //ExFor:MarkdownLoadOptions
+            //ExFor:MarkdownLoadOptions.#ctor
             //ExFor:MarkdownLoadOptions.PreserveEmptyLines
             //ExSummary:Shows how to preserve empty line while load a document.
             string mdText = $"{Environment.NewLine}Line1{Environment.NewLine}{Environment.NewLine}Line2{Environment.NewLine}{Environment.NewLine}";
diff --git a/Examples/ApiExamples/ApiExamples/ExOdtSaveOptions.cs b/Examples/ApiExamples/ApiExamples/ExOdtSaveOptions.cs
index 72f7121a..1fa2a991 100644
--- a/Examples/ApiExamples/ApiExamples/ExOdtSaveOptions.cs
+++ b/Examples/ApiExamples/ApiExamples/ExOdtSaveOptions.cs
@@ -24,6 +24,8 @@ public void Odt11Schema(bool exportToOdt11Specs)
             //ExFor:OdtSaveOptions
             //ExFor:OdtSaveOptions.#ctor
             //ExFor:OdtSaveOptions.IsStrictSchema11
+            //ExFor:RevisionOptions.MeasurementUnit
+            //ExFor:MeasurementUnits
             //ExSummary:Shows how to make a saved document conform to an older ODT schema.
             Document doc = new Document(MyDir + "Rendering.docx");
 
diff --git a/Examples/ApiExamples/ApiExamples/ExParagraphFormat.cs b/Examples/ApiExamples/ApiExamples/ExParagraphFormat.cs
index a0c33837..fc025358 100644
--- a/Examples/ApiExamples/ApiExamples/ExParagraphFormat.cs
+++ b/Examples/ApiExamples/ApiExamples/ExParagraphFormat.cs
@@ -88,6 +88,7 @@ public void LineSpacing()
             //ExStart
             //ExFor:ParagraphFormat.LineSpacing
             //ExFor:ParagraphFormat.LineSpacingRule
+            //ExFor:LineSpacingRule
             //ExSummary:Shows how to work with line spacing.
             Document doc = new Document();
             DocumentBuilder builder = new DocumentBuilder(doc);
@@ -240,6 +241,7 @@ public void ParagraphOutlineLevel()
         {
             //ExStart
             //ExFor:ParagraphFormat.OutlineLevel
+            //ExFor:OutlineLevel
             //ExSummary:Shows how to configure paragraph outline levels to create collapsible text.
             Document doc = new Document();
             DocumentBuilder builder = new DocumentBuilder(doc);
diff --git a/Examples/ApiExamples/ApiExamples/ExPdfLoadOptions.cs b/Examples/ApiExamples/ApiExamples/ExPdfLoadOptions.cs
index 92ab2564..886ab962 100644
--- a/Examples/ApiExamples/ApiExamples/ExPdfLoadOptions.cs
+++ b/Examples/ApiExamples/ApiExamples/ExPdfLoadOptions.cs
@@ -19,22 +19,23 @@ internal class ExPdfLoadOptions : ApiExampleBase
         public void SkipPdfImages(bool isSkipPdfImages)
         {
             //ExStart
+            //ExFor:PdfLoadOptions
             //ExFor:PdfLoadOptions.SkipPdfImages
+            //ExFor:PdfLoadOptions.PageIndex
+            //ExFor:PdfLoadOptions.PageCount
             //ExSummary:Shows how to skip images during loading PDF files.
             PdfLoadOptions options = new PdfLoadOptions();
             options.SkipPdfImages = isSkipPdfImages;
+            options.PageIndex = 0;
+            options.PageCount = 1;
 
             Document doc = new Document(MyDir + "Images.pdf", options);
             NodeCollection shapeCollection = doc.GetChildNodes(NodeType.Shape, true);
 
             if (isSkipPdfImages)
-            {
                 Assert.AreEqual(shapeCollection.Count, 0);
-            }
             else
-            {
                 Assert.AreNotEqual(shapeCollection.Count, 0);
-            }
             //ExEnd
         }
     }
diff --git a/Examples/ApiExamples/ApiExamples/ExRendering.cs b/Examples/ApiExamples/ApiExamples/ExRendering.cs
index ac6b1048..43eea114 100644
--- a/Examples/ApiExamples/ApiExamples/ExRendering.cs
+++ b/Examples/ApiExamples/ApiExamples/ExRendering.cs
@@ -30,6 +30,7 @@ public class ExRendering : ApiExampleBase
         //ExFor:NodeRendererBase.RenderToScale(Graphics, Single, Single, Single)
         //ExFor:NodeRendererBase.RenderToSize(Graphics, Single, Single, Single, Single)
         //ExFor:ShapeRenderer
+        //ExFor:ShapeRenderer.#ctor(ShapeBase)
         //ExSummary:Shows how to render a shape with a Graphics object and display it using a Windows Form.
         [Test, Category("IgnoreOnJenkins"), Category("SkipMono")] //ExSkip
         public void RenderShapesOnForm()
diff --git a/Examples/ApiExamples/ApiExamples/ExRevision.cs b/Examples/ApiExamples/ApiExamples/ExRevision.cs
index 90372622..feb944f8 100644
--- a/Examples/ApiExamples/ApiExamples/ExRevision.cs
+++ b/Examples/ApiExamples/ApiExamples/ExRevision.cs
@@ -302,6 +302,8 @@ public void RevisionOptions()
         //GistId:470c0da51e4317baae82ad9495747fed
         //ExFor:RevisionCollection.Accept(IRevisionCriteria)
         //ExFor:RevisionCollection.Reject(IRevisionCriteria)
+        //ExFor:IRevisionCriteria
+        //ExFor:IRevisionCriteria.IsMatch(Revision)
         //ExSummary:Shows how to accept or reject revision based on criteria.
         [Test] //ExSkip
         public void RevisionSpecifiedCriteria()
@@ -608,7 +610,8 @@ public void CompareOptions()
         public void IgnoreDmlUniqueId(bool isIgnoreDmlUniqueId)
         {
             //ExStart
-            //ExFor:CompareOptions.IgnoreDmlUniqueId
+            //ExFor:CompareOptions.AdvancedOptions
+            //ExFor:AdvancedCompareOptions.IgnoreDmlUniqueId
             //ExSummary:Shows how to compare documents ignoring DML unique ID.
             Document docA = new Document(MyDir + "DML unique ID original.docx");
             Document docB = new Document(MyDir + "DML unique ID compare.docx");
@@ -725,6 +728,7 @@ public void IgnoreStoreItemId()
         {
             //ExStart:IgnoreStoreItemId
             //GistId:65919861586e42e24f61a3ccb65f8f4e
+            //ExFor:AdvancedCompareOptions
             //ExFor:AdvancedCompareOptions.IgnoreStoreItemId
             //ExSummary:Shows how to compare SDT with same content but different store item id.
             Document docA = new Document(MyDir + "Document with SDT 1.docx");
diff --git a/Examples/ApiExamples/ApiExamples/ExShape.cs b/Examples/ApiExamples/ApiExamples/ExShape.cs
index a8f92dc8..a413ff9f 100644
--- a/Examples/ApiExamples/ApiExamples/ExShape.cs
+++ b/Examples/ApiExamples/ApiExamples/ExShape.cs
@@ -761,6 +761,7 @@ public void Fill()
         public void TextureFill()
         {
             //ExStart
+            //ExFor:Fill.PresetTexture
             //ExFor:Fill.TextureAlignment
             //ExFor:TextureAlignment
             //ExSummary:Shows how to fill and tiling the texture inside the shape.
@@ -778,13 +779,13 @@ public void TextureFill()
             OoxmlSaveOptions saveOptions = new OoxmlSaveOptions { Compliance = OoxmlCompliance.Iso29500_2008_Strict };
 
             doc.Save(ArtifactsDir + "Shape.TextureFill.docx", saveOptions);
-            //ExEnd
 
             doc = new Document(ArtifactsDir + "Shape.TextureFill.docx");
-
             shape = (Shape)doc.GetChild(NodeType.Shape, 0, true);
 
             Assert.AreEqual(TextureAlignment.TopRight, shape.Fill.TextureAlignment);
+            Assert.AreEqual(PresetTexture.Canvas, shape.Fill.PresetTexture);
+            //ExEnd
         }
 
         [Test]
@@ -795,6 +796,7 @@ public void GradientFill()
             //ExFor:Fill.OneColorGradient(GradientStyle, GradientVariant, Double)
             //ExFor:Fill.TwoColorGradient(Color, Color, GradientStyle, GradientVariant)
             //ExFor:Fill.TwoColorGradient(GradientStyle, GradientVariant)
+            //ExFor:Fill.BackColor
             //ExFor:Fill.GradientStyle
             //ExFor:Fill.GradientVariant
             //ExFor:Fill.GradientAngle
@@ -862,6 +864,7 @@ public void GradientStops()
             //ExFor:GradientStopCollection.Remove(GradientStop)
             //ExFor:GradientStopCollection.Item(Int32)
             //ExFor:GradientStopCollection.Count
+            //ExFor:GradientStop
             //ExFor:GradientStop.#ctor(Color, Double)
             //ExFor:GradientStop.#ctor(Color, Double, Double)
             //ExFor:GradientStop.BaseColor
@@ -935,6 +938,8 @@ public void GradientStops()
         public void FillPattern()
         {
             //ExStart
+            //ExFor:PatternType
+            //ExFor:Fill.Pattern
             //ExFor:Fill.Patterned(PatternType)
             //ExFor:Fill.Patterned(PatternType, Color, Color)
             //ExSummary:Shows how to set pattern for a shape.
@@ -1889,6 +1894,8 @@ public void ShapeInsertion()
 
         //ExStart
         //ExFor:Shape.Accept(DocumentVisitor)
+        //ExFor:Shape.AcceptStart(DocumentVisitor)
+        //ExFor:Shape.AcceptEnd(DocumentVisitor)
         //ExFor:Shape.Chart
         //ExFor:Shape.ExtrusionEnabled
         //ExFor:Shape.Filled
@@ -2414,6 +2421,7 @@ public void VerticalAnchor(TextBoxAnchor verticalAnchor)
         //ExFor:TextPath.Trim
         //ExFor:TextPath.Underline
         //ExFor:TextPath.XScale
+        //ExFor:TextPath.Size
         //ExFor:TextPathAlignment
         //ExSummary:Shows how to work with WordArt.
         [Test] //ExSkip
@@ -2867,6 +2875,8 @@ public void FillImage()
         {
             //ExStart
             //ExFor:Fill.SetImage(String)
+            //ExFor:Fill.SetImage(Byte[])
+            //ExFor:Fill.SetImage(Stream)
             //ExSummary:Shows how to set shape fill type as image.
             Document doc = new Document();
             DocumentBuilder builder = new DocumentBuilder(doc);
@@ -3095,6 +3105,7 @@ public void TextBoxOleControl()
             //GistId:eeeec1fbf118e95e7df3f346c91ed726
             //ExFor:TextBoxControl
             //ExFor:TextBoxControl.Text
+            //ExFor:TextBoxControl.Type
             //ExSummary:Shows how to change text of the TextBox OLE control.
             Document doc = new Document(MyDir + "Textbox control.docm");
 
@@ -3104,6 +3115,7 @@ public void TextBoxOleControl()
 
             textBoxControl.Text = "Updated text";
             Assert.AreEqual("Updated text", textBoxControl.Text);
+            Assert.AreEqual(Forms2OleControlType.Textbox, textBoxControl.Type);
             //ExEnd:TextBoxOleControl
         }
 
@@ -3113,6 +3125,7 @@ public void Glow()
             //ExStart:Glow
             //GistId:5f20ac02cb42c6b08481aa1c5b0cd3db
             //ExFor:ShapeBase.Glow
+            //ExFor:GlowFormat
             //ExFor:GlowFormat.Color
             //ExFor:GlowFormat.Radius
             //ExFor:GlowFormat.Transparency
@@ -3148,6 +3161,7 @@ public void Reflection()
             //ExStart:Reflection
             //GistId:5f20ac02cb42c6b08481aa1c5b0cd3db
             //ExFor:ShapeBase.Reflection
+            //ExFor:ReflectionFormat
             //ExFor:ReflectionFormat.Size
             //ExFor:ReflectionFormat.Blur
             //ExFor:ReflectionFormat.Transparency
@@ -3167,17 +3181,19 @@ public void Reflection()
             doc = new Document(ArtifactsDir + "Shape.Reflection.docx");
             shape = (Shape)doc.GetChild(NodeType.Shape, 0, true);
 
-            Assert.AreEqual(0.37d, shape.Reflection.Transparency, 0.01d);
-            Assert.AreEqual(0.48d, shape.Reflection.Size, 0.01d);
-            Assert.AreEqual(17.5d, shape.Reflection.Blur, 0.01d);
-            Assert.AreEqual(9.2d, shape.Reflection.Distance, 0.01d);
+            ReflectionFormat reflectionFormat = shape.Reflection;
+
+            Assert.AreEqual(0.37d, reflectionFormat.Transparency, 0.01d);
+            Assert.AreEqual(0.48d, reflectionFormat.Size, 0.01d);
+            Assert.AreEqual(17.5d, reflectionFormat.Blur, 0.01d);
+            Assert.AreEqual(9.2d, reflectionFormat.Distance, 0.01d);
 
-            shape.Reflection.Remove();
+            reflectionFormat.Remove();
 
-            Assert.AreEqual(0, shape.Reflection.Transparency);
-            Assert.AreEqual(0, shape.Reflection.Size);
-            Assert.AreEqual(0, shape.Reflection.Blur);
-            Assert.AreEqual(0, shape.Reflection.Distance);
+            Assert.AreEqual(0, reflectionFormat.Transparency);
+            Assert.AreEqual(0, reflectionFormat.Size);
+            Assert.AreEqual(0, reflectionFormat.Blur);
+            Assert.AreEqual(0, reflectionFormat.Distance);
             //ExEnd:Reflection
         }
 
@@ -3187,6 +3203,7 @@ public void SoftEdge()
             //ExStart:SoftEdge
             //GistId:6e4482e7434754c31c6f2f6e4bf48bb1
             //ExFor:ShapeBase.SoftEdge
+            //ExFor:SoftEdgeFormat
             //ExFor:SoftEdgeFormat.Radius
             //ExFor:SoftEdgeFormat.Remove
             //ExSummary:Shows how to work with soft edge formatting.
@@ -3201,15 +3218,16 @@ public void SoftEdge()
             // Load document with rectangle shape with soft edge.
             Document doc = new Document(ArtifactsDir + "Shape.SoftEdge.docx");
             shape = (Shape)doc.GetChild(NodeType.Shape, 0, true);
+            SoftEdgeFormat softEdgeFormat = shape.SoftEdge;
 
             // Check soft edge radius.
-            Assert.AreEqual(30, shape.SoftEdge.Radius);
+            Assert.AreEqual(30, softEdgeFormat.Radius);
 
             // Remove soft edge from the shape.
-            shape.SoftEdge.Remove();
+            softEdgeFormat.Remove();
 
             // Check radius of the removed soft edge.
-            Assert.AreEqual(0, shape.SoftEdge.Radius);
+            Assert.AreEqual(0, softEdgeFormat.Radius);
             //ExEnd:SoftEdge
         }
 
@@ -3220,6 +3238,8 @@ public void Adjustments()
             //GistId:6e4482e7434754c31c6f2f6e4bf48bb1
             //ExFor:Shape.Adjustments
             //ExFor:AdjustmentCollection
+            //ExFor:AdjustmentCollection.Count
+            //ExFor:AdjustmentCollection.Item(Int32)
             //ExFor:Adjustment
             //ExFor:Adjustment.Name
             //ExFor:Adjustment.Value
@@ -3255,12 +3275,17 @@ public void ShadowFormatColor()
         {
             //ExStart:ShadowFormatColor
             //GistId:65919861586e42e24f61a3ccb65f8f4e
+            //ExFor:ShapeBase.ShadowFormat
+            //ExFor:ShadowFormat
             //ExFor:ShadowFormat.Color
+            //ExFor:ShadowFormat.Type
             //ExSummary:Shows how to get shadow color.
             Document doc = new Document(MyDir + "Shadow color.docx");
             Shape shape = (Shape)doc.GetChild(NodeType.Shape, 0, true);
+            ShadowFormat shadowFormat = shape.ShadowFormat;
 
-            Assert.AreEqual(Color.Red.ToArgb(), shape.ShadowFormat.Color.ToArgb());
+            Assert.AreEqual(Color.Red.ToArgb(), shadowFormat.Color.ToArgb());
+            Assert.AreEqual(ShadowType.ShadowMixed, shadowFormat.Type);
             //ExEnd:ShadowFormatColor
         }
 
@@ -3295,7 +3320,9 @@ public void SelectRadioControl()
         {
             //ExStart:SelectRadioControl
             //GistId:ac8ba4eb35f3fbb8066b48c999da63b0
+            //ExFor:OptionButtonControl
             //ExFor:OptionButtonControl.Selected
+            //ExFor:OptionButtonControl.Type
             //ExSummary:Shows how to select radio button.
             Document doc = new Document(MyDir + "Radio buttons.docx");
 
@@ -3309,6 +3336,9 @@ public void SelectRadioControl()
             // Select second option button.
             optionButton2.Selected = true;
 
+            Assert.AreEqual(Forms2OleControlType.OptionButton, optionButton1.Type);
+            Assert.AreEqual(Forms2OleControlType.OptionButton, optionButton2.Type);
+
             doc.Save(ArtifactsDir + "Shape.SelectRadioControl.docx");
             //ExEnd:SelectRadioControl
         }
@@ -3318,16 +3348,20 @@ public void CheckedCheckBox()
         {
             //ExStart:CheckedCheckBox
             //GistId:ac8ba4eb35f3fbb8066b48c999da63b0
+            //ExFor:CheckBoxControl
             //ExFor:CheckBoxControl.Checked
+            //ExFor:CheckBoxControl.Type
+            //ExFor:Forms2OleControlType
             //ExSummary:Shows how to change state of the CheckBox control.
             Document doc = new Document(MyDir + "ActiveX controls.docx");
 
             Shape shape = (Shape)doc.GetChild(NodeType.Shape, 0, true);
             CheckBoxControl checkBoxControl = (CheckBoxControl)shape.OleFormat.OleControl;
-
             checkBoxControl.Checked = true;
-            //ExEnd:CheckedCheckBox
+            
             Assert.AreEqual(true, checkBoxControl.Checked);
+            Assert.AreEqual(Forms2OleControlType.CheckBox, checkBoxControl.Type);
+            //ExEnd:CheckedCheckBox
         }
     }
 }
diff --git a/Examples/ApiExamples/ApiExamples/ExSmartTag.cs b/Examples/ApiExamples/ApiExamples/ExSmartTag.cs
index 794d96a6..934d6470 100644
--- a/Examples/ApiExamples/ApiExamples/ExSmartTag.cs
+++ b/Examples/ApiExamples/ApiExamples/ExSmartTag.cs
@@ -26,6 +26,8 @@ class ExSmartTag : ApiExampleBase
         //ExFor:SmartTag
         //ExFor:SmartTag.#ctor(DocumentBase)
         //ExFor:SmartTag.Accept(DocumentVisitor)
+        //ExFor:SmartTag.AcceptStart(DocumentVisitor)
+        //ExFor:SmartTag.AcceptEnd(DocumentVisitor)
         //ExFor:SmartTag.Element
         //ExFor:SmartTag.Properties
         //ExFor:SmartTag.Uri
diff --git a/Examples/ApiExamples/ApiExamples/ExStructuredDocumentTag.cs b/Examples/ApiExamples/ApiExamples/ExStructuredDocumentTag.cs
index e37a7e4a..347bb343 100644
--- a/Examples/ApiExamples/ApiExamples/ExStructuredDocumentTag.cs
+++ b/Examples/ApiExamples/ApiExamples/ExStructuredDocumentTag.cs
@@ -145,6 +145,7 @@ public void Date()
             //ExFor:StructuredDocumentTag.DateStorageFormat
             //ExFor:StructuredDocumentTag.FullDate
             //ExFor:SdtCalendarType
+            //ExFor:SdtDateStorageFormat
             //ExSummary:Shows how to prompt the user to enter a date with a structured document tag.
             Document doc = new Document();
 
@@ -1177,6 +1178,7 @@ public void GetSdt()
         public void RangeSdt()
         {
             //ExStart
+            //ExFor:StructuredDocumentTagCollection
             //ExFor:StructuredDocumentTagCollection.GetById(int)
             //ExFor:StructuredDocumentTagCollection.GetByTitle(String)
             //ExFor:IStructuredDocumentTag.IsMultiSection
diff --git a/Examples/ApiExamples/ApiExamples/ExTxtLoadOptions.cs b/Examples/ApiExamples/ApiExamples/ExTxtLoadOptions.cs
index d0b3a64b..defd93cf 100644
--- a/Examples/ApiExamples/ApiExamples/ExTxtLoadOptions.cs
+++ b/Examples/ApiExamples/ApiExamples/ExTxtLoadOptions.cs
@@ -157,6 +157,7 @@ public void TrailSpaces(TxtLeadingSpacesOptions txtLeadingSpacesOptions, TxtTrai
         public void DetectDocumentDirection()
         {
             //ExStart
+            //ExFor:DocumentDirection
             //ExFor:TxtLoadOptions.DocumentDirection
             //ExFor:ParagraphFormat.Bidi
             //ExSummary:Shows how to detect plaintext document text direction.
@@ -206,6 +207,8 @@ public void DetectHyperlinks()
         {
             //ExStart:DetectHyperlinks
             //GistId:3428e84add5beb0d46a8face6e5fc858
+            //ExFor:TxtLoadOptions
+            //ExFor:TxtLoadOptions.#ctor
             //ExFor:TxtLoadOptions.DetectHyperlinks
             //ExSummary:Shows how to read and display hyperlinks.
             const string inputText = "Some links in TXT:\n" +