diff --git a/Apps/W1/ContosoCoffeeDemoDataset/app/DemoData/Analytics/3.Transactions/CreateExtendedPurchDocument.Codeunit.al b/Apps/W1/ContosoCoffeeDemoDataset/app/DemoData/Analytics/3.Transactions/CreateExtendedPurchDocument.Codeunit.al
index c8738e4834..4c8411eefc 100644
--- a/Apps/W1/ContosoCoffeeDemoDataset/app/DemoData/Analytics/3.Transactions/CreateExtendedPurchDocument.Codeunit.al
+++ b/Apps/W1/ContosoCoffeeDemoDataset/app/DemoData/Analytics/3.Transactions/CreateExtendedPurchDocument.Codeunit.al
@@ -5,13 +5,13 @@
 
 namespace Microsoft.DemoData.Analytics;
 
-using Microsoft.Purchases.Document;
-using Microsoft.DemoTool.Helpers;
+using Microsoft.DemoData.Bank;
 using Microsoft.DemoData.Foundation;
-using Microsoft.DemoTool;
 using Microsoft.DemoData.Inventory;
-using Microsoft.DemoData.Bank;
 using Microsoft.DemoData.Purchases;
+using Microsoft.DemoTool;
+using Microsoft.DemoTool.Helpers;
+using Microsoft.Purchases.Document;
 
 codeunit 5688 "Create Extended Purch Document"
 {
@@ -23,11 +23,11 @@ codeunit 5688 "Create Extended Purch Document"
         ContosoCoffeeDemoDataSetup: Record "Contoso Coffee Demo Data Setup";
         PurchaseHeader: Record "Purchase Header";
         ContosoPurchase: Codeunit "Contoso Purchase";
-        CreateVendor: Codeunit "Create Vendor";
         ContosoUtilities: Codeunit "Contoso Utilities";
-        CreatePaymentTerms: Codeunit "Create Payment Terms";
         CreateItem: Codeunit "Create Item";
         CreatePaymentMethod: Codeunit "Create Payment Method";
+        CreatePaymentTerms: Codeunit "Create Payment Terms";
+        CreateVendor: Codeunit "Create Vendor";
         DocumentDate: Date;
         StartingDate: Date;
     begin
@@ -36,7 +36,7 @@ codeunit 5688 "Create Extended Purch Document"
 
         DocumentDate := CalcDate('<-6M>', StartingDate);
 
-        PurchaseHeader := ContosoPurchase.InsertPurchaseHeader(Enum::"Purchase Document Type"::Order, CreateVendor.EUGraphicDesign(), AnalyticsReference(), ContosoUtilities.AdjustDate(19020101D), DocumentDate, ContosoUtilities.AdjustDate(19020101D), CreatePaymentTerms.PaymentTermsCM(), '', '', '', DocumentDate, '');
+        PurchaseHeader := ContosoPurchase.InsertPurchaseHeader(Enum::"Purchase Document Type"::Order, CreateVendor.EUGraphicDesign(), AnalyticsReference(), ContosoUtilities.AdjustDate(19020101D), DocumentDate, ContosoUtilities.AdjustDate(19020101D), CreatePaymentTerms.PaymentTermsCM(), '', '', '', DocumentDate, CreatePaymentMethod.Cash());
         ContosoPurchase.InsertPurchaseLineWithItem(PurchaseHeader, CreateItem.AthensDesk(), 60, '', 219.5);
 
         PurchaseHeader := ContosoPurchase.InsertPurchaseHeader(Enum::"Purchase Document Type"::Order, CreateVendor.DomesticNodPublisher(), AnalyticsReference(), ContosoUtilities.AdjustDate(19020101D), DocumentDate, ContosoUtilities.AdjustDate(19020101D), CreatePaymentTerms.PaymentTermsCOD(), '', '', '', DocumentDate, CreatePaymentMethod.Cash());
@@ -57,7 +57,7 @@ codeunit 5688 "Create Extended Purch Document"
         PurchaseHeader := ContosoPurchase.InsertPurchaseHeader(Enum::"Purchase Document Type"::Order, CreateVendor.EUGraphicDesign(), AnalyticsReference(), ContosoUtilities.AdjustDate(19020101D), DocumentDate, ContosoUtilities.AdjustDate(19020101D), CreatePaymentTerms.PaymentTermsCOD(), '', '', '', DocumentDate, CreatePaymentMethod.Cash());
         ContosoPurchase.InsertPurchaseLineWithItem(PurchaseHeader, CreateItem.BerlingGuestChairYellow(), 5, '', 27.8);
 
-        PurchaseHeader := ContosoPurchase.InsertPurchaseHeader(Enum::"Purchase Document Type"::Order, CreateVendor.DomesticFirstUp(), AnalyticsReference(), ContosoUtilities.AdjustDate(19020101D), DocumentDate, ContosoUtilities.AdjustDate(19020101D), CreatePaymentTerms.PaymentTermsCM(), '', '', '', DocumentDate, '');
+        PurchaseHeader := ContosoPurchase.InsertPurchaseHeader(Enum::"Purchase Document Type"::Order, CreateVendor.DomesticFirstUp(), AnalyticsReference(), ContosoUtilities.AdjustDate(19020101D), DocumentDate, ContosoUtilities.AdjustDate(19020101D), CreatePaymentTerms.PaymentTermsCM(), '', '', '', DocumentDate, CreatePaymentMethod.Cash());
         ContosoPurchase.InsertPurchaseLineWithItem(PurchaseHeader, CreateItem.RomeGuestChairGreen(), 39, '', 97.5);
 
         PurchaseHeader := ContosoPurchase.InsertPurchaseHeader(Enum::"Purchase Document Type"::Order, CreateVendor.DomesticWorldImporter(), AnalyticsReference(), ContosoUtilities.AdjustDate(19020101D), DocumentDate, ContosoUtilities.AdjustDate(19020101D), CreatePaymentTerms.PaymentTermsCOD(), '', '', '', DocumentDate, CreatePaymentMethod.Cash());
diff --git a/Apps/W1/ContosoCoffeeDemoDataset/app/DemoData/Analytics/3.Transactions/CreateExtendedSalesDocument.Codeunit.al b/Apps/W1/ContosoCoffeeDemoDataset/app/DemoData/Analytics/3.Transactions/CreateExtendedSalesDocument.Codeunit.al
index a026e93f0b..79978336c6 100644
--- a/Apps/W1/ContosoCoffeeDemoDataset/app/DemoData/Analytics/3.Transactions/CreateExtendedSalesDocument.Codeunit.al
+++ b/Apps/W1/ContosoCoffeeDemoDataset/app/DemoData/Analytics/3.Transactions/CreateExtendedSalesDocument.Codeunit.al
@@ -5,13 +5,13 @@
 
 namespace Microsoft.DemoData.Analytics;
 
-using Microsoft.Sales.Document;
-using Microsoft.DemoTool.Helpers;
+using Microsoft.DemoData.Bank;
 using Microsoft.DemoData.Foundation;
-using Microsoft.DemoTool;
 using Microsoft.DemoData.Inventory;
-using Microsoft.DemoData.Bank;
 using Microsoft.DemoData.Sales;
+using Microsoft.DemoTool;
+using Microsoft.DemoTool.Helpers;
+using Microsoft.Sales.Document;
 
 codeunit 5692 "Create Extended Sales Document"
 {
@@ -29,11 +29,11 @@ codeunit 5692 "Create Extended Sales Document"
     var
         SalesHeader: Record "Sales Header";
         ContosoSales: Codeunit "Contoso Sales";
-        CreateCustomer: Codeunit "Create Customer";
         ContosoUtilities: Codeunit "Contoso Utilities";
-        CreatePaymentTerms: Codeunit "Create Payment Terms";
+        CreateCustomer: Codeunit "Create Customer";
         CreateItem: Codeunit "Create Item";
         CreatePaymentMethod: Codeunit "Create Payment Method";
+        CreatePaymentTerms: Codeunit "Create Payment Terms";
         FirstDayOfTheMonth: Date;
         LastDayOfTheMonth: Date;
     begin
@@ -237,10 +237,10 @@ codeunit 5692 "Create Extended Sales Document"
     var
         SalesHeader: Record "Sales Header";
         ContosoSales: Codeunit "Contoso Sales";
-        CreateCustomer: Codeunit "Create Customer";
         ContosoUtilities: Codeunit "Contoso Utilities";
-        CreatePaymentTerms: Codeunit "Create Payment Terms";
+        CreateCustomer: Codeunit "Create Customer";
         CreateItem: Codeunit "Create Item";
+        CreatePaymentTerms: Codeunit "Create Payment Terms";
         CreateSalesDocument: Codeunit "Create Sales Document";
     begin
 
@@ -392,6 +392,6 @@ codeunit 5692 "Create Extended Sales Document"
     end;
 
     var
-        AnalyticsReferenceTok: Label 'ANALYTICS', MaxLength = 35;
         StartingDate: Date;
+        AnalyticsReferenceTok: Label 'ANALYTICS', MaxLength = 35;
 }
\ No newline at end of file
diff --git a/Apps/W1/ContosoCoffeeDemoDataset/app/DemoData/Analytics/4.Historical/CreatePostedAnalyticsData.Codeunit.al b/Apps/W1/ContosoCoffeeDemoDataset/app/DemoData/Analytics/4.Historical/CreatePostedAnalyticsData.Codeunit.al
index 6b2fe60d2d..fbbc771342 100644
--- a/Apps/W1/ContosoCoffeeDemoDataset/app/DemoData/Analytics/4.Historical/CreatePostedAnalyticsData.Codeunit.al
+++ b/Apps/W1/ContosoCoffeeDemoDataset/app/DemoData/Analytics/4.Historical/CreatePostedAnalyticsData.Codeunit.al
@@ -5,14 +5,20 @@
 
 namespace Microsoft.DemoData.Analytics;
 
-using Microsoft.Sales.Document;
-using Microsoft.Sales.Posting;
 using Microsoft.Purchases.Document;
 using Microsoft.Purchases.Posting;
+using Microsoft.Sales.Document;
+using Microsoft.Sales.Posting;
 
 codeunit 5698 "Create Posted Analytics Data"
 {
     trigger OnRun()
+    begin
+        PostSalesInvoicesForAnalytics();
+        PostPurchaseOrdersForAnalytics();
+    end;
+
+    procedure PostSalesInvoicesForAnalytics()
     var
         SalesHeader: Record "Sales Header";
         CreateExtendedSalesDocument: Codeunit "Create Extended Sales Document";