diff --git a/generate_upload_package.ps1 b/generate_upload_package.ps1
index 490dae1..828e328 100644
--- a/generate_upload_package.ps1
+++ b/generate_upload_package.ps1
@@ -1,6 +1,27 @@
-if (Test-Path -Path .\UltimatePDF_ExternalLogic.zip -PathType Leaf) {
-    Remove-Item -Path .\UltimatePDF_ExternalLogic.zip -Force
+$zipPath = ".\UltimatePDF_ExternalLogic.zip"
+$projectPath = "src\UltimatePDF_ExternalLogic\UltimatePDF_ExternalLogic.csproj"
+$publishDir = ".\src\UltimatePDF_ExternalLogic\bin\Release\net10.0\linux-x64\publish\"
+
+if (Test-Path -Path $zipPath -PathType Leaf) {
+    Write-Host "Removing existing package: $zipPath"
+    Remove-Item -Path $zipPath -Force
 }
+
+Write-Host "Setting execution policy for current user (Unrestricted)..."
 Set-ExecutionPolicy -Scope CurrentUser Unrestricted
-dotnet publish src\UltimatePDF_ExternalLogic.sln -c Release -r linux-x64 --self-contained false
-Compress-Archive -Path .\src\UltimatePDF_ExternalLogic\bin\Release\net10.0\linux-x64\publish\* -Update -DestinationPath UltimatePDF_ExternalLogic.zip
\ No newline at end of file
+
+# Only the main project is needed to produce the upload package (test projects aren't part of it).
+Write-Host "Publishing $projectPath for linux-x64 (Release, framework-dependent)..."
+dotnet publish $projectPath -c Release -r linux-x64 --self-contained false
+
+# dotnet publish doesn't throw in PowerShell on failure, so without this check a failed build
+# would silently get packaged from stale (or missing) publish output.
+if ($LASTEXITCODE -ne 0) {
+    Write-Host "dotnet publish failed with exit code $LASTEXITCODE. Aborting package creation." -ForegroundColor Red
+    exit $LASTEXITCODE
+}
+
+Write-Host "Compressing publish output into $zipPath..."
+Compress-Archive -Path (Join-Path $publishDir '*') -Update -DestinationPath $zipPath
+
+Write-Host "Package created: $zipPath" -ForegroundColor Green
\ No newline at end of file
diff --git a/src/UltimatePDF_ExternalLogic/BrowserExecution/BrowserInstancePool.cs b/src/UltimatePDF_ExternalLogic/BrowserExecution/BrowserInstancePool.cs
index bdc6274..3875c43 100644
--- a/src/UltimatePDF_ExternalLogic/BrowserExecution/BrowserInstancePool.cs
+++ b/src/UltimatePDF_ExternalLogic/BrowserExecution/BrowserInstancePool.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -7,41 +8,42 @@
 using PuppeteerSharp;
 using UltimatePDF_ExternalLogic.Utils;
 
-namespace OutSystems.UltimatePDF_ExternalLogic.BrowserExecution {
-    public class BrowserInstancePool {
+namespace OutSystems.UltimatePDF_ExternalLogic.BrowserExecution;
+public class BrowserInstancePool {
 
-        private readonly SemaphoreSlim mutex = new(1, 1);
+    private readonly SemaphoreSlim mutex = new(1, 1);
 
-        private static readonly List<PooledBrowserInstance> pool = new();
+    private static readonly List<PooledBrowserInstance> pool = new();
 
-        public BrowserInstancePool() {
-        }
-
-        private async Task<PooledBrowserInstance> NewBrowserInstance(Logger logger) {
-            await mutex.WaitAsync();
-            try {
-                var instance = pool.FirstOrDefault(i => i.IsHealthy);
+    public BrowserInstancePool() {
+    }
 
-                if (instance == null) {
-                    logger.Log("Create new Browser Instance");
+    private async Task<PooledBrowserInstance> NewBrowserInstance(Logger logger) {
+        using var activity = Activity.Current?.Source.StartActivity("BrowserInstancePool.NewBrowserInstance");
+        await mutex.WaitAsync();
+        try {
+            var instance = pool.FirstOrDefault(i => i.IsHealthy);
 
-                    var browserLauncher = new HeadlessChromiumPuppeteerLauncher(logger.GetLoggerFactory("browser.txt"));
-                    var browser = await browserLauncher.LaunchAsync();
-                    instance = new PooledBrowserInstance(browser);
-                    pool.Add(instance);
-                }
+            if (instance == null) {
+                logger.Log("Create new Browser Instance");
 
-                return instance;
-            } finally {
-                mutex.Release();
+                var browserLauncher = new HeadlessChromiumPuppeteerLauncher(logger.GetLoggerFactory("browser.txt"));
+                var browser = await browserLauncher.LaunchAsync();
+                instance = new PooledBrowserInstance(browser);
+                pool.Add(instance);
             }
-        }
 
-        public async Task<PooledPage> NewPooledPage(Logger logger) {
-            var instance = await NewBrowserInstance(logger);
-            var page = await instance.Browser.NewPageAsync();
-            var pooledPage = new PooledPage(page, logger);
-            return pooledPage;
+            return instance;
+        } finally {
+            mutex.Release();
         }
     }
+
+    public async Task<PooledPage> NewPooledPage(Logger logger) {
+        using var activity = Activity.Current?.Source.StartActivity("BrowserInstancePool.NewPooledPage");
+        var instance = await NewBrowserInstance(logger);
+        var page = await instance.Browser.NewPageAsync();
+        var pooledPage = new PooledPage(page, logger);
+        return pooledPage;
+    }
 }
diff --git a/src/UltimatePDF_ExternalLogic/BrowserExecution/ODCUltimatePDFExecutionContext.cs b/src/UltimatePDF_ExternalLogic/BrowserExecution/ODCUltimatePDFExecutionContext.cs
index 506e3d3..617442e 100644
--- a/src/UltimatePDF_ExternalLogic/BrowserExecution/ODCUltimatePDFExecutionContext.cs
+++ b/src/UltimatePDF_ExternalLogic/BrowserExecution/ODCUltimatePDFExecutionContext.cs
@@ -10,202 +10,210 @@
 using PuppeteerSharp;
 using PuppeteerSharp.Media;
 
-namespace OutSystems.UltimatePDF_ExternalLogic.BrowserExecution {
-    internal class UltimatePDFExecutionContext {
+namespace OutSystems.UltimatePDF_ExternalLogic.BrowserExecution;
+internal class UltimatePDFExecutionContext {
 
-        private const string USER_AGENT_SUFFIX = "UltimatePDF/1.0";
+    private const string USER_AGENT_SUFFIX = "UltimatePDF/1.0";
 
-        private static readonly BrowserInstancePool pool = new();
+    private static readonly BrowserInstancePool pool = new();
 
-        public async static Task<byte[]> PrintPDF(
-            Uri uri, string baseUrl, string locale, string timezone, IEnumerable<CookieParam> cookies,
-            ViewPortOptions viewport, PdfOptions options, int timeoutSeconds, Logger logger) {
+    public async static Task<byte[]> PrintPDF(
+        Uri uri, string baseUrl, string locale, string timezone, IEnumerable<CookieParam> cookies,
+        ViewPortOptions viewport, PdfOptions options, int timeoutSeconds, Logger logger) {
 
-            logger.Log("Page open... " + uri);
+        using var activity = Activity.Current?.Source.StartActivity("UltimatePDFExecutionContext.PrintPDF");
 
-            Stopwatch sw = new();
-            sw.Start();
+        logger.Log("Page open... " + uri);
 
-            using var pooled = await pool.NewPooledPage(logger);
-            await SetupPage(pooled.Page, uri, viewport, locale, timezone, cookies, 
-                timeoutSeconds, logger, baseUrl);
+        Stopwatch sw = new();
+        sw.Start();
 
-            logger.Log("Page opened in " + sw.ElapsedMilliseconds + "ms");
-            await pooled.Page.WaitForSelectorAsync(":root:not(.ultimate-pdf-is-not-ready)");
-            logger.Log("Page opened and ready in " + sw.ElapsedMilliseconds + "ms");
+        using var pooled = await pool.NewPooledPage(logger);
+        await SetupPage(pooled.Page, uri, viewport, locale, timezone, cookies, 
+            timeoutSeconds, logger, baseUrl);
 
-            if (!string.IsNullOrEmpty(baseUrl)) {
-                await pooled.Page.EvaluateExpressionAsync("window?.UltimatePDF?.setBaseUrl?.('" + HttpUtility.JavaScriptStringEncode(baseUrl) + "')");
-            }
-
-            if (logger.IsEnabled) {
-                string html = await pooled.Page.GetContentAsync();
-                logger.Attach("input.html", Encoding.UTF8.GetBytes(html));
-            }
+        logger.Log("Page opened in " + sw.ElapsedMilliseconds + "ms");
+        await pooled.Page.WaitForSelectorAsync(":root:not(.ultimate-pdf-is-not-ready)");
+        logger.Log("Page opened and ready in " + sw.ElapsedMilliseconds + "ms");
 
-            Pipeline pipeline = new Pipeline();
-            await pipeline.Initialize(pooled.Page);
-            byte[] pdf;
+        if (!string.IsNullOrEmpty(baseUrl)) {
+            await pooled.Page.EvaluateExpressionAsync("window?.UltimatePDF?.setBaseUrl?.('" + HttpUtility.JavaScriptStringEncode(baseUrl) + "')");
+        }
 
-            if (pipeline.HasLayouts) {
-                logger.Log("Using UltimatePDF layout pipeline");
+        if (logger.IsEnabled) {
+            string html = await pooled.Page.GetContentAsync();
+            logger.Attach("input.html", Encoding.UTF8.GetBytes(html));
+        }
 
-                pdf = await pipeline.Render(pooled.Page, logger);
-                logger.Attach("output.pdf", pdf);
-            } else {
-                await InjectCustomStylesAsync(pooled.Page, ref options);
-                pdf = await pooled.Page.PdfDataAsync(options);
-                logger.Attach("output.pdf", pdf);
-            }
+        Pipeline pipeline = new Pipeline();
+        await pipeline.Initialize(pooled.Page);
+        byte[] pdf;
 
-            await pooled.Page.CloseAsync();
-            await pooled.Page.Browser.CloseAsync();
+        if (pipeline.HasLayouts) {
+            logger.Log("Using UltimatePDF layout pipeline");
 
-            return pdf;
+            pdf = await pipeline.Render(pooled.Page, logger);
+            logger.Attach("output.pdf", pdf);
+        } else {
+            await InjectCustomStylesAsync(pooled.Page, ref options);
+            pdf = await pooled.Page.PdfDataAsync(options);
+            logger.Attach("output.pdf", pdf);
         }
 
-        public async static Task<byte[]> ScreenshotPNG(
-            Uri uri, string baseUrl, string locale, string timezone, IEnumerable<CookieParam> cookies,
-            ViewPortOptions viewport, ScreenshotOptions options, int timeoutSeconds, Logger logger) {
+        await pooled.Page.CloseAsync();
+        await pooled.Page.Browser.CloseAsync();
 
-            logger.Log("Page open...");
+        return pdf;
+    }
 
-            var sw = new Stopwatch();
-            sw.Start();
+    public async static Task<byte[]> ScreenshotPNG(
+        Uri uri, string baseUrl, string locale, string timezone, IEnumerable<CookieParam> cookies,
+        ViewPortOptions viewport, ScreenshotOptions options, int timeoutSeconds, Logger logger) {
 
-            using var pooled = await pool.NewPooledPage(logger);
-            await SetupPage(pooled.Page, uri, viewport, locale, timezone, cookies, timeoutSeconds, logger, baseUrl);
+        using var activity = Activity.Current?.Source.StartActivity("UltimatePDFExecutionContext.ScreenshotPNG");
 
-            if (logger.IsEnabled) {
-                string html = await pooled.Page.GetContentAsync();
-                logger.Attach("input.html", Encoding.UTF8.GetBytes(html));
-            }
+        logger.Log("Page open...");
+
+        var sw = new Stopwatch();
+        sw.Start();
 
-            byte[] png = await pooled.Page.ScreenshotDataAsync(options);
-            logger.Attach("output.png", png);
+        using var pooled = await pool.NewPooledPage(logger);
+        await SetupPage(pooled.Page, uri, viewport, locale, timezone, cookies, timeoutSeconds, logger, baseUrl);
 
-            return png;
+        if (logger.IsEnabled) {
+            string html = await pooled.Page.GetContentAsync();
+            logger.Attach("input.html", Encoding.UTF8.GetBytes(html));
         }
 
-        private static async Task SetupPage(
-            IPage page, Uri uri, ViewPortOptions viewport, string locale, string timezone,
-            IEnumerable<CookieParam> cookies, int timeout, Logger logger, string baseUrl) {
+        byte[] png = await pooled.Page.ScreenshotDataAsync(options);
+        logger.Attach("output.png", png);
 
-            await page.SetViewportAsync(viewport);
+        return png;
+    }
 
-            string originalUserAgent = await page.Browser.GetUserAgentAsync();
-            await page.SetUserAgentAsync($"{originalUserAgent} {USER_AGENT_SUFFIX}");
+    private static async Task SetupPage(
+        IPage page, Uri uri, ViewPortOptions viewport, string locale, string timezone,
+        IEnumerable<CookieParam> cookies, int timeout, Logger logger, string baseUrl) {
 
-            if (!string.IsNullOrEmpty(locale)) {
-                await page.SetExtraHttpHeadersAsync(GetLocaleHeaders(locale));
-                await page.EvaluateExpressionOnNewDocumentAsync(GetLocaleExpressionToEvaluate(locale));
-            }
+        using var activity = Activity.Current?.Source.StartActivity("UltimatePDFExecutionContext.SetupPage");
 
-            if (!string.IsNullOrEmpty(timezone)) {
-                await page.EmulateTimezoneAsync(timezone);
-            }
+        await page.SetViewportAsync(viewport);
 
-            if (cookies.Any()) {
-                await page.SetCookieAsync(cookies.ToArray());
-            }
+        string originalUserAgent = await page.Browser.GetUserAgentAsync();
+        await page.SetUserAgentAsync($"{originalUserAgent} {USER_AGENT_SUFFIX}");
 
-            var navigationOptions = new NavigationOptions() {
-                WaitUntil = new WaitUntilNavigation[] {
-                            WaitUntilNavigation.DOMContentLoaded,
-                            WaitUntilNavigation.Load,
-                            WaitUntilNavigation.Networkidle0
-                }
-            };
+        if (!string.IsNullOrEmpty(locale)) {
+            await page.SetExtraHttpHeadersAsync(GetLocaleHeaders(locale));
+            await page.EvaluateExpressionOnNewDocumentAsync(GetLocaleExpressionToEvaluate(locale));
+        }
 
-            if (timeout > 0) {
-                navigationOptions.Timeout = timeout * 1000;
-            }
+        if (!string.IsNullOrEmpty(timezone)) {
+            await page.EmulateTimezoneAsync(timezone);
+        }
 
-            lock (page.Browser) {
-                logger.Log($"Go to... {uri}");
-                page.GoToAsync(uri.ToString(), navigationOptions).Wait();
-            }
+        if (cookies.Any()) {
+            await page.SetCookieAsync(cookies.ToArray());
+        }
 
-            if (!string.IsNullOrEmpty(locale)) {
-                logger.Log($"Set locale to {locale}");
-                await page.EvaluateExpressionAsync("window?.UltimatePDF?.runtime?.setLocale?.('" + HttpUtility.JavaScriptStringEncode(locale) + "')");
+        var navigationOptions = new NavigationOptions() {
+            WaitUntil = new WaitUntilNavigation[] {
+                        WaitUntilNavigation.DOMContentLoaded,
+                        WaitUntilNavigation.Load,
+                        WaitUntilNavigation.Networkidle0
             }
+        };
 
-            // used for the Async Screen client actions 
-            await page.WaitForSelectorAsync(":root:not(.ultimate-pdf-is-not-ready)");
+        if (timeout > 0) {
+            navigationOptions.Timeout = timeout * 1000;
+        }
 
-            if (!string.IsNullOrEmpty(baseUrl)) {
-                logger.Log($"Set base url to {baseUrl}");
-                await page.EvaluateExpressionAsync("window?.UltimatePDF?.setBaseUrl?.('" + HttpUtility.JavaScriptStringEncode(baseUrl) + "')");
-            }
+        lock (page.Browser) {
+            logger.Log($"Go to... {uri}");
+            page.GoToAsync(uri.ToString(), navigationOptions).Wait();
         }
 
-        private static Dictionary<string, string> GetLocaleHeaders(string locale) {
-            var headers = new Dictionary<string, string>();
+        if (!string.IsNullOrEmpty(locale)) {
+            logger.Log($"Set locale to {locale}");
+            await page.EvaluateExpressionAsync("window?.UltimatePDF?.runtime?.setLocale?.('" + HttpUtility.JavaScriptStringEncode(locale) + "')");
+        }
 
-            int separatorIndex = locale.IndexOf("-");
-            if (separatorIndex > 0) {
-                headers.Add("Accept-Language", string.Concat(locale, ",", locale[0..separatorIndex]));
-            } else {
-                headers.Add("Accept-Language", locale);
-            }
+        // used for the Async Screen client actions 
+        await page.WaitForSelectorAsync(":root:not(.ultimate-pdf-is-not-ready)");
 
-            return headers;
-        }
-
-        private static string GetLocaleExpressionToEvaluate(string locale) {
-            return @"
-                Object.defineProperty(navigator, 'language', {
-                    get: function() { return '" + HttpUtility.JavaScriptStringEncode(locale) + @"'; }
-                });
-                Object.defineProperty(navigator, 'languages', {
-                    get: function() {
-                        var separatorIndex = this.language.indexOf('-');
-                        if (separatorIndex > 0) {
-                            return [ this.language, this.language.substr(0, separatorIndex) ];
-                        } else {
-                            return [ this.language ];
-                        }
+        if (!string.IsNullOrEmpty(baseUrl)) {
+            logger.Log($"Set base url to {baseUrl}");
+            await page.EvaluateExpressionAsync("window?.UltimatePDF?.setBaseUrl?.('" + HttpUtility.JavaScriptStringEncode(baseUrl) + "')");
+        }
+    }
+
+    private static Dictionary<string, string> GetLocaleHeaders(string locale) {
+        using var activity = Activity.Current?.Source.StartActivity("UltimatePDFExecutionContext.GetLocaleHeaders");
+        var headers = new Dictionary<string, string>();
+
+        int separatorIndex = locale.IndexOf("-");
+        if (separatorIndex > 0) {
+            headers.Add("Accept-Language", string.Concat(locale, ",", locale[0..separatorIndex]));
+        } else {
+            headers.Add("Accept-Language", locale);
+        }
+
+        return headers;
+    }
+
+    private static string GetLocaleExpressionToEvaluate(string locale) {
+        using var activity = Activity.Current?.Source.StartActivity("UltimatePDFExecutionContext.GetLocaleExpressionToEvaluate");
+        return @"
+            Object.defineProperty(navigator, 'language', {
+                get: function() { return '" + HttpUtility.JavaScriptStringEncode(locale) + @"'; }
+            });
+            Object.defineProperty(navigator, 'languages', {
+                get: function() {
+                    var separatorIndex = this.language.indexOf('-');
+                    if (separatorIndex > 0) {
+                        return [ this.language, this.language.substr(0, separatorIndex) ];
+                    } else {
+                        return [ this.language ];
                     }
-                });
-            ";
-        }
-
-        private static Task InjectCustomStylesAsync(IPage page, ref PdfOptions options) {
-            /*
-             * It seems that Puppeteer is not overriding the page styles from the print stylesheet.
-             * As a workaround, we inject a <style> tag with the @page overrides at the end of <head>.
-             * This issue might be eventually resolved in Puppeteer, and seems to be tracked by https://github.com/GoogleChrome/puppeteer/issues/393
-             */
-            string overrides = string.Empty;
-            if (!options.PreferCSSPageSize && options.Width != null && options.Height != null) {
-                overrides += $"size: {options.Width} {options.Height}; ";
-            }
-            if (options.MarginOptions.Top != null) {
-                overrides += $"margin-top: {options.MarginOptions.Top}; ";
-            }
-            if (options.MarginOptions.Right != null) {
-                overrides += $"margin-right: {options.MarginOptions.Right}; ";
-            }
-            if (options.MarginOptions.Bottom != null) {
-                overrides += $"margin-bottom: {options.MarginOptions.Bottom}; ";
-            }
-            if (options.MarginOptions.Left != null) {
-                overrides += $"margin-left: {options.MarginOptions.Left}; ";
-            }
+                }
+            });
+        ";
+    }
 
-            if (!string.IsNullOrEmpty(overrides)) {
-                /* Change the options so that Puppeteer respects our overrides */
-                options.PreferCSSPageSize = true;
-                options.Width = options.Height = null;
-                options.MarginOptions = new MarginOptions();
-
-                /* We must add the <style> tag at the end of <body> to make sure it is not overriden */
-                string pageOverrides = "@page { " + overrides + "}";
-                return page.EvaluateExpressionAsync($"const style = document.createElement('style'); style.innerHTML = '{pageOverrides}'; document.head.appendChild(style);");
-            } else {
-                return Task.CompletedTask;
-            }
+    private static Task InjectCustomStylesAsync(IPage page, ref PdfOptions options) {
+        using var activity = Activity.Current?.Source.StartActivity("UltimatePDFExecutionContext.InjectCustomStylesAsync");
+        /*
+         * It seems that Puppeteer is not overriding the page styles from the print stylesheet.
+         * As a workaround, we inject a <style> tag with the @page overrides at the end of <head>.
+         * This issue might be eventually resolved in Puppeteer, and seems to be tracked by https://github.com/GoogleChrome/puppeteer/issues/393
+         */
+        string overrides = string.Empty;
+        if (!options.PreferCSSPageSize && options.Width != null && options.Height != null) {
+            overrides += $"size: {options.Width} {options.Height}; ";
+        }
+        if (options.MarginOptions.Top != null) {
+            overrides += $"margin-top: {options.MarginOptions.Top}; ";
+        }
+        if (options.MarginOptions.Right != null) {
+            overrides += $"margin-right: {options.MarginOptions.Right}; ";
+        }
+        if (options.MarginOptions.Bottom != null) {
+            overrides += $"margin-bottom: {options.MarginOptions.Bottom}; ";
+        }
+        if (options.MarginOptions.Left != null) {
+            overrides += $"margin-left: {options.MarginOptions.Left}; ";
+        }
+
+        if (!string.IsNullOrEmpty(overrides)) {
+            /* Change the options so that Puppeteer respects our overrides */
+            options.PreferCSSPageSize = true;
+            options.Width = options.Height = null;
+            options.MarginOptions = new MarginOptions();
+
+            /* We must add the <style> tag at the end of <body> to make sure it is not overriden */
+            string pageOverrides = "@page { " + overrides + "}";
+            return page.EvaluateExpressionAsync($"const style = document.createElement('style'); style.innerHTML = '{pageOverrides}'; document.head.appendChild(style);");
+        } else {
+            return Task.CompletedTask;
         }
     }
 }
diff --git a/src/UltimatePDF_ExternalLogic/BrowserExecution/PooledBrowserInstance.cs b/src/UltimatePDF_ExternalLogic/BrowserExecution/PooledBrowserInstance.cs
index a0c8185..39b7119 100644
--- a/src/UltimatePDF_ExternalLogic/BrowserExecution/PooledBrowserInstance.cs
+++ b/src/UltimatePDF_ExternalLogic/BrowserExecution/PooledBrowserInstance.cs
@@ -1,18 +1,17 @@
 using PuppeteerSharp;
 
-namespace OutSystems.UltimatePDF_ExternalLogic.BrowserExecution {
-    public class PooledBrowserInstance {
+namespace OutSystems.UltimatePDF_ExternalLogic.BrowserExecution;
+public class PooledBrowserInstance {
 
-        private readonly IBrowser browser;
+    private readonly IBrowser browser;
 
-        public IBrowser Browser { get { return browser; } }
+    public IBrowser Browser { get { return browser; } }
 
-        public bool IsHealthy {
-            get { return !browser.Process.HasExited; }
-        }
+    public bool IsHealthy {
+        get { return !browser.Process.HasExited; }
+    }
 
-        public PooledBrowserInstance(IBrowser browser) {
-            this.browser = browser;
-        }
+    public PooledBrowserInstance(IBrowser browser) {
+        this.browser = browser;
     }
 }
diff --git a/src/UltimatePDF_ExternalLogic/BrowserExecution/PooledPage.cs b/src/UltimatePDF_ExternalLogic/BrowserExecution/PooledPage.cs
index 9eaabcd..b03618e 100644
--- a/src/UltimatePDF_ExternalLogic/BrowserExecution/PooledPage.cs
+++ b/src/UltimatePDF_ExternalLogic/BrowserExecution/PooledPage.cs
@@ -3,31 +3,30 @@
 using OutSystems.UltimatePDF_ExternalLogic.Management.Troubleshooting;
 using PuppeteerSharp;
 
-namespace OutSystems.UltimatePDF_ExternalLogic.BrowserExecution {
-    public class PooledPage : IDisposable {
+namespace OutSystems.UltimatePDF_ExternalLogic.BrowserExecution;
+public class PooledPage : IDisposable {
 
-        private readonly Logger logger;
-        private readonly IPage page;
+    private readonly Logger logger;
+    private readonly IPage page;
 
-        public IPage Page {
-            get { return page; }
-        }
+    public IPage Page {
+        get { return page; }
+    }
 
-        public PooledPage(IPage page, Logger logger) {
-            this.page = page;
-            this.logger = logger;
-        }
+    public PooledPage(IPage page, Logger logger) {
+        this.page = page;
+        this.logger = logger;
+    }
 
-        public void Dispose() {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
+    public void Dispose() {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
 
-        protected virtual void Dispose(bool disposing) {
-            if (disposing) {
-                logger.Log("Closing page");
-                Task.Run(() => page.CloseAsync());
-            }
+    protected virtual void Dispose(bool disposing) {
+        if (disposing) {
+            logger.Log("Closing page");
+            Task.Run(() => page.CloseAsync());
         }
     }
 }
diff --git a/src/UltimatePDF_ExternalLogic/Cleanup/AbstractCleanupTask.cs b/src/UltimatePDF_ExternalLogic/Cleanup/AbstractCleanupTask.cs
index 9d79388..75d7492 100644
--- a/src/UltimatePDF_ExternalLogic/Cleanup/AbstractCleanupTask.cs
+++ b/src/UltimatePDF_ExternalLogic/Cleanup/AbstractCleanupTask.cs
@@ -1,16 +1,18 @@
-using System.Threading.Tasks;
+using System.Diagnostics;
+using System.Threading.Tasks;
 using OutSystems.UltimatePDF_ExternalLogic.Utils;
 
-namespace UltimatePDF_ExternalLogic.Cleanup {
-    internal abstract class AbstractCleanupTask {
-        public void StartInBackground() {
-            Task.Run(Cleanup);
-        }
-
-        public void StartAndWait() {
-            AsyncUtils.StartAndWait(Cleanup);
-        }
+namespace UltimatePDF_ExternalLogic.Cleanup;
+internal abstract class AbstractCleanupTask {
+    public void StartInBackground() {
+        using var activity = Activity.Current?.Source.StartActivity("AbstractCleanupTask.StartInBackground");
+        Task.Run(Cleanup);
+    }
 
-        public abstract Task Cleanup();
+    public void StartAndWait() {
+        using var activity = Activity.Current?.Source.StartActivity("AbstractCleanupTask.StartAndWait");
+        AsyncUtils.StartAndWait(Cleanup);
     }
+
+    public abstract Task Cleanup();
 }
diff --git a/src/UltimatePDF_ExternalLogic/Cleanup/BrowserInstanceCleanup.cs b/src/UltimatePDF_ExternalLogic/Cleanup/BrowserInstanceCleanup.cs
index 47a999f..aa60fe6 100644
--- a/src/UltimatePDF_ExternalLogic/Cleanup/BrowserInstanceCleanup.cs
+++ b/src/UltimatePDF_ExternalLogic/Cleanup/BrowserInstanceCleanup.cs
@@ -1,24 +1,25 @@
-using System.Threading.Tasks;
+using System.Diagnostics;
+using System.Threading.Tasks;
 using PuppeteerSharp;
 
-namespace UltimatePDF_ExternalLogic.Cleanup {
-    internal class BrowserInstanceCleanup : AbstractCleanupTask {
-        private const int BROWSER_CLOSE_TIMEOUT_MS = 10 * 1000;
+namespace UltimatePDF_ExternalLogic.Cleanup;
+internal class BrowserInstanceCleanup : AbstractCleanupTask {
+    private const int BROWSER_CLOSE_TIMEOUT_MS = 10 * 1000;
 
-        private readonly IBrowser browser;
+    private readonly IBrowser browser;
 
-        public BrowserInstanceCleanup(IBrowser browser) {
-            this.browser = browser;
-        }
+    public BrowserInstanceCleanup(IBrowser browser) {
+        this.browser = browser;
+    }
 
 
-        public override async Task Cleanup() {
-            try {
-                await browser.CloseAsync();
-                browser.Process.WaitForExit(BROWSER_CLOSE_TIMEOUT_MS);
-            } catch {
-            }
+    public override async Task Cleanup() {
+        using var activity = Activity.Current?.Source.StartActivity("BrowserInstanceCleanup.Cleanup");
+        try {
+            await browser.CloseAsync();
+            browser.Process.WaitForExit(BROWSER_CLOSE_TIMEOUT_MS);
+        } catch {
         }
-
     }
+
 }
diff --git a/src/UltimatePDF_ExternalLogic/IUltimatePDF_ExternalLogic.cs b/src/UltimatePDF_ExternalLogic/IUltimatePDF_ExternalLogic.cs
index d9eaad7..90bde1a 100644
--- a/src/UltimatePDF_ExternalLogic/IUltimatePDF_ExternalLogic.cs
+++ b/src/UltimatePDF_ExternalLogic/IUltimatePDF_ExternalLogic.cs
@@ -2,125 +2,124 @@
 using OutSystems.ExternalLibraries.SDK;
 using OutSystems.UltimatePDF_ExternalLogic.Structures;
 
-namespace OutSystems.UltimatePDF_ExternalLogic {
+namespace OutSystems.UltimatePDF_ExternalLogic;
+
+/// <summary>
+/// The IUltimatePDF_ExternalLogic interface defines the methods (exposed as server actions)
+/// to generate PDF reports by using modern web technologies.
+/// </summary>
+[OSInterface(
+    Description = "Generate PDF reports by using modern web technologies in OutSystems Developer Cloud (ODC) apps.",
+    Name = "UltimatePDF_ExternalLogic",
+    IconResourceName = "UltimatePDF_ExternalLogic.resources.PrintLayout.png")]
+public interface IUltimatePDF_ExternalLogic {
 
     /// <summary>
-    /// The IUltimatePDF_ExternalLogic interface defines the methods (exposed as server actions)
-    /// to generate PDF reports by using modern web technologies.
+    /// Generate PDF file from a webpage. Optionally embeds document metadata into the resulting file.
     /// </summary>
-    [OSInterface(
-        Description = "Generate PDF reports by using modern web technologies in OutSystems Developer Cloud (ODC) apps.",
-        Name = "UltimatePDF_ExternalLogic",
-        IconResourceName = "UltimatePDF_ExternalLogic.resources.PrintLayout.png")]
-    public interface IUltimatePDF_ExternalLogic {
-
-        /// <summary>
-        /// Generate PDF file from a webpage. Optionally embeds document metadata into the resulting file.
-        /// </summary>
-        [OSAction(Description = "Generate PDF file from a webpage.",
-            ReturnName = "PDF")]
-        public byte[] PrintPDF(
-            [OSParameter(DataType = OSDataType.Text, Description = "URL of the page to download")]
-            string url,
-            [OSParameter(Description = "Bowser viewport configuration")]
-            Structures.Viewport viewport,
-            [OSParameter(Description = "Environment information")]
-            Structures.Environment environment,
-            [OSParameter(Description = "List of cookies to add to the browser when accessing the page")]
-            IEnumerable<Structures.Cookie> cookies,
-            [OSParameter(Description = "PDF paper configuration")]
-            Structures.Paper paper,
-            [OSParameter(DataType = OSDataType.Integer, Description = "Browser render execution timeout in seconds")]
-            int timeoutSeconds,
-            [OSParameter(DataType = OSDataType.Boolean, Description = "Collects execution logs. If False LogsZipFile will be empty.")]
-            bool collectLogs,
-            [OSParameter(DataType = OSDataType.Boolean, Description = "Attach PDF and HTML files to the logs.")]
-            bool attachFilesLogs,
-            [OSParameter(DataType = OSDataType.BinaryData, Description = "PDF generation task logs")]
-            out byte[] logsZipFile,
-            [OSParameter(Description = "Document metadata applied to the generated PDF")]
-            Structures.DocumentProperties? documentProperties = null);
+    [OSAction(Description = "Generate PDF file from a webpage.",
+        ReturnName = "PDF")]
+    public byte[] PrintPDF(
+        [OSParameter(DataType = OSDataType.Text, Description = "URL of the page to download")]
+        string url,
+        [OSParameter(Description = "Bowser viewport configuration")]
+        Structures.Viewport viewport,
+        [OSParameter(Description = "Environment information")]
+        Structures.Environment environment,
+        [OSParameter(Description = "List of cookies to add to the browser when accessing the page")]
+        IEnumerable<Structures.Cookie> cookies,
+        [OSParameter(Description = "PDF paper configuration")]
+        Structures.Paper paper,
+        [OSParameter(DataType = OSDataType.Integer, Description = "Browser render execution timeout in seconds")]
+        int timeoutSeconds,
+        [OSParameter(DataType = OSDataType.Boolean, Description = "Collects execution logs. If False LogsZipFile will be empty.")]
+        bool collectLogs,
+        [OSParameter(DataType = OSDataType.Boolean, Description = "Attach PDF and HTML files to the logs.")]
+        bool attachFilesLogs,
+        [OSParameter(DataType = OSDataType.BinaryData, Description = "PDF generation task logs")]
+        out byte[] logsZipFile,
+        [OSParameter(Description = "Document metadata applied to the generated PDF")]
+        Structures.DocumentProperties? documentProperties = null);
 
-        /// <summary>
-        /// Generate PDF file from a webpage, and send the information using a REST endpoint.
-        /// Optionally embeds document metadata into the resulting file.
-        /// </summary>
-        [OSAction(Description = "Generate PDF file from a webpage, and send the information using a REST endpoint.")]
-        public void PrintPDF_ToRest(
-            [OSParameter(DataType = OSDataType.Text, Description = "URL of the page to download")]
-            string url,
-            [OSParameter(Description = "Bowser viewport configuration")]
-            Structures.Viewport viewport,
-            [OSParameter(Description = "Environment information")]
-            Structures.Environment environment,
-            [OSParameter(Description = "List of cookies to add to the browser when accessing the page")]
-            IEnumerable<Structures.Cookie> cookies,
-            [OSParameter(Description = "PDF paper configuration")]
-            Structures.Paper paper,
-            [OSParameter(DataType = OSDataType.Integer, Description = "Browser render execution timeout in seconds")]
-            int timeoutSeconds,
-            [OSParameter(DataType = OSDataType.Boolean, Description = "Collects execution logs. If False LogsZipFile will be empty.")]
-            bool collectLogs,
-            [OSParameter(DataType = OSDataType.Boolean, Description = "Attach PDF and HTML files to the logs.")]
-            bool attachFilesLogs,
-            [OSParameter(Description = "Rest call configuration")]
-            Structures.RestCaller restCaller,
-            [OSParameter(Description = "Document metadata applied to the generated PDF")]
-            Structures.DocumentProperties? documentProperties = null);
+    /// <summary>
+    /// Generate PDF file from a webpage, and send the information using a REST endpoint.
+    /// Optionally embeds document metadata into the resulting file.
+    /// </summary>
+    [OSAction(Description = "Generate PDF file from a webpage, and send the information using a REST endpoint.")]
+    public void PrintPDF_ToRest(
+        [OSParameter(DataType = OSDataType.Text, Description = "URL of the page to download")]
+        string url,
+        [OSParameter(Description = "Bowser viewport configuration")]
+        Structures.Viewport viewport,
+        [OSParameter(Description = "Environment information")]
+        Structures.Environment environment,
+        [OSParameter(Description = "List of cookies to add to the browser when accessing the page")]
+        IEnumerable<Structures.Cookie> cookies,
+        [OSParameter(Description = "PDF paper configuration")]
+        Structures.Paper paper,
+        [OSParameter(DataType = OSDataType.Integer, Description = "Browser render execution timeout in seconds")]
+        int timeoutSeconds,
+        [OSParameter(DataType = OSDataType.Boolean, Description = "Collects execution logs. If False LogsZipFile will be empty.")]
+        bool collectLogs,
+        [OSParameter(DataType = OSDataType.Boolean, Description = "Attach PDF and HTML files to the logs.")]
+        bool attachFilesLogs,
+        [OSParameter(Description = "Rest call configuration")]
+        Structures.RestCaller restCaller,
+        [OSParameter(Description = "Document metadata applied to the generated PDF")]
+        Structures.DocumentProperties? documentProperties = null);
 
-        /// <summary>
-        /// Generate PDF file from a webpage, and upload it to a S3 PreSigned URL.
-        /// Optionally embeds document metadata into the resulting file.
-        /// </summary>
-        [OSAction(Description = "Generate PDF file from a webpage, and upload it to a S3 PreSigned URL.")]
-        public void PrintPDF_ToS3(
-            [OSParameter(DataType = OSDataType.Text, Description = "URL of the page to download")]
-            string url,
-            [OSParameter(Description = "Bowser viewport configuration")]
-            Viewport viewport,
-            [OSParameter(Description = "Environment information")]
-            Structures.Environment environment,
-            [OSParameter(Description = "List of cookies to add to the browser when accessing the page")]
-            IEnumerable<Structures.Cookie> cookies,
-            [OSParameter(Description = "PDF paper configuration")]
-            Paper paper,
-            [OSParameter(DataType = OSDataType.Integer, Description = "Browser render execution timeout in seconds")]
-            int timeoutSeconds,
-            [OSParameter(DataType = OSDataType.Boolean, Description = "Collects execution logs. If False LogsZipFile will be empty")]
-            bool collectLogs,
-            [OSParameter(DataType = OSDataType.Boolean, Description = "Attach PDF and HTML files to the logs")]
-            bool attachFilesLogs,
-            [OSParameter(Description = "S3 PreSigned URLs for Ultimate PDf to use to store the resulting binaries")]
-            S3Endpoints s3Endpoints,
-            [OSParameter(Description = "Document metadata applied to the generated PDF")]
-            Structures.DocumentProperties? documentProperties = null);
+    /// <summary>
+    /// Generate PDF file from a webpage, and upload it to a S3 PreSigned URL.
+    /// Optionally embeds document metadata into the resulting file.
+    /// </summary>
+    [OSAction(Description = "Generate PDF file from a webpage, and upload it to a S3 PreSigned URL.")]
+    public void PrintPDF_ToS3(
+        [OSParameter(DataType = OSDataType.Text, Description = "URL of the page to download")]
+        string url,
+        [OSParameter(Description = "Bowser viewport configuration")]
+        Viewport viewport,
+        [OSParameter(Description = "Environment information")]
+        Structures.Environment environment,
+        [OSParameter(Description = "List of cookies to add to the browser when accessing the page")]
+        IEnumerable<Structures.Cookie> cookies,
+        [OSParameter(Description = "PDF paper configuration")]
+        Paper paper,
+        [OSParameter(DataType = OSDataType.Integer, Description = "Browser render execution timeout in seconds")]
+        int timeoutSeconds,
+        [OSParameter(DataType = OSDataType.Boolean, Description = "Collects execution logs. If False LogsZipFile will be empty")]
+        bool collectLogs,
+        [OSParameter(DataType = OSDataType.Boolean, Description = "Attach PDF and HTML files to the logs")]
+        bool attachFilesLogs,
+        [OSParameter(Description = "S3 PreSigned URLs for Ultimate PDf to use to store the resulting binaries")]
+        S3Endpoints s3Endpoints,
+        [OSParameter(Description = "Document metadata applied to the generated PDF")]
+        Structures.DocumentProperties? documentProperties = null);
 
-        /// <summary>
-        /// Generate PNG file from a webpage. Optionally embeds document metadata into the resulting file.
-        /// </summary>
-        [OSAction(Description = "Generate PNG file from a webpage.",
-            ReturnName = "PNG")]
-        public byte[] ScreenshotPNG(
-            [OSParameter(DataType = OSDataType.Text, Description = "URL of the page to download")]
-            string url,
-            [OSParameter(Description = "Bowser viewport configuration")]
-            Structures.Viewport viewport,
-            [OSParameter(Description = "Environment information")]
-            Structures.Environment environment,
-            [OSParameter(Description = "List of cookies to add to the browser when accessing the page")]
-            IEnumerable<Structures.Cookie> cookies,
-            [OSParameter(Description = "PNG paper configuration")]
-            Structures.Paper paper,
-            [OSParameter(Description = "PNG screenshot options")]
-            Structures.ScreenshotOptions screenshotOptions,
-            [OSParameter(DataType = OSDataType.Integer, Description = "Browser render execution timeout in seconds")]
-            int timeoutSeconds,
-            [OSParameter(DataType = OSDataType.Boolean, Description = "Collects execution logs. If False LogsZipFile will be empty.")]
-            bool collectLogs,
-            [OSParameter(DataType = OSDataType.Boolean, Description = "Attach PDF and HTML files to the logs.")]
-            bool attachFilesLogs,
-            [OSParameter(DataType = OSDataType.BinaryData, Description = "PDF generation task logs")]
-            out byte[] logsZipFile);
+    /// <summary>
+    /// Generate PNG file from a webpage. Optionally embeds document metadata into the resulting file.
+    /// </summary>
+    [OSAction(Description = "Generate PNG file from a webpage.",
+        ReturnName = "PNG")]
+    public byte[] ScreenshotPNG(
+        [OSParameter(DataType = OSDataType.Text, Description = "URL of the page to download")]
+        string url,
+        [OSParameter(Description = "Bowser viewport configuration")]
+        Structures.Viewport viewport,
+        [OSParameter(Description = "Environment information")]
+        Structures.Environment environment,
+        [OSParameter(Description = "List of cookies to add to the browser when accessing the page")]
+        IEnumerable<Structures.Cookie> cookies,
+        [OSParameter(Description = "PNG paper configuration")]
+        Structures.Paper paper,
+        [OSParameter(Description = "PNG screenshot options")]
+        Structures.ScreenshotOptions screenshotOptions,
+        [OSParameter(DataType = OSDataType.Integer, Description = "Browser render execution timeout in seconds")]
+        int timeoutSeconds,
+        [OSParameter(DataType = OSDataType.Boolean, Description = "Collects execution logs. If False LogsZipFile will be empty.")]
+        bool collectLogs,
+        [OSParameter(DataType = OSDataType.Boolean, Description = "Attach PDF and HTML files to the logs.")]
+        bool attachFilesLogs,
+        [OSParameter(DataType = OSDataType.BinaryData, Description = "PDF generation task logs")]
+        out byte[] logsZipFile);
 
-    }
 }
diff --git a/src/UltimatePDF_ExternalLogic/LayoutPrintPipeline/LayoutPrint.cs b/src/UltimatePDF_ExternalLogic/LayoutPrintPipeline/LayoutPrint.cs
index 84f0ec2..9f02396 100644
--- a/src/UltimatePDF_ExternalLogic/LayoutPrintPipeline/LayoutPrint.cs
+++ b/src/UltimatePDF_ExternalLogic/LayoutPrintPipeline/LayoutPrint.cs
@@ -1,123 +1,127 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using PdfSharp.Drawing;
 using PdfSharp.Pdf;
 using PdfSharp.Pdf.IO;
 
-namespace OutSystems.UltimatePDF_ExternalLogic.LayoutPrintPipeline {
-    public class LayoutPrint : IDisposable {
+namespace OutSystems.UltimatePDF_ExternalLogic.LayoutPrintPipeline;
+public class LayoutPrint : IDisposable {
 
-        private readonly int layoutNumber;
-        private readonly PrintSection section;
-        private readonly PdfDocument document;
-        private readonly int firstPage;
+    private readonly int layoutNumber;
+    private readonly PrintSection section;
+    private readonly PdfDocument document;
+    private readonly int firstPage;
 
-        public LayoutPrint(int layoutNumber, PrintSection section, byte[] content) {
-            this.layoutNumber = layoutNumber;
-            this.section = section;
-            this.firstPage = section.NextPage;
+    public LayoutPrint(int layoutNumber, PrintSection section, byte[] content) {
+        this.layoutNumber = layoutNumber;
+        this.section = section;
+        this.firstPage = section.NextPage;
 
-            using var stream = new MemoryStream(content);
-            document = PdfReader.Open(stream);
-        }
+        using var stream = new MemoryStream(content);
+        document = PdfReader.Open(stream);
+    }
 
-        public void MergeBackground(byte[] background) {
-            XPdfForm backgroundForm;
-            using var stream = new MemoryStream(background);
-            backgroundForm = XPdfForm.FromStream(stream);
+    public void MergeBackground(byte[] background) {
+        using var activity = Activity.Current?.Source.StartActivity("LayoutPrint.MergeBackground");
+        XPdfForm backgroundForm;
+        using var stream = new MemoryStream(background);
+        backgroundForm = XPdfForm.FromStream(stream);
 
-            foreach (var page in document.Pages) {
-                using var gfx = XGraphics.FromPdfPage(page, XGraphicsPdfPageOptions.Prepend);
-                var pageBox = new XRect(0, 0, page.Width.Point, page.Height.Point);
-                gfx.DrawImage(backgroundForm, pageBox);
-            }
+        foreach (var page in document.Pages) {
+            using var gfx = XGraphics.FromPdfPage(page, XGraphicsPdfPageOptions.Prepend);
+            var pageBox = new XRect(0, 0, page.Width.Point, page.Height.Point);
+            gfx.DrawImage(backgroundForm, pageBox);
         }
+    }
 
-        public void MergeHeader(byte[] header) {
-            using var stream = new MemoryStream(header);
-            XPdfForm headerForm = XPdfForm.FromStream(stream);
+    public void MergeHeader(byte[] header) {
+        using var activity = Activity.Current?.Source.StartActivity("LayoutPrint.MergeHeader");
+        using var stream = new MemoryStream(header);
+        XPdfForm headerForm = XPdfForm.FromStream(stream);
 
-            int skip = document.PageCount > headerForm.PageCount ? document.PageCount - headerForm.PageCount : 0;
-            for (int i = 0; i < document.PageCount && i < headerForm.PageCount; i++) {
-                PdfPage page = document.Pages[skip + i];
-                headerForm.PageIndex = i;
+        int skip = document.PageCount > headerForm.PageCount ? document.PageCount - headerForm.PageCount : 0;
+        for (int i = 0; i < document.PageCount && i < headerForm.PageCount; i++) {
+            PdfPage page = document.Pages[skip + i];
+            headerForm.PageIndex = i;
 
-                using var gfx = XGraphics.FromPdfPage(page);
-                var headerBox = new XRect(0, 0, page.Width.Point, headerForm.Page?.Height.Point ?? XUnit.FromPoint(0).Point);
-                gfx.DrawImage(headerForm, headerBox);
-            }
+            using var gfx = XGraphics.FromPdfPage(page);
+            var headerBox = new XRect(0, 0, page.Width.Point, headerForm.Page?.Height.Point ?? XUnit.FromPoint(0).Point);
+            gfx.DrawImage(headerForm, headerBox);
         }
+    }
 
-        public void MergeFooter(byte[] footer) {
-            using var stream = new MemoryStream(footer);
-            var footerForm = XPdfForm.FromStream(stream);
+    public void MergeFooter(byte[] footer) {
+        using var activity = Activity.Current?.Source.StartActivity("LayoutPrint.MergeFooter");
+        using var stream = new MemoryStream(footer);
+        var footerForm = XPdfForm.FromStream(stream);
 
-            for (int i = 0; i < document.PageCount && i < footerForm.PageCount; i++) {
-                PdfPage page = document.Pages[i];
-                footerForm.PageIndex = i;
+        for (int i = 0; i < document.PageCount && i < footerForm.PageCount; i++) {
+            PdfPage page = document.Pages[i];
+            footerForm.PageIndex = i;
 
-                using var gfx = XGraphics.FromPdfPage(page);
-                XUnit footerFormPageHeight = footerForm.Page?.Height ?? XUnit.FromPoint(0);
-                var headerBox = new XRect(0, page.Height.Point - footerFormPageHeight.Point, page.Width.Point, footerFormPageHeight.Point);
-                gfx.DrawImage(footerForm, headerBox);
-            }
+            using var gfx = XGraphics.FromPdfPage(page);
+            XUnit footerFormPageHeight = footerForm.Page?.Height ?? XUnit.FromPoint(0);
+            var headerBox = new XRect(0, page.Height.Point - footerFormPageHeight.Point, page.Width.Point, footerFormPageHeight.Point);
+            gfx.DrawImage(footerForm, headerBox);
         }
+    }
 
-        public static byte[] Concatenate(IList<LayoutPrint> pdfs) {
-            var first = pdfs[0];
+    public static byte[] Concatenate(IList<LayoutPrint> pdfs) {
+        using var activity = Activity.Current?.Source.StartActivity("LayoutPrint.Concatenate");
+        var first = pdfs[0];
 
-            foreach (var pdf in pdfs.Skip(1)) {
+        foreach (var pdf in pdfs.Skip(1)) {
 
-                using var stream = new MemoryStream();
-                /*
-                 * Cannot import pages from a pdf that was not opened with PdfDocumentOpenMode.Import,
-                 * so we save the PDF and open it back again.
-                 */
-                pdf.document.Save(stream);
-                pdf.Dispose();
-                stream.Position = 0;
+            using var stream = new MemoryStream();
+            /*
+             * Cannot import pages from a pdf that was not opened with PdfDocumentOpenMode.Import,
+             * so we save the PDF and open it back again.
+             */
+            pdf.document.Save(stream);
+            pdf.Dispose();
+            stream.Position = 0;
 
-                using var pdfImport = PdfReader.Open(stream, PdfDocumentOpenMode.Import);
-                foreach (var page in pdfImport.Pages) {
-                    first.document.AddPage(page);
-                }
+            using var pdfImport = PdfReader.Open(stream, PdfDocumentOpenMode.Import);
+            foreach (var page in pdfImport.Pages) {
+                first.document.AddPage(page);
             }
+        }
 
-            using (var stream = new MemoryStream()) {
-                first.document.Save(stream);
-                first.Dispose();
+        using (var stream = new MemoryStream()) {
+            first.document.Save(stream);
+            first.Dispose();
 
-                return stream.ToArray();
-            }
+            return stream.ToArray();
         }
+    }
 
-        public int LayoutNumber {
-            get { return layoutNumber; }
-        }
+    public int LayoutNumber {
+        get { return layoutNumber; }
+    }
 
-        public int FirstPage {
-            get { return firstPage; }
-        }
+    public int FirstPage {
+        get { return firstPage; }
+    }
 
-        public int Pages {
-            get { return document.PageCount; }
-        }
+    public int Pages {
+        get { return document.PageCount; }
+    }
 
-        public int LastPage {
-            get { return section.FirstPage + section.Pages - 1; }
-        }
+    public int LastPage {
+        get { return section.FirstPage + section.Pages - 1; }
+    }
 
-        public void Dispose() {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
+    public void Dispose() {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
 
-        protected virtual void Dispose(bool disposing) {
-            if (disposing) {
-                document.Close();
-            }
+    protected virtual void Dispose(bool disposing) {
+        if (disposing) {
+            document.Close();
         }
     }
 }
diff --git a/src/UltimatePDF_ExternalLogic/LayoutPrintPipeline/Pipeline.cs b/src/UltimatePDF_ExternalLogic/LayoutPrintPipeline/Pipeline.cs
index d01c8d3..2537db8 100644
--- a/src/UltimatePDF_ExternalLogic/LayoutPrintPipeline/Pipeline.cs
+++ b/src/UltimatePDF_ExternalLogic/LayoutPrintPipeline/Pipeline.cs
@@ -1,4 +1,5 @@
-using System.IO;
+using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using PdfSharp.Drawing;
@@ -9,254 +10,251 @@
 using OutSystems.UltimatePDF_ExternalLogic.Management.Troubleshooting;
 using System;
 
-namespace OutSystems.UltimatePDF_ExternalLogic.LayoutPrintPipeline {
-    internal class Pipeline {
-        private LayoutPrint[] layouts = Array.Empty<LayoutPrint>();
+namespace OutSystems.UltimatePDF_ExternalLogic.LayoutPrintPipeline;
+internal class Pipeline {
+    private LayoutPrint[] layouts = Array.Empty<LayoutPrint>();
 
-        public async Task Initialize(IPage page) {
-            layouts = await page.EvaluateFunctionAsync<LayoutPrint[]>("window?.UltimatePDF?.getLayouts || function(){}");
-        }
-
-        public bool HasLayouts { get { return layouts != null && layouts.Length > 0; } }
-
-        public async Task<byte[]> Render(IPage page, Logger logger) {
-            PdfDocument[] documents = new PdfDocument[layouts.Length];
-
-            PdfOptions mainContentOptions = new PdfOptions() {
-                OmitBackground = true,
-                PrintBackground = true,
-                PreferCSSPageSize = true,
-            };
-            PdfOptions otherOptions = new PdfOptions() {
-                OmitBackground = true,
-                PrintBackground = true,
-                PreferCSSPageSize = true,
-            };
-
-            for (var i = 0; i < layouts.Length; i++) {
-                await page.EvaluateFunctionAsync("window.UltimatePDF.selectLayout", i);
-
-                // Render main content and store its document
-                await page.EvaluateFunctionAsync("window.UltimatePDF.prepareForMainContent");
-                byte[] content = await page.PdfDataAsync(mainContentOptions);
-                logger.Attach($"layout-{i}-content.pdf", content);
+    public async Task Initialize(IPage page) {
+        using var activity = Activity.Current?.Source.StartActivity("Pipeline.Initialize");
+        layouts = await page.EvaluateFunctionAsync<LayoutPrint[]>("window?.UltimatePDF?.getLayouts || function(){}");
+    }
 
-                using (MemoryStream stream = new MemoryStream(content)) {
-                    documents[i] = PdfReader.Open(stream);
-                    layouts[i].Pages = documents[i].PageCount;
-                }
+    public bool HasLayouts { get { return layouts != null && layouts.Length > 0; } }
+
+    public async Task<byte[]> Render(IPage page, Logger logger) {
+        using var activity = Activity.Current?.Source.StartActivity("Pipeline.Render");
+        PdfDocument[] documents = new PdfDocument[layouts.Length];
+
+        PdfOptions mainContentOptions = new PdfOptions() {
+            OmitBackground = true,
+            PrintBackground = true,
+            PreferCSSPageSize = true,
+        };
+        PdfOptions otherOptions = new PdfOptions() {
+            OmitBackground = true,
+            PrintBackground = true,
+            PreferCSSPageSize = true,
+        };
+
+        for (var i = 0; i < layouts.Length; i++) {
+            await page.EvaluateFunctionAsync("window.UltimatePDF.selectLayout", i);
+
+            // Render main content and store its document
+            await page.EvaluateFunctionAsync("window.UltimatePDF.prepareForMainContent");
+            byte[] content = await page.PdfDataAsync(mainContentOptions);
+            logger.Attach($"layout-{i}-content.pdf", content);
+
+            using (MemoryStream stream = new MemoryStream(content)) {
+                documents[i] = PdfReader.Open(stream);
+                layouts[i].Pages = documents[i].PageCount;
+            }
 
-                if (layouts[i].HasPageBackground) {
-                    // Render page background and merge into the document
-                    await page.EvaluateFunctionAsync("window.UltimatePDF.prepareForPageBackground");
-                    byte[] background = await page.PdfDataAsync(otherOptions);
-                    logger.Attach($"layout-{i}-background.pdf", background);
+            if (layouts[i].HasPageBackground) {
+                // Render page background and merge into the document
+                await page.EvaluateFunctionAsync("window.UltimatePDF.prepareForPageBackground");
+                byte[] background = await page.PdfDataAsync(otherOptions);
+                logger.Attach($"layout-{i}-background.pdf", background);
 
-                    MergeBackground(documents[i], background);
-                }
+                MergeBackground(documents[i], background);
             }
+        }
 
-            /* Propagate the FirstPageNumber forwards */
-            if (!layouts[0].RestartPageNumber) {
-                layouts[0].FirstPageNumber = 1;
-            }
-            for (var i = 0; i < layouts.Length; i++) {
-                if (i + 1 < layouts.Length) {
-                    if (!layouts[i + 1].RestartPageNumber) {
-                        layouts[i + 1].FirstPageNumber = layouts[i].FirstPageNumber + layouts[i].Pages;
-                    }
+        /* Propagate the FirstPageNumber forwards */
+        if (!layouts[0].RestartPageNumber) {
+            layouts[0].FirstPageNumber = 1;
+        }
+        for (var i = 0; i < layouts.Length; i++) {
+            if (i + 1 < layouts.Length) {
+                if (!layouts[i + 1].RestartPageNumber) {
+                    layouts[i + 1].FirstPageNumber = layouts[i].FirstPageNumber + layouts[i].Pages;
                 }
             }
+        }
 
-            /* Propagate the LastPageNumber backwards */
-            layouts[layouts.Length - 1].LastPageNumber = layouts[layouts.Length - 1].FirstPageNumber + layouts[layouts.Length - 1].Pages - 1;
-            for (var i = layouts.Length - 1; i >= 0; i--) {
-                if (i - 1 >= 0) {
-                    if (!layouts[i].RestartPageNumber) {
-                        layouts[i - 1].LastPageNumber = layouts[i].LastPageNumber;
-                    } else {
-                        layouts[i - 1].LastPageNumber = layouts[i - 1].FirstPageNumber + layouts[i - 1].Pages - 1;
-                    }
+        /* Propagate the LastPageNumber backwards */
+        layouts[layouts.Length - 1].LastPageNumber = layouts[layouts.Length - 1].FirstPageNumber + layouts[layouts.Length - 1].Pages - 1;
+        for (var i = layouts.Length - 1; i >= 0; i--) {
+            if (i - 1 >= 0) {
+                if (!layouts[i].RestartPageNumber) {
+                    layouts[i - 1].LastPageNumber = layouts[i].LastPageNumber;
+                } else {
+                    layouts[i - 1].LastPageNumber = layouts[i - 1].FirstPageNumber + layouts[i - 1].Pages - 1;
                 }
             }
+        }
 
+        for (var i = 0; i < layouts.Length; i++) {
+            if (layouts[i].HasHeader || layouts[i].HasFooter || layouts[i].HasBottomContent) {
+                await page.EvaluateFunctionAsync("window.UltimatePDF.selectLayout", i);
+            }
 
+            if (layouts[i].HasHeader || layouts[i].HasFooter) {
+                logger.Log($"layout-{i} pagination: {layouts[i].Pages} pages, starting at {layouts[i].FirstPageNumber}, last page is {layouts[i].LastPageNumber}");
+                await page.EvaluateFunctionAsync("window.UltimatePDF.updatePagination", layouts[i].Pages, layouts[i].FirstPageNumber, layouts[i].LastPageNumber);
+            }
 
+            if (layouts[i].HasHeader && layouts[i].PagesWithHeader > 0) {
+                // Render headers and merge into the document
+                await page.EvaluateFunctionAsync("window.UltimatePDF.prepareForHeader");
+                byte[] header = await page.PdfDataAsync(otherOptions);
+                logger.Attach($"layout-{i}-header.pdf", header);
 
-            for (var i = 0; i < layouts.Length; i++) {
-                if (layouts[i].HasHeader || layouts[i].HasFooter || layouts[i].HasBottomContent) {
-                    await page.EvaluateFunctionAsync("window.UltimatePDF.selectLayout", i);
-                }
+                MergeHeaders(documents[i], header);
+            }
 
-                if (layouts[i].HasHeader || layouts[i].HasFooter) {
-                    logger.Log($"layout-{i} pagination: {layouts[i].Pages} pages, starting at {layouts[i].FirstPageNumber}, last page is {layouts[i].LastPageNumber}");
-                    await page.EvaluateFunctionAsync("window.UltimatePDF.updatePagination", layouts[i].Pages, layouts[i].FirstPageNumber, layouts[i].LastPageNumber);
-                }
+            if (layouts[i].HasBottomContent) {
+                // Render bottom content at the bottom of the last page
+                await page.EvaluateFunctionAsync("window.UltimatePDF.prepareForBottomContent");
+                byte[] bottomContent = await page.PdfDataAsync(otherOptions);
+                logger.Attach($"layout-{i}-bottom-content.pdf", bottomContent);
 
-                if (layouts[i].HasHeader && layouts[i].PagesWithHeader > 0) {
-                    // Render headers and merge into the document
-                    await page.EvaluateFunctionAsync("window.UltimatePDF.prepareForHeader");
-                    byte[] header = await page.PdfDataAsync(otherOptions);
-                    logger.Attach($"layout-{i}-header.pdf", header);
+                MergeBottomContent(documents[i], bottomContent);
+            }
 
-                    MergeHeaders(documents[i], header);
-                }
+            if (layouts[i].HasFooter && layouts[i].PagesWithFooter > 0) {
+                // Render footers and merge into the document
+                await page.EvaluateFunctionAsync("window.UltimatePDF.prepareForFooter");
+                byte[] footer = await page.PdfDataAsync(otherOptions);
+                logger.Attach($"layout-{i}-footer.pdf", footer);
 
-                if (layouts[i].HasBottomContent) {
-                    // Render bottom content at the bottom of the last page
-                    await page.EvaluateFunctionAsync("window.UltimatePDF.prepareForBottomContent");
-                    byte[] bottomContent = await page.PdfDataAsync(otherOptions);
-                    logger.Attach($"layout-{i}-bottom-content.pdf", bottomContent);
+                MergeFooters(documents[i], footer);
+            }
+        }
 
-                    MergeBottomContent(documents[i], bottomContent);
-                }
+        return Concatenate(documents);
+    }
 
-                if (layouts[i].HasFooter && layouts[i].PagesWithFooter > 0) {
-                    // Render footers and merge into the document
-                    await page.EvaluateFunctionAsync("window.UltimatePDF.prepareForFooter");
-                    byte[] footer = await page.PdfDataAsync(otherOptions);
-                    logger.Attach($"layout-{i}-footer.pdf", footer);
+    private void MergeBackground(PdfDocument document, byte[] background) {
+        using var activity = Activity.Current?.Source.StartActivity("Pipeline.MergeBackground");
+        XPdfForm backgroundForm;
+        using (MemoryStream stream = new MemoryStream(background)) {
+            backgroundForm = XPdfForm.FromStream(stream);
 
-                    MergeFooters(documents[i], footer);
+            foreach (var page in document.Pages) {
+                using (XGraphics gfx = XGraphics.FromPdfPage(page, XGraphicsPdfPageOptions.Prepend)) {
+                    XRect pageBox = new XRect(0, 0, page.Width.Point, page.Height.Point);
+                    gfx.DrawImage(backgroundForm, pageBox);
                 }
             }
-
-            return Concatenate(documents);
         }
+    }
 
+    private void MergeHeaders(PdfDocument document, byte[] header) {
+        using var activity = Activity.Current?.Source.StartActivity("Pipeline.MergeHeaders");
+        using MemoryStream stream = new MemoryStream(header);
+        XPdfForm headerForm = XPdfForm.FromStream(stream);
 
+        int skip = document.PageCount > headerForm.PageCount ? document.PageCount - headerForm.PageCount : 0;
+        for (int i = 0; i < document.PageCount && i < headerForm.PageCount; i++) {
+            PdfPage page = document.Pages[skip + i];
+            headerForm.PageIndex = i;
 
-        private void MergeBackground(PdfDocument document, byte[] background) {
-            XPdfForm backgroundForm;
-            using (MemoryStream stream = new MemoryStream(background)) {
-                backgroundForm = XPdfForm.FromStream(stream);
-
-                foreach (var page in document.Pages) {
-                    using (XGraphics gfx = XGraphics.FromPdfPage(page, XGraphicsPdfPageOptions.Prepend)) {
-                        XRect pageBox = new XRect(0, 0, page.Width.Point, page.Height.Point);
-                        gfx.DrawImage(backgroundForm, pageBox);
-                    }
-                }
+            if (headerForm.Page is not null) {
+                using XGraphics gfx = XGraphics.FromPdfPage(page);
+                XRect headerBox = new XRect(0, 0, page.Width.Point, headerForm.Page.Height.Point);
+                gfx.DrawImage(headerForm, headerBox);
+                CopyHyperlinks(headerForm.Page, page, headerBox.Y);
             }
         }
 
-        private void MergeHeaders(PdfDocument document, byte[] header) {
-            using MemoryStream stream = new MemoryStream(header);
-            XPdfForm headerForm = XPdfForm.FromStream(stream);
+    }
 
-            int skip = document.PageCount > headerForm.PageCount ? document.PageCount - headerForm.PageCount : 0;
-            for (int i = 0; i < document.PageCount && i < headerForm.PageCount; i++) {
-                PdfPage page = document.Pages[skip + i];
-                headerForm.PageIndex = i;
+    private void MergeBottomContent(PdfDocument document, byte[] bottomContent) {
+        using var activity = Activity.Current?.Source.StartActivity("Pipeline.MergeBottomContent");
+        using MemoryStream stream = new MemoryStream(bottomContent);
+        XPdfForm bottomForm = XPdfForm.FromStream(stream);
 
-                if (headerForm.Page is not null) {
-                    using XGraphics gfx = XGraphics.FromPdfPage(page);
-                    XRect headerBox = new XRect(0, 0, page.Width.Point, headerForm.Page.Height.Point);
-                    gfx.DrawImage(headerForm, headerBox);
-                    CopyHyperlinks(headerForm.Page, page, headerBox.Y);
-                }
-            }
+        PdfPage page = document.Pages[document.PageCount - 1];
 
+        if (bottomForm.Page is not null) {
+            using XGraphics gfx = XGraphics.FromPdfPage(page);
+            XRect footerBox = new XRect(0, page.Height.Point - bottomForm.Page.Height.Point, page.Width.Point, bottomForm.Page.Height.Point);
+            gfx.DrawImage(bottomForm, footerBox);
+            CopyHyperlinks(bottomForm.Page, page, footerBox.Y);
         }
+    }
 
-        private void MergeBottomContent(PdfDocument document, byte[] bottomContent) {
-            using MemoryStream stream = new MemoryStream(bottomContent);
-            XPdfForm bottomForm = XPdfForm.FromStream(stream);
+    private void MergeFooters(PdfDocument document, byte[] footer) {
+        using var activity = Activity.Current?.Source.StartActivity("Pipeline.MergeFooters");
+        using MemoryStream stream = new MemoryStream(footer);
+        XPdfForm footerForm = XPdfForm.FromStream(stream);
 
-            PdfPage page = document.Pages[document.PageCount - 1];
+        for (int i = 0; i < document.PageCount && i < footerForm.PageCount; i++) {
+            PdfPage page = document.Pages[i];
+            footerForm.PageIndex = i;
 
-            if (bottomForm.Page is not null) {
+            if (footerForm.Page is not null) {
                 using XGraphics gfx = XGraphics.FromPdfPage(page);
-                XRect footerBox = new XRect(0, page.Height.Point - bottomForm.Page.Height.Point, page.Width.Point, bottomForm.Page.Height.Point);
-                gfx.DrawImage(bottomForm, footerBox);
-                CopyHyperlinks(bottomForm.Page, page, footerBox.Y);
+                XRect footerBox = new XRect(0, page.Height.Point - footerForm.Page.Height.Point, page.Width.Point, footerForm.Page.Height.Point);
+                gfx.DrawImage(footerForm, footerBox);
+                CopyHyperlinks(footerForm.Page, page, footerBox.Y);
             }
         }
+    }
 
-        private void MergeFooters(PdfDocument document, byte[] footer) {
-            using MemoryStream stream = new MemoryStream(footer);
-            XPdfForm footerForm = XPdfForm.FromStream(stream);
-
-            for (int i = 0; i < document.PageCount && i < footerForm.PageCount; i++) {
-                PdfPage page = document.Pages[i];
-                footerForm.PageIndex = i;
-
-                if (footerForm.Page is not null) {
-                    using XGraphics gfx = XGraphics.FromPdfPage(page);
-                    XRect footerBox = new XRect(0, page.Height.Point - footerForm.Page.Height.Point, page.Width.Point, footerForm.Page.Height.Point);
-                    gfx.DrawImage(footerForm, footerBox);
-                    CopyHyperlinks(footerForm.Page, page, footerBox.Y);
+    private void CopyHyperlinks(PdfPage from, PdfPage to, double yOffset) {
+        using var activity = Activity.Current?.Source.StartActivity("Pipeline.CopyHyperlinks");
+        foreach (PdfAnnotation annotation in from.Annotations) {
+            if (annotation.Elements.GetString(PdfAnnotation.Keys.Subtype) == "/Link") {
+                var dest = annotation.Elements.GetDictionary(PdfAnnotation.Keys.A);
+                var rect = annotation.Elements.GetRectangle(PdfAnnotation.Keys.Rect);
+                if (dest != null && rect != null && dest.Elements.Count > 0) {
+                    var uri = dest.Elements.GetString("/URI");
+                    var pageRect = new XRect(rect.X1, to.Height.Point - from.Height.Point + rect.Y1 - yOffset, rect.Width, rect.Height);
+                    to.Annotations.Add(PdfLinkAnnotation.CreateWebLink(new PdfRectangle(pageRect), uri));
                 }
             }
         }
+    }
 
+    private byte[] Concatenate(PdfDocument[] documents) {
+        using var activity = Activity.Current?.Source.StartActivity("Pipeline.Concatenate");
+        var first = documents[0];
 
+        foreach (var pdf in documents.Skip(1)) {
 
-        private void CopyHyperlinks(PdfPage from, PdfPage to, double yOffset) {
-            foreach (PdfAnnotation annotation in from.Annotations) {
-                if (annotation.Elements.GetString(PdfAnnotation.Keys.Subtype) == "/Link") {
-                    var dest = annotation.Elements.GetDictionary(PdfAnnotation.Keys.A);
-                    var rect = annotation.Elements.GetRectangle(PdfAnnotation.Keys.Rect);
-                    if (dest != null && rect != null && dest.Elements.Count > 0) {
-                        var uri = dest.Elements.GetString("/URI");
-                        var pageRect = new XRect(rect.X1, to.Height.Point - from.Height.Point + rect.Y1 - yOffset, rect.Width, rect.Height);
-                        to.Annotations.Add(PdfLinkAnnotation.CreateWebLink(new PdfRectangle(pageRect), uri));
+            using (MemoryStream stream = new MemoryStream()) {
+                /*
+                 * Cannot import pages from a pdf that was not opened with PdfDocumentOpenMode.Import,
+                 * so we save the PDF and open it back again.
+                 */
+                pdf.Save(stream);
+                pdf.Dispose();
+
+                stream.Position = 0;
+
+                using (var pdfImport = PdfReader.Open(stream, PdfDocumentOpenMode.Import)) {
+                    foreach (var page in pdfImport.Pages) {
+                        first.AddPage(page);
                     }
                 }
             }
-        }
-
 
+        }
 
-        private byte[] Concatenate(PdfDocument[] documents) {
-            var first = documents[0];
-
-            foreach (var pdf in documents.Skip(1)) {
-
-                using (MemoryStream stream = new MemoryStream()) {
-                    /*
-                     * Cannot import pages from a pdf that was not opened with PdfDocumentOpenMode.Import,
-                     * so we save the PDF and open it back again.
-                     */
-                    pdf.Save(stream);
-                    pdf.Dispose();
-
-                    stream.Position = 0;
-
-                    using (var pdfImport = PdfReader.Open(stream, PdfDocumentOpenMode.Import)) {
-                        foreach (var page in pdfImport.Pages) {
-                            first.AddPage(page);
-                        }
-                    }
-                }
-
-            }
-
-            using (MemoryStream stream = new MemoryStream()) {
-                first.Save(stream);
-                first.Dispose();
+        using (MemoryStream stream = new MemoryStream()) {
+            first.Save(stream);
+            first.Dispose();
 
-                return stream.ToArray();
-            }
+            return stream.ToArray();
         }
+    }
 
+    internal class LayoutPrint {
+        public bool HasPageBackground { get; set; }
+        public bool HasHeader { get; set; }
+        public bool HideFirstHeader { get; set; }
+        public bool HasBottomContent { get; set; }
+        public bool HasFooter { get; set; }
+        public bool HideLastFooter { get; set; }
 
-        internal class LayoutPrint {
-            public bool HasPageBackground { get; set; }
-            public bool HasHeader { get; set; }
-            public bool HideFirstHeader { get; set; }
-            public bool HasBottomContent { get; set; }
-            public bool HasFooter { get; set; }
-            public bool HideLastFooter { get; set; }
-
-            public bool RestartPageNumber { get; set; }
+        public bool RestartPageNumber { get; set; }
 
-            public int Pages { get; set; }
-            public int FirstPageNumber { get; set; }
-            public int LastPageNumber { get; set; }
+        public int Pages { get; set; }
+        public int FirstPageNumber { get; set; }
+        public int LastPageNumber { get; set; }
 
-            public int PagesWithHeader { get { return Pages - (HideFirstHeader ? 1 : 0); } }
-            public int PagesWithFooter { get { return Pages - (HideLastFooter ? 1 : 0); } }
-        }
+        public int PagesWithHeader { get { return Pages - (HideFirstHeader ? 1 : 0); } }
+        public int PagesWithFooter { get { return Pages - (HideLastFooter ? 1 : 0); } }
     }
 }
diff --git a/src/UltimatePDF_ExternalLogic/LayoutPrintPipeline/PrintSection.cs b/src/UltimatePDF_ExternalLogic/LayoutPrintPipeline/PrintSection.cs
index 340eaa4..13b27c3 100644
--- a/src/UltimatePDF_ExternalLogic/LayoutPrintPipeline/PrintSection.cs
+++ b/src/UltimatePDF_ExternalLogic/LayoutPrintPipeline/PrintSection.cs
@@ -1,28 +1,31 @@
-namespace OutSystems.UltimatePDF_ExternalLogic.LayoutPrintPipeline {
-    public class PrintSection {
+using System.Diagnostics;
 
-        private readonly int firstPage;
-        private int pages;
+namespace OutSystems.UltimatePDF_ExternalLogic.LayoutPrintPipeline;
 
-        public PrintSection(int firstPage) {
-            this.firstPage = firstPage;
-        }
+public class PrintSection {
 
-        public void AddPages(int pages) {
-            this.pages += pages;
-        }
+    private readonly int firstPage;
+    private int pages;
 
-        public int FirstPage {
-            get { return firstPage; }
-        }
+    public PrintSection(int firstPage) {
+        this.firstPage = firstPage;
+    }
+
+    public void AddPages(int pages) {
+        using var activity = Activity.Current?.Source.StartActivity("PrintSection.AddPages");
+        this.pages += pages;
+    }
 
-        public int NextPage {
-            get { return firstPage + pages; }
-        }
+    public int FirstPage {
+        get { return firstPage; }
+    }
 
-        public int Pages {
-            get { return pages; }
-        }
+    public int NextPage {
+        get { return firstPage + pages; }
+    }
 
+    public int Pages {
+        get { return pages; }
     }
+
 }
diff --git a/src/UltimatePDF_ExternalLogic/Management/Troubleshooting/Logger.cs b/src/UltimatePDF_ExternalLogic/Management/Troubleshooting/Logger.cs
index 874dd3f..4456141 100644
--- a/src/UltimatePDF_ExternalLogic/Management/Troubleshooting/Logger.cs
+++ b/src/UltimatePDF_ExternalLogic/Management/Troubleshooting/Logger.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.IO.Compression;
 using System.Text;
@@ -7,233 +8,257 @@
 using Microsoft.Extensions.Logging.Abstractions;
 using UltimatePDF_ExternalLogic.Utils;
 
-namespace OutSystems.UltimatePDF_ExternalLogic.Management.Troubleshooting {
-    public class Logger {
-        private readonly ILogger logger;
-        private readonly ICollection<LogAttachment> attachments;
-        private readonly ICollection<CustomLoggerFactory> loggerFactories;
-        private readonly StringBuilder executionLog;
-        private readonly bool attachFilesLogs;
-
-        private Logger() {
-            logger = NullLogger<Logger>.Instance;
-            attachments = new List<LogAttachment>(6);
-            loggerFactories = new List<CustomLoggerFactory>(1);
-            executionLog = new StringBuilder();
-        }
+namespace OutSystems.UltimatePDF_ExternalLogic.Management.Troubleshooting;
+public class Logger {
+    private readonly ILogger logger;
+    private readonly ICollection<LogAttachment> attachments;
+    private readonly ICollection<CustomLoggerFactory> loggerFactories;
+    private readonly StringBuilder executionLog;
+    private readonly bool attachFilesLogs;
+
+    private Logger() {
+        logger = NullLogger<Logger>.Instance;
+        attachments = new List<LogAttachment>(6);
+        loggerFactories = new List<CustomLoggerFactory>(1);
+        executionLog = new StringBuilder();
+    }
 
-        protected Logger(ILogger logger, bool attachFilesLogs) : this() {
-            this.logger = logger;
-            this.attachFilesLogs = attachFilesLogs;
-        }
+    protected Logger(ILogger logger, bool attachFilesLogs) : this() {
+        this.logger = logger;
+        this.attachFilesLogs = attachFilesLogs;
+    }
 
-        public static Logger GetLogger(ILogger _odcLogger, bool collectLogs, bool attachFilesLogs) {
-            if (collectLogs) {
-                return new Logger(_odcLogger, attachFilesLogs);
-            } else {
-                return new NullLogger();
-            }
+    public static Logger GetLogger(ILogger _odcLogger, bool collectLogs, bool attachFilesLogs) {
+        using var activity = Activity.Current?.Source.StartActivity("Logger.GetLogger");
+        if (collectLogs) {
+            return new Logger(_odcLogger, attachFilesLogs);
+        } else {
+            return new NullLogger();
         }
+    }
 
-        public virtual bool IsEnabled {
-            get { return true; }
-        }
+    public virtual bool IsEnabled {
+        get { return true; }
+    }
 
-        public void Log(string message) {
-            Log(LogLevel.Information, message);
-        }
+    public void Log(string message) {
+        using var activity = Activity.Current?.Source.StartActivity("Logger.Log");
+        Log(LogLevel.Information, message);
+    }
 
-        public virtual void Error(Exception? e, string? message, params object?[] args) {
-            AppendToExecutionLog(LogLevel.Error, message, e);
-            logger.LogError(e, message, args);
-        }
+    public virtual void Error(Exception? e, string? message, params object?[] args) {
+        using var activity = Activity.Current?.Source.StartActivity("Logger.Error");
+        AppendToExecutionLog(LogLevel.Error, message, e);
+        logger.LogError(e, message, args);
+    }
 
-        public virtual void Error(string message) {
-            AppendToExecutionLog(LogLevel.Error, message);
-            logger.LogError(message);
-        }
+    public virtual void Error(string message) {
+        using var activity = Activity.Current?.Source.StartActivity("Logger.Error");
+        AppendToExecutionLog(LogLevel.Error, message);
+        logger.LogError(message);
+    }
 
-        public virtual void Warning(string message) {
-            AppendToExecutionLog(LogLevel.Warning, message);
-            logger.LogWarning(message);
-        }
+    public virtual void Warning(string message) {
+        using var activity = Activity.Current?.Source.StartActivity("Logger.Warning");
+        AppendToExecutionLog(LogLevel.Warning, message);
+        logger.LogWarning(message);
+    }
 
-        public virtual void Warning(string? message, params object?[] args) {
-            AppendToExecutionLog(LogLevel.Warning, message);
-            logger.LogWarning(message, args);
-        }
+    public virtual void Warning(string? message, params object?[] args) {
+        using var activity = Activity.Current?.Source.StartActivity("Logger.Warning");
+        AppendToExecutionLog(LogLevel.Warning, message);
+        logger.LogWarning(message, args);
+    }
 
-        public virtual void Log(LogLevel level, string? message, params object?[] args) {
-            AppendToExecutionLog(level, message);
-            logger.Log(level, message, args);
-        }
+    public virtual void Log(LogLevel level, string? message, params object?[] args) {
+        using var activity = Activity.Current?.Source.StartActivity("Logger.Log");
+        AppendToExecutionLog(level, message);
+        logger.Log(level, message, args);
+    }
 
-        private void AppendToExecutionLog(LogLevel level, string? message, Exception? exception = null) {
-            lock (executionLog) {
-                executionLog.AppendLine($"[{DateTime.UtcNow:o}] [{level}] - {message}");
-                if (exception != null) {
-                    executionLog.AppendLine(exception.ToString());
-                }
+    private void AppendToExecutionLog(LogLevel level, string? message, Exception? exception = null) {
+        using var activity = Activity.Current?.Source.StartActivity("Logger.AppendToExecutionLog");
+        lock (executionLog) {
+            executionLog.AppendLine($"[{DateTime.UtcNow:o}] [{level}] - {message}");
+            if (exception != null) {
+                executionLog.AppendLine(exception.ToString());
             }
         }
+    }
 
-        public void Log(string message, bool condition) {
-            if (condition) {
-                Log(message);
-            }
+    public void Log(string message, bool condition) {
+        using var activity = Activity.Current?.Source.StartActivity("Logger.Log");
+        if (condition) {
+            Log(message);
         }
+    }
 
-        public virtual ILoggerFactory GetLoggerFactory(string fileName) {
-            var loggerFactory = new CustomLoggerFactory(fileName);
-            loggerFactories.Add(loggerFactory);
-            return loggerFactory;
-        }
+    public virtual ILoggerFactory GetLoggerFactory(string fileName) {
+        using var activity = Activity.Current?.Source.StartActivity("Logger.GetLoggerFactory");
+        var loggerFactory = new CustomLoggerFactory(fileName);
+        loggerFactories.Add(loggerFactory);
+        return loggerFactory;
+    }
 
-        public virtual void Attach(string filename, byte[] contents) {
-            if (this.attachFilesLogs) {
-                Log($"Attached {filename}");
-                attachments.Add(new LogAttachment(filename, contents));
-            }
+    public virtual void Attach(string filename, byte[] contents) {
+        using var activity = Activity.Current?.Source.StartActivity("Logger.Attach");
+        if (this.attachFilesLogs) {
+            Log($"Attached {filename}");
+            attachments.Add(new LogAttachment(filename, contents));
         }
+    }
+
+    public virtual void Attach(string filename, string content) {
+        using var activity = Activity.Current?.Source.StartActivity("Logger.Attach");
+        Attach(filename, Encoding.UTF8.GetBytes(content));
+    }
 
-        public virtual void Attach(string filename, string content) {
-            Attach(filename, Encoding.UTF8.GetBytes(content));
+    public virtual byte[] GetZipFile() {
+        using var activity = Activity.Current?.Source.StartActivity("Logger.GetZipFile");
+        using var stream = new MemoryStream();
+        
+        using (var zip = new ZipArchive(stream, ZipArchiveMode.Create, true))
+        {
+            AddExecutionLogToZip(zip);
+            AddAttachmentsToZip(zip);
+            AddCustomLoggersToZip(zip);
         }
 
-        public virtual byte[] GetZipFile() {
-            using var stream = new MemoryStream();
-            
-            using (var zip = new ZipArchive(stream, ZipArchiveMode.Create, true))
-            {
-                AddExecutionLogToZip(zip);
-                AddAttachmentsToZip(zip);
-                AddCustomLoggersToZip(zip);
-            }
+        return stream.ToArray();
+    }
 
-            return stream.ToArray();
+    private void AddExecutionLogToZip(ZipArchive zip) {
+        using var activity = Activity.Current?.Source.StartActivity("Logger.AddExecutionLogToZip");
+        if (executionLog.Length == 0) {
+            return;
         }
 
-        private void AddExecutionLogToZip(ZipArchive zip) {
-            if (executionLog.Length == 0) {
-                return;
-            }
+        var entry = zip.CreateEntry("execution.txt");
+        using var stream = entry.Open();
+        using var writer = new StreamWriter(stream, Encoding.UTF8);
+        writer.Write(executionLog.ToString());
+    }
 
-            var entry = zip.CreateEntry("execution.txt");
-            using var stream = entry.Open();
-            using var writer = new StreamWriter(stream, Encoding.UTF8);
-            writer.Write(executionLog.ToString());
+    private void AddAttachmentsToZip(ZipArchive zip) {
+        using var activity = Activity.Current?.Source.StartActivity("Logger.AddAttachmentsToZip");
+        foreach (var attachment in attachments) {
+            var attachmentEntry = zip.CreateEntry(attachment.filename);
+            using var stream = attachmentEntry.Open();
+            stream.Write(attachment.contents, 0, attachment.contents.Length);
         }
+    }
 
-        private void AddAttachmentsToZip(ZipArchive zip) {
-            foreach (var attachment in attachments) {
-                var attachmentEntry = zip.CreateEntry(attachment.filename);
-                using var stream = attachmentEntry.Open();
-                stream.Write(attachment.contents, 0, attachment.contents.Length);
-            }
+    private void AddCustomLoggersToZip(ZipArchive zip) {
+        using var activity = Activity.Current?.Source.StartActivity("Logger.AddCustomLoggersToZip");
+        foreach (var logger in loggerFactories) {
+            var attachmentEntry = zip.CreateEntry(logger.filename);
+            using var stream = attachmentEntry.Open();
+            using var writer = new StreamWriter(stream, Encoding.UTF8);
+            writer.Write(logger.ToString());
         }
+    }
 
-        private void AddCustomLoggersToZip(ZipArchive zip) {
-            foreach (var logger in loggerFactories) {
-                var attachmentEntry = zip.CreateEntry(logger.filename);
-                using var stream = attachmentEntry.Open();
-                using var writer = new StreamWriter(stream, Encoding.UTF8);
-                writer.Write(logger.ToString());
-            }
+    private class NullLogger : Logger {
+        public override bool IsEnabled {
+            get { return false; }
         }
 
-        private class NullLogger : Logger {
-
-            public override bool IsEnabled {
-                get { return false; }
-            }
-
-            public override void Log(LogLevel level, string? message, params object?[] args) {
-            }
+        public override void Log(LogLevel level, string? message, params object?[] args) {
+            using var activity = Activity.Current?.Source.StartActivity("NullLogger.Log");
+        }
 
-            public override void Warning(string message) {
-            }
+        public override void Warning(string message) {
+            using var activity = Activity.Current?.Source.StartActivity("NullLogger.Warning");
+        }
 
-            public override void Warning(string? message, params object?[] args) {
-            }
+        public override void Warning(string? message, params object?[] args) {
+            using var activity = Activity.Current?.Source.StartActivity("NullLogger.Warning");
+        }
 
-            public override void Attach(string filename, byte[] contents) {
-            }
+        public override void Attach(string filename, byte[] contents) {
+            using var activity = Activity.Current?.Source.StartActivity("NullLogger.Attach");
+        }
 
-            public override ILoggerFactory GetLoggerFactory(string filename) {
-                return new NullLoggerFactory();
-            }
+        public override ILoggerFactory GetLoggerFactory(string filename) {
+            using var activity = Activity.Current?.Source.StartActivity("NullLogger.GetLoggerFactory");
+            return new NullLoggerFactory();
+        }
 
-            public override byte[] GetZipFile() {
-                return Array.Empty<byte>();
-            }
+        public override byte[] GetZipFile() {
+            using var activity = Activity.Current?.Source.StartActivity("NullLogger.GetZipFile");
+            return Array.Empty<byte>();
         }
+    }
 
-        private class LogAttachment {
-            public readonly string filename;
-            public readonly byte[] contents;
+    private class LogAttachment {
+        public readonly string filename;
+        public readonly byte[] contents;
 
-            public LogAttachment(string filename, byte[] contents) {
-                this.filename = filename;
-                this.contents = contents;
-            }
+        public LogAttachment(string filename, byte[] contents) {
+            this.filename = filename;
+            this.contents = contents;
         }
+    }
 
-        private class CustomLoggerFactory : ILoggerFactory {
+    private class CustomLoggerFactory : ILoggerFactory {
 
-            public readonly string filename;
-            private readonly StringBuilder log = new();
+        public readonly string filename;
+        private readonly StringBuilder log = new();
 
-            public CustomLoggerFactory(string filename) {
-                this.filename = filename;
-            }
+        public CustomLoggerFactory(string filename) {
+            this.filename = filename;
+        }
 
-            public void AddProvider(ILoggerProvider provider) {
-            }
+        public void AddProvider(ILoggerProvider provider) {
+            using var activity = Activity.Current?.Source.StartActivity("CustomLoggerFactory.AddProvider");
+        }
 
-            public ILogger CreateLogger(string categoryName) {
-                return new CustomLogger(log, categoryName);
-            }
+        public ILogger CreateLogger(string categoryName) {
+            using var activity = Activity.Current?.Source.StartActivity("CustomLoggerFactory.CreateLogger");
+            return new CustomLogger(log, categoryName);
+        }
 
-            public override string ToString() {
-                lock (log) {
-                    return log.ToString();
-                }
+        public override string ToString() {
+            using var activity = Activity.Current?.Source.StartActivity("CustomLoggerFactory.ToString");
+            lock (log) {
+                return log.ToString();
             }
+        }
 
-            public void Dispose() {
-            }
+        public void Dispose() {
         }
+    }
 
-        private class CustomLogger : ILogger {
+    private class CustomLogger : ILogger {
 
-            private readonly StringBuilder log;
-            private readonly string categoryName;
+        private readonly StringBuilder log;
+        private readonly string categoryName;
 
-            public CustomLogger(StringBuilder log, string categoryName) {
-                this.log = log;
-                this.categoryName = categoryName;
-            }
+        public CustomLogger(StringBuilder log, string categoryName) {
+            this.log = log;
+            this.categoryName = categoryName;
+        }
 
-            public IDisposable? BeginScope<TState>(TState state) where TState : notnull {
-                return new CustomLogger.Scope();
-            }
+        public IDisposable? BeginScope<TState>(TState state) where TState : notnull {
+            using var activity = Activity.Current?.Source.StartActivity("CustomLogger.BeginScope");
+            return new CustomLogger.Scope();
+        }
 
-            public bool IsEnabled(LogLevel logLevel) {
-                return true;
-            }
+        public bool IsEnabled(LogLevel logLevel) {
+            using var activity = Activity.Current?.Source.StartActivity("CustomLogger.IsEnabled");
+            return true;
+        }
 
-            public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter) {
-                lock (log) {
-                    log.AppendLine($"[{DateTime.UtcNow.ToString("o")}] [{logLevel}] - {categoryName} - {formatter(state, exception)}");
-                }
+        public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter) {
+            using var activity = Activity.Current?.Source.StartActivity("CustomLogger.Log");
+            lock (log) {
+                log.AppendLine($"[{DateTime.UtcNow.ToString("o")}] [{logLevel}] - {categoryName} - {formatter(state, exception)}");
             }
+        }
 
-            private class Scope : IDisposable {
-                public void Dispose() {
-                }
+        private class Scope : IDisposable {
+            public void Dispose() {
             }
-
         }
-
     }
 }
diff --git a/src/UltimatePDF_ExternalLogic/Structures/Cookie.cs b/src/UltimatePDF_ExternalLogic/Structures/Cookie.cs
index ba02d03..c632946 100644
--- a/src/UltimatePDF_ExternalLogic/Structures/Cookie.cs
+++ b/src/UltimatePDF_ExternalLogic/Structures/Cookie.cs
@@ -1,28 +1,27 @@
 using OutSystems.ExternalLibraries.SDK;
 
-namespace OutSystems.UltimatePDF_ExternalLogic.Structures {
+namespace OutSystems.UltimatePDF_ExternalLogic.Structures;
 
+/// <summary>
+/// 
+/// </summary>
+[OSStructure(Description = "Browser cookie. To be set on the browser when rendering the page")]
+public struct Cookie {
     /// <summary>
     /// 
     /// </summary>
-    [OSStructure(Description = "Browser cookie. To be set on the browser when rendering the page")]
-    public struct Cookie {
-        /// <summary>
-        /// 
-        /// </summary>
-        [OSStructureField(Description = "Cookie name")]
-        public string Name;
+    [OSStructureField(Description = "Cookie name")]
+    public string Name;
 
-        /// <summary>
-        /// 
-        /// </summary>
-        [OSStructureField(Description = "Cookie value")]
-        public string Value;
+    /// <summary>
+    /// 
+    /// </summary>
+    [OSStructureField(Description = "Cookie value")]
+    public string Value;
 
-        /// <summary>
-        /// 
-        /// </summary>
-        [OSStructureField(Description = "Set HTTP only cookie attribute")]
-        public bool HttpOnly;
-    }
+    /// <summary>
+    /// 
+    /// </summary>
+    [OSStructureField(Description = "Set HTTP only cookie attribute")]
+    public bool HttpOnly;
 }
diff --git a/src/UltimatePDF_ExternalLogic/Structures/DocumentProperties.cs b/src/UltimatePDF_ExternalLogic/Structures/DocumentProperties.cs
index 05fc4f0..3034939 100644
--- a/src/UltimatePDF_ExternalLogic/Structures/DocumentProperties.cs
+++ b/src/UltimatePDF_ExternalLogic/Structures/DocumentProperties.cs
@@ -1,93 +1,94 @@
+using System.Diagnostics;
 using OutSystems.ExternalLibraries.SDK;
 
-namespace OutSystems.UltimatePDF_ExternalLogic.Structures {
+namespace OutSystems.UltimatePDF_ExternalLogic.Structures;
 
-    [OSStructure(Description = "Document metadata properties applied to generated PDFs and PNG "
-                             + "screenshots. All fields are optional; when every field is empty "
-                             + "or whitespace, no metadata is embedded.")]
-    public struct DocumentProperties {
+[OSStructure(Description = "Document metadata properties applied to generated PDFs and PNG "
+                         + "screenshots. All fields are optional; when every field is empty "
+                         + "or whitespace, no metadata is embedded.")]
+public struct DocumentProperties {
 
-        /// <summary>
-        /// Document title
-        /// </summary>
-        [OSStructureField(DataType = OSDataType.Text, Description = "The title of the document")]
-        public string Title;
+    /// <summary>
+    /// Document title
+    /// </summary>
+    [OSStructureField(DataType = OSDataType.Text, Description = "The title of the document")]
+    public string Title;
 
-        /// <summary>
-        /// Document author
-        /// </summary>
-        [OSStructureField(DataType = OSDataType.Text, Description = "The author of the document")]
-        public string Author;
+    /// <summary>
+    /// Document author
+    /// </summary>
+    [OSStructureField(DataType = OSDataType.Text, Description = "The author of the document")]
+    public string Author;
 
-        /// <summary>
-        /// Document subject
-        /// </summary>
-        [OSStructureField(DataType = OSDataType.Text, Description = "The subject of the document")]
-        public string Subject;
+    /// <summary>
+    /// Document subject
+    /// </summary>
+    [OSStructureField(DataType = OSDataType.Text, Description = "The subject of the document")]
+    public string Subject;
 
-        /// <summary>
-        /// Document keywords
-        /// </summary>
-        [OSStructureField(DataType = OSDataType.Text, Description = "Keywords for the document (comma-separated)")]
-        public string Keywords;
+    /// <summary>
+    /// Document keywords
+    /// </summary>
+    [OSStructureField(DataType = OSDataType.Text, Description = "Keywords for the document (comma-separated)")]
+    public string Keywords;
 
-        /// <summary>
-        /// Document creator application
-        /// </summary>
-        [OSStructureField(DataType = OSDataType.Text, Description = "The name of the application that created the original document")]
-        public string Creator;
+    /// <summary>
+    /// Document creator application
+    /// </summary>
+    [OSStructureField(DataType = OSDataType.Text, Description = "The name of the application that created the original document")]
+    public string Creator;
 
-        /// <summary>
-        /// Company name
-        /// </summary>
-        [OSStructureField(DataType = OSDataType.Text, Description = "The company that created the document")]
-        public string Company;
+    /// <summary>
+    /// Company name
+    /// </summary>
+    [OSStructureField(DataType = OSDataType.Text, Description = "The company that created the document")]
+    public string Company;
 
-        /// <summary>
-        /// Producing application
-        /// </summary>
-        [OSStructureField(DataType = OSDataType.Text,
-            Description = "Application producing the file. Embedded as the '/Producer' value in the PDF Info "
-                        + "dictionary (PdfSharp prepends its own producer string when saving) and written as "
-                        + "the PNG 'Software' text chunk.")]
-        public string Producer;
+    /// <summary>
+    /// Producing application
+    /// </summary>
+    [OSStructureField(DataType = OSDataType.Text,
+        Description = "Application producing the file. Embedded as the '/Producer' value in the PDF Info "
+                    + "dictionary (PdfSharp prepends its own producer string when saving) and written as "
+                    + "the PNG 'Software' text chunk.")]
+    public string Producer;
 
-        /// <summary>
-        /// Copyright statement
-        /// </summary>
-        [OSStructureField(DataType = OSDataType.Text,
-            Description = "Copyright or rights statement.")]
-        public string Copyright;
+    /// <summary>
+    /// Copyright statement
+    /// </summary>
+    [OSStructureField(DataType = OSDataType.Text,
+        Description = "Copyright or rights statement.")]
+    public string Copyright;
 
-        /// <summary>
-        /// Document language (BCP-47)
-        /// </summary>
-        [OSStructureField(DataType = OSDataType.Text,
-            Description = "Document language as a BCP-47 tag (e.g. en-US, pt-PT). Passed through unchanged.")]
-        public string Language;
+    /// <summary>
+    /// Document language (BCP-47)
+    /// </summary>
+    [OSStructureField(DataType = OSDataType.Text,
+        Description = "Document language as a BCP-47 tag (e.g. en-US, pt-PT). Passed through unchanged.")]
+    public string Language;
 
-        /// <summary>
-        /// Originating system or data source
-        /// </summary>
-        [OSStructureField(DataType = OSDataType.Text,
-            Description = "Originating system or data source description.")]
-        public string Source;
+    /// <summary>
+    /// Originating system or data source
+    /// </summary>
+    [OSStructureField(DataType = OSDataType.Text,
+        Description = "Originating system or data source description.")]
+    public string Source;
 
-        /// <summary>
-        /// Returns true when every metadata field is null, empty, or whitespace.
-        /// Used by the PDF and PNG metadata utilities to short-circuit embedding.
-        /// </summary>
-        public bool IsEmpty() {
-            return string.IsNullOrWhiteSpace(Title)
-                && string.IsNullOrWhiteSpace(Author)
-                && string.IsNullOrWhiteSpace(Subject)
-                && string.IsNullOrWhiteSpace(Keywords)
-                && string.IsNullOrWhiteSpace(Creator)
-                && string.IsNullOrWhiteSpace(Company)
-                && string.IsNullOrWhiteSpace(Producer)
-                && string.IsNullOrWhiteSpace(Copyright)
-                && string.IsNullOrWhiteSpace(Language)
-                && string.IsNullOrWhiteSpace(Source);
-        }
+    /// <summary>
+    /// Returns true when every metadata field is null, empty, or whitespace.
+    /// Used by the PDF and PNG metadata utilities to short-circuit embedding.
+    /// </summary>
+    public bool IsEmpty() {
+        using var activity = Activity.Current?.Source.StartActivity("DocumentProperties.IsEmpty");
+        return string.IsNullOrWhiteSpace(Title)
+            && string.IsNullOrWhiteSpace(Author)
+            && string.IsNullOrWhiteSpace(Subject)
+            && string.IsNullOrWhiteSpace(Keywords)
+            && string.IsNullOrWhiteSpace(Creator)
+            && string.IsNullOrWhiteSpace(Company)
+            && string.IsNullOrWhiteSpace(Producer)
+            && string.IsNullOrWhiteSpace(Copyright)
+            && string.IsNullOrWhiteSpace(Language)
+            && string.IsNullOrWhiteSpace(Source);
     }
 }
diff --git a/src/UltimatePDF_ExternalLogic/Structures/Environment.cs b/src/UltimatePDF_ExternalLogic/Structures/Environment.cs
index 91d4ad0..e9a4920 100644
--- a/src/UltimatePDF_ExternalLogic/Structures/Environment.cs
+++ b/src/UltimatePDF_ExternalLogic/Structures/Environment.cs
@@ -1,28 +1,27 @@
 using OutSystems.ExternalLibraries.SDK;
 
-namespace OutSystems.UltimatePDF_ExternalLogic.Structures {
+namespace OutSystems.UltimatePDF_ExternalLogic.Structures;
 
+/// <summary>
+/// Environment information
+/// </summary>
+[OSStructure(Description = "Environment information")]
+public struct Environment {
     /// <summary>
-    /// Environment information
+    /// Environment Base URL
     /// </summary>
-    [OSStructure(Description = "Environment information")]
-    public struct Environment {
-        /// <summary>
-        /// Environment Base URL
-        /// </summary>
-        [OSStructureField(Description = "Environment Base URL")]
-        public string BaseURL;
+    [OSStructureField(Description = "Environment Base URL")]
+    public string BaseURL;
 
-        /// <summary>
-        /// Browser configured locale
-        /// </summary>
-        [OSStructureField(Description = "Browser configured locale")]
-        public string Locale;
+    /// <summary>
+    /// Browser configured locale
+    /// </summary>
+    [OSStructureField(Description = "Browser configured locale")]
+    public string Locale;
 
-        /// <summary>
-        /// Browser configured timezone
-        /// </summary>
-        [OSStructureField(Description = "Browser configured timezone")]
-        public string Timezone;
-    }
+    /// <summary>
+    /// Browser configured timezone
+    /// </summary>
+    [OSStructureField(Description = "Browser configured timezone")]
+    public string Timezone;
 }
diff --git a/src/UltimatePDF_ExternalLogic/Structures/Paper.cs b/src/UltimatePDF_ExternalLogic/Structures/Paper.cs
index 9d72abb..c5f46ed 100644
--- a/src/UltimatePDF_ExternalLogic/Structures/Paper.cs
+++ b/src/UltimatePDF_ExternalLogic/Structures/Paper.cs
@@ -1,56 +1,55 @@
 using OutSystems.ExternalLibraries.SDK;
 
-namespace OutSystems.UltimatePDF_ExternalLogic.Structures {
-
-    [OSStructure(Description = "Render page properties definition of the print to PDF in the browser.")]
-    public struct Paper {
-
-        /// <summary>
-        /// Print on custom paper
-        /// </summary>
-        [OSStructureField(Description = "Print on custom paper")]
-        public bool UseCustomPaper;
-
-        /// <summary>
-        /// Custom paper width
-        /// </summary>
-        [OSStructureField(Description = "Custom paper width")]
-        public decimal Width;
-
-        /// <summary>
-        /// Custom paper height
-        /// </summary>
-        [OSStructureField(Description = "Custom paper height")]
-        public decimal Height;
-
-        /// <summary>
-        /// Print with a custom margin
-        /// </summary>
-        [OSStructureField(Description = "Print with a custom margin")]
-        public bool UseCustomMargins;
-
-        /// <summary>
-        /// Custom margin top
-        /// </summary>
-        [OSStructureField(Description = "Custom margin top")]
-        public decimal MarginTop;
-
-        /// <summary>
-        /// Custom margin right
-        /// </summary>
-        [OSStructureField(Description = "Custom margin right")]
-        public decimal MarginRight;
-
-        /// <summary>
-        /// Custom margin bottom
-        /// </summary>
-        [OSStructureField(Description = "Custom margin bottom")]
-        public decimal MarginBottom;
-
-        /// <summary>
-        /// Custom margin left
-        /// </summary>
-        [OSStructureField(Description = "Custom margin left")]
-        public decimal MarginLeft;
-    }
+namespace OutSystems.UltimatePDF_ExternalLogic.Structures;
+
+[OSStructure(Description = "Render page properties definition of the print to PDF in the browser.")]
+public struct Paper {
+
+    /// <summary>
+    /// Print on custom paper
+    /// </summary>
+    [OSStructureField(Description = "Print on custom paper")]
+    public bool UseCustomPaper;
+
+    /// <summary>
+    /// Custom paper width
+    /// </summary>
+    [OSStructureField(Description = "Custom paper width")]
+    public decimal Width;
+
+    /// <summary>
+    /// Custom paper height
+    /// </summary>
+    [OSStructureField(Description = "Custom paper height")]
+    public decimal Height;
+
+    /// <summary>
+    /// Print with a custom margin
+    /// </summary>
+    [OSStructureField(Description = "Print with a custom margin")]
+    public bool UseCustomMargins;
+
+    /// <summary>
+    /// Custom margin top
+    /// </summary>
+    [OSStructureField(Description = "Custom margin top")]
+    public decimal MarginTop;
+
+    /// <summary>
+    /// Custom margin right
+    /// </summary>
+    [OSStructureField(Description = "Custom margin right")]
+    public decimal MarginRight;
+
+    /// <summary>
+    /// Custom margin bottom
+    /// </summary>
+    [OSStructureField(Description = "Custom margin bottom")]
+    public decimal MarginBottom;
+
+    /// <summary>
+    /// Custom margin left
+    /// </summary>
+    [OSStructureField(Description = "Custom margin left")]
+    public decimal MarginLeft;
 }
diff --git a/src/UltimatePDF_ExternalLogic/Structures/RestCaller.cs b/src/UltimatePDF_ExternalLogic/Structures/RestCaller.cs
index 2566010..1d32007 100644
--- a/src/UltimatePDF_ExternalLogic/Structures/RestCaller.cs
+++ b/src/UltimatePDF_ExternalLogic/Structures/RestCaller.cs
@@ -1,47 +1,46 @@
 using OutSystems.ExternalLibraries.SDK;
 
-namespace OutSystems.UltimatePDF_ExternalLogic.Structures {
+namespace OutSystems.UltimatePDF_ExternalLogic.Structures;
+
+/// <summary>
+/// Rest PDF Store information. Required for the external logic to call the API.
+/// </summary>
+[OSStructure(Description = "Rest PDF Store information. Required for the external logic to call the API.")]
+public struct RestCaller {
 
     /// <summary>
-    /// Rest PDF Store information. Required for the external logic to call the API.
+    /// Rest call authentication token
     /// </summary>
-    [OSStructure(Description = "Rest PDF Store information. Required for the external logic to call the API.")]
-    public struct RestCaller {
-
-        /// <summary>
-        /// Rest call authentication token
-        /// </summary>
-        [OSStructureField(Description = "Rest call authentication token")]
-        public string Token;
-        
-        /// <summary>
-        /// Base URL
-        /// </summary>
-        [OSStructureField(Description = "Base URL")]
-        public string BaseUrl;
+    [OSStructureField(Description = "Rest call authentication token")]
+    public string Token;
+    
+    /// <summary>
+    /// Base URL
+    /// </summary>
+    [OSStructureField(Description = "Base URL")]
+    public string BaseUrl;
 
-        /// <summary>
-        /// Rest API definition module name
-        /// </summary>
-        [OSStructureField(Description = "Rest API definition module name")]
-        public string Module;
+    /// <summary>
+    /// Rest API definition module name
+    /// </summary>
+    [OSStructureField(Description = "Rest API definition module name")]
+    public string Module;
 
-        /// <summary>
-        /// Store PDF action REST Path
-        /// </summary>
-        [OSStructureField(Description = "Store PDF action REST Path")]
-        public string StorePath;
+    /// <summary>
+    /// Store PDF action REST Path
+    /// </summary>
+    [OSStructureField(Description = "Store PDF action REST Path")]
+    public string StorePath;
 
-        /// <summary>
-        /// Log zip action REST Path
-        /// </summary>
-        [OSStructureField(Description = "Log zip action REST Path")]
-        public string LogPath;
+    /// <summary>
+    /// Log zip action REST Path
+    /// </summary>
+    [OSStructureField(Description = "Log zip action REST Path")]
+    public string LogPath;
 
-        /// <summary>
-        /// REST client call timeout in seconds
-        /// </summary>
-        [OSStructureField(Description = "REST client call timeout in seconds")]
-        public int timeoutSeconds;
-    }
+    /// <summary>
+    /// REST client call timeout in seconds
+    /// </summary>
+    [OSStructureField(Description = "REST client call timeout in seconds")]
+    public int timeoutSeconds;
 }
diff --git a/src/UltimatePDF_ExternalLogic/Structures/S3Endpoints.cs b/src/UltimatePDF_ExternalLogic/Structures/S3Endpoints.cs
index a15a03c..93cc46e 100644
--- a/src/UltimatePDF_ExternalLogic/Structures/S3Endpoints.cs
+++ b/src/UltimatePDF_ExternalLogic/Structures/S3Endpoints.cs
@@ -1,22 +1,21 @@
 using OutSystems.ExternalLibraries.SDK;
 
-namespace OutSystems.UltimatePDF_ExternalLogic.Structures {
+namespace OutSystems.UltimatePDF_ExternalLogic.Structures;
 
+/// <summary>
+/// Rest PDF Store information. Required for the external logic to call the API.
+/// </summary>
+[OSStructure(Description = "S3 PreSigned URLs for Ultimate PDf to use to store the resulting binaries.")]
+public struct S3Endpoints {
     /// <summary>
-    /// Rest PDF Store information. Required for the external logic to call the API.
+    /// PreSigned URL to store the PDF
     /// </summary>
-    [OSStructure(Description = "S3 PreSigned URLs for Ultimate PDf to use to store the resulting binaries.")]
-    public struct S3Endpoints {
-        /// <summary>
-        /// PreSigned URL to store the PDF
-        /// </summary>
-        [OSStructureField(Description = "PreSigned URL to store the PDF.")]
-        public string PdfPreSignedUrl;
+    [OSStructureField(Description = "PreSigned URL to store the PDF.")]
+    public string PdfPreSignedUrl;
 
-        /// <summary>
-        /// PreSigned URL to store the Logs
-        /// </summary>
-        [OSStructureField(Description = "PreSigned URL to store the Logs.")]
-        public string LogsPreSignedUrl;
-    }
+    /// <summary>
+    /// PreSigned URL to store the Logs
+    /// </summary>
+    [OSStructureField(Description = "PreSigned URL to store the Logs.")]
+    public string LogsPreSignedUrl;
 }
diff --git a/src/UltimatePDF_ExternalLogic/Structures/ScreenshotOptions.cs b/src/UltimatePDF_ExternalLogic/Structures/ScreenshotOptions.cs
index ae3456d..4936db3 100644
--- a/src/UltimatePDF_ExternalLogic/Structures/ScreenshotOptions.cs
+++ b/src/UltimatePDF_ExternalLogic/Structures/ScreenshotOptions.cs
@@ -1,17 +1,16 @@
 using OutSystems.ExternalLibraries.SDK;
 
-namespace OutSystems.UltimatePDF_ExternalLogic.Structures {
+namespace OutSystems.UltimatePDF_ExternalLogic.Structures;
 
-    [OSStructure(Description = "Screenshot options")]
-    public struct ScreenshotOptions {
+[OSStructure(Description = "Screenshot options")]
+public struct ScreenshotOptions {
 
-        [OSStructureField(Description = "When true, takes a screenshot of the full scrollable page. Defaults to false.")]
-        public bool FullPage;
+    [OSStructureField(Description = "When true, takes a screenshot of the full scrollable page. Defaults to false.")]
+    public bool FullPage;
 
-        [OSStructureField(Description = "When true, renders the page background as transparent.")]
-        public bool TransparentBackground;
+    [OSStructureField(Description = "When true, renders the page background as transparent.")]
+    public bool TransparentBackground;
 
-        [OSStructureField(Description = "Document metadata applied to the generated PNG screenshot.")]
-        public DocumentProperties? DocumentProperties;
-    }
+    [OSStructureField(Description = "Document metadata applied to the generated PNG screenshot.")]
+    public DocumentProperties? DocumentProperties;
 }
diff --git a/src/UltimatePDF_ExternalLogic/Structures/Viewport.cs b/src/UltimatePDF_ExternalLogic/Structures/Viewport.cs
index 386f7dd..253a673 100644
--- a/src/UltimatePDF_ExternalLogic/Structures/Viewport.cs
+++ b/src/UltimatePDF_ExternalLogic/Structures/Viewport.cs
@@ -1,20 +1,19 @@
 using OutSystems.ExternalLibraries.SDK;
 
-namespace OutSystems.UltimatePDF_ExternalLogic.Structures {
+namespace OutSystems.UltimatePDF_ExternalLogic.Structures;
+
+[OSStructure(Description = "Screen viewport configuration")]
+public struct Viewport {
     
-    [OSStructure(Description = "Screen viewport configuration")]
-    public struct Viewport {
-        
-        /// <summary>
-        /// 
-        /// </summary>
-        [OSStructureField]
-        public int Width;
+    /// <summary>
+    /// 
+    /// </summary>
+    [OSStructureField]
+    public int Width;
 
-        /// <summary>
-        /// 
-        /// </summary>
-        [OSStructureField] 
-        public int Height;
-    }
+    /// <summary>
+    /// 
+    /// </summary>
+    [OSStructureField] 
+    public int Height;
 }
diff --git a/src/UltimatePDF_ExternalLogic/UltimatePDF_ExternalLogic.cs b/src/UltimatePDF_ExternalLogic/UltimatePDF_ExternalLogic.cs
index b1e31c1..8f6b7e6 100644
--- a/src/UltimatePDF_ExternalLogic/UltimatePDF_ExternalLogic.cs
+++ b/src/UltimatePDF_ExternalLogic/UltimatePDF_ExternalLogic.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Diagnostics;
 using Microsoft.Extensions.Logging;
 using OutSystems.ExternalLibraries.SDK;
 using OutSystems.UltimatePDF_ExternalLogic.BrowserExecution;
@@ -11,267 +12,271 @@
 using PuppeteerSharp;
 using UltimatePDF_ExternalLogic.Utils;
 
-namespace OutSystems.UltimatePDF_ExternalLogic {
-    public class UltimatePDF_ExternalLogic : IUltimatePDF_ExternalLogic {
+namespace OutSystems.UltimatePDF_ExternalLogic;
+public class UltimatePDF_ExternalLogic : IUltimatePDF_ExternalLogic {
 
-        private readonly ILogger _odcLogger;
+    private readonly ILogger _odcLogger;
 
-        public UltimatePDF_ExternalLogic(ILogger logger) {
-            _odcLogger = logger;
+    public UltimatePDF_ExternalLogic(ILogger logger) {
+        _odcLogger = logger;
+    }
+
+    private static byte[] InnerPrintPDF(string url, Viewport viewport, Structures.Environment environment,
+                                 IEnumerable<Cookie> cookies, Paper paper, DocumentProperties? documentProperties,
+                                 int timeoutSeconds, Logger logger) {
+        using var activity = Activity.Current?.Source.StartActivity("UltimatePDF_ExternalLogic.InnerPrintPDF");
+
+        if (!UrlUtils.IsValidHttpsUri(url)) {
+            logger.Error($"The url:'{url}' is not a well-formed, absolute URI with an HTTPS scheme.");
+            throw new UriFormatException("Not a well-formed, absolute URI with an HTTPS scheme");
         }
 
-        private static byte[] InnerPrintPDF(string url, Viewport viewport, Structures.Environment environment,
-                                     IEnumerable<Cookie> cookies, Paper paper, DocumentProperties? documentProperties,
-                                     int timeoutSeconds, Logger logger) {
-
-            if (!UrlUtils.IsValidHttpsUri(url)) {
-                logger.Error($"The url:'{url}' is not a well-formed, absolute URI with an HTTPS scheme.");
-                throw new UriFormatException("Not a well-formed, absolute URI with an HTTPS scheme");
-            }
-
-            var viewportOpt = new ViewPortOptions() {
-                Width = viewport.Width,
-                Height = viewport.Height
-            };
-
-            var options = new PdfOptions() {
-                OmitBackground = true,
-                PrintBackground = true,
-                PreferCSSPageSize = true
-            };
-
-            if (paper.UseCustomPaper && paper.Width > 0 && paper.Height > 0) {
-                options.Width = $"{paper.Width}cm";
-                options.Height = $"{paper.Height}cm";
-                options.PreferCSSPageSize = false;
-            }
-
-            if (paper.UseCustomMargins && paper.MarginTop >= 0 && paper.MarginRight >= 0
-                && paper.MarginBottom >= 0 && paper.MarginLeft >= 0) {
-                options.MarginOptions.Top = $"{paper.MarginTop}cm";
-                options.MarginOptions.Right = $"{paper.MarginRight}cm";
-                options.MarginOptions.Bottom = $"{paper.MarginBottom}cm";
-                options.MarginOptions.Left = $"{paper.MarginLeft}cm";
-            }
-
-            Uri.TryCreate(url, UriKind.Absolute, out var uri);
-
-            if (uri == null) {
-                throw new UriFormatException();
-            }
-
-            IEnumerable<CookieParam> cookieParams = cookies.Select(c => new CookieParam() {
-                Name = c.Name,
-                Value = c.Value,
-                Domain = uri.Host,
-                HttpOnly = c.HttpOnly
-            });
-
-            byte[] pdf = Array.Empty<byte>();
-
-            try {
-                pdf = AsyncUtils.StartAndWait(
-                    () => UltimatePDFExecutionContext.PrintPDF(uri, environment.BaseURL, environment.Locale,
-                                             environment.Timezone, cookieParams, viewportOpt,
-                                             options, timeoutSeconds, logger));
-                pdf = PDFMetadataUtil.ApplyMetadata(pdf, documentProperties ?? default, logger);
-            } catch (Exception ex) {
-                logger.Error(ex, "Something went wrong generating the PDF");
-            }
+        var viewportOpt = new ViewPortOptions() {
+            Width = viewport.Width,
+            Height = viewport.Height
+        };
+
+        var options = new PdfOptions() {
+            OmitBackground = true,
+            PrintBackground = true,
+            PreferCSSPageSize = true
+        };
+
+        if (paper.UseCustomPaper && paper.Width > 0 && paper.Height > 0) {
+            options.Width = $"{paper.Width}cm";
+            options.Height = $"{paper.Height}cm";
+            options.PreferCSSPageSize = false;
+        }
+
+        if (paper.UseCustomMargins && paper.MarginTop >= 0 && paper.MarginRight >= 0
+            && paper.MarginBottom >= 0 && paper.MarginLeft >= 0) {
+            options.MarginOptions.Top = $"{paper.MarginTop}cm";
+            options.MarginOptions.Right = $"{paper.MarginRight}cm";
+            options.MarginOptions.Bottom = $"{paper.MarginBottom}cm";
+            options.MarginOptions.Left = $"{paper.MarginLeft}cm";
+        }
+
+        Uri.TryCreate(url, UriKind.Absolute, out var uri);
+
+        if (uri == null) {
+            throw new UriFormatException();
+        }
+
+        IEnumerable<CookieParam> cookieParams = cookies.Select(c => new CookieParam() {
+            Name = c.Name,
+            Value = c.Value,
+            Domain = uri.Host,
+            HttpOnly = c.HttpOnly
+        });
+
+        byte[] pdf = Array.Empty<byte>();
+
+        try {
+            pdf = AsyncUtils.StartAndWait(
+                () => UltimatePDFExecutionContext.PrintPDF(uri, environment.BaseURL, environment.Locale,
+                                         environment.Timezone, cookieParams, viewportOpt,
+                                         options, timeoutSeconds, logger));
+            pdf = PDFMetadataUtil.ApplyMetadata(pdf, documentProperties ?? default, logger);
+        } catch (Exception ex) {
+            logger.Error(ex, "Something went wrong generating the PDF");
+        }
+
+        return pdf;
+    }
+
+    public byte[] PrintPDF(
+        [OSParameter(DataType = OSDataType.Text, Description = "URL of the page to download")]
+        string url,
+        [OSParameter(Description = "Bowser viewport configuration")]
+        Structures.Viewport viewport,
+        [OSParameter(Description = "Environment information")]
+        Structures.Environment environment,
+        [OSParameter(Description = "List of cookies to add to the browser when accessing the page")]
+        IEnumerable<Structures.Cookie> cookies,
+        [OSParameter(Description = "PDF paper configuration")]
+        Structures.Paper paper,
+        [OSParameter(DataType = OSDataType.Integer, Description = "Browser render execution timeout in seconds")]
+        int timeoutSeconds,
+        [OSParameter(DataType = OSDataType.Boolean, Description = "Collects execution logs. If False LogsZipFile will be empty.")]
+        bool collectLogs,
+        [OSParameter(DataType = OSDataType.Boolean, Description = "Attach PDF and HTML files to the logs.")]
+        bool attachFilesLogs,
+        [OSParameter(DataType = OSDataType.BinaryData, Description = "PDF generation task logs")]
+        out byte[] logsZipFile,
+        [OSParameter(Description = "Document metadata applied to the generated PDF")]
+        Structures.DocumentProperties? documentProperties = null) {
+        using var activity = Activity.Current?.Source.StartActivity("UltimatePDF_ExternalLogic.PrintPDF");
+
+        var logger = Logger.GetLogger(_odcLogger, collectLogs, attachFilesLogs);
+
+        var pdf = InnerPrintPDF(url, viewport, environment, cookies, paper, documentProperties, timeoutSeconds, logger);
+
+        logsZipFile = logger.GetZipFile();
+
+        float mb = ((pdf.Length + logsZipFile.Length) / 1024f) / 1024f;
+
+        if (mb > 5.5) {
+            throw new Exception($"Output payload is too large ({mb}MB), maximum allowed is 5.5MB. To overcome this limitation use PrintPDF to REST action.");
+        }
 
-            return pdf;
+        return pdf;
+    }
+
+    public void PrintPDF_ToRest(
+        [OSParameter(DataType = OSDataType.Text, Description = "URL of the page to download")]
+        string url,
+        [OSParameter(Description = "Bowser viewport configuration")]
+        Viewport viewport,
+        [OSParameter(Description = "Environment information")]
+        Structures.Environment environment,
+        [OSParameter(Description = "List of cookies to add to the browser when accessing the page")]
+        IEnumerable<Structures.Cookie> cookies,
+        [OSParameter(Description = "PDF paper configuration")]
+        Paper paper,
+        [OSParameter(DataType = OSDataType.Integer, Description = "Browser render execution timeout in seconds")]
+        int timeoutSeconds,
+        [OSParameter(DataType = OSDataType.Boolean, Description = "Collects execution logs. If False LogsZipFile will be empty.")]
+        bool collectLogs,
+        [OSParameter(DataType = OSDataType.Boolean, Description = "Attach PDF and HTML files to the logs.")]
+        bool attachFilesLogs,
+        [OSParameter(Description = "Rest call configuration")]
+        RestCaller restCaller,
+        [OSParameter(Description = "Document metadata applied to the generated PDF")]
+        Structures.DocumentProperties? documentProperties = null) {
+        using var activity = Activity.Current?.Source.StartActivity("UltimatePDF_ExternalLogic.PrintPDF_ToRest");
+
+        var logger = Logger.GetLogger(_odcLogger, collectLogs, attachFilesLogs);
+
+        logger.Log($"Print PDF Rest call for {restCaller.Token}");
+
+        using var restSender = new RestSender(restCaller, logger);
+
+        var pdf = InnerPrintPDF(url, viewport, environment, cookies, paper, documentProperties, timeoutSeconds, logger);
+
+        logger.Log($"Prepare to send information to the REST API");
+
+        try {
+            AsyncUtils.StartAndWait(() => restSender.RestSendPDFAsync(pdf));
+        } catch (Exception ex) {
+            logger.Error(ex, "Error sending PDF using REST API.");
         }
 
-        public byte[] PrintPDF(
-            [OSParameter(DataType = OSDataType.Text, Description = "URL of the page to download")]
-            string url,
-            [OSParameter(Description = "Bowser viewport configuration")]
-            Structures.Viewport viewport,
-            [OSParameter(Description = "Environment information")]
-            Structures.Environment environment,
-            [OSParameter(Description = "List of cookies to add to the browser when accessing the page")]
-            IEnumerable<Structures.Cookie> cookies,
-            [OSParameter(Description = "PDF paper configuration")]
-            Structures.Paper paper,
-            [OSParameter(DataType = OSDataType.Integer, Description = "Browser render execution timeout in seconds")]
-            int timeoutSeconds,
-            [OSParameter(DataType = OSDataType.Boolean, Description = "Collects execution logs. If False LogsZipFile will be empty.")]
-            bool collectLogs,
-            [OSParameter(DataType = OSDataType.Boolean, Description = "Attach PDF and HTML files to the logs.")]
-            bool attachFilesLogs,
-            [OSParameter(DataType = OSDataType.BinaryData, Description = "PDF generation task logs")]
-            out byte[] logsZipFile,
-            [OSParameter(Description = "Document metadata applied to the generated PDF")]
-            Structures.DocumentProperties? documentProperties = null) {
-
-            var logger = Logger.GetLogger(_odcLogger, collectLogs, attachFilesLogs);
-
-            var pdf = InnerPrintPDF(url, viewport, environment, cookies, paper, documentProperties, timeoutSeconds, logger);
-
-            logsZipFile = logger.GetZipFile();
-
-            float mb = ((pdf.Length + logsZipFile.Length) / 1024f) / 1024f;
-
-            if (mb > 5.5) {
-                throw new Exception($"Output payload is too large ({mb}MB), maximum allowed is 5.5MB. To overcome this limitation use PrintPDF to REST action.");
-            }
-
-            return pdf;
+        if (collectLogs) {
+            AsyncUtils.StartAndWait(restSender.RestSendLogs);
         }
+    }
+
+    public void PrintPDF_ToS3(
+        [OSParameter(DataType = OSDataType.Text, Description = "URL of the page to download")]
+        string url,
+        [OSParameter(Description = "Bowser viewport configuration")]
+        Viewport viewport,
+        [OSParameter(Description = "Environment information")]
+        Structures.Environment environment,
+        [OSParameter(Description = "List of cookies to add to the browser when accessing the page")]
+        IEnumerable<Structures.Cookie> cookies,
+        [OSParameter(Description = "PDF paper configuration")]
+        Paper paper,
+        [OSParameter(DataType = OSDataType.Integer, Description = "Browser render execution timeout in seconds")]
+        int timeoutSeconds,
+        [OSParameter(DataType = OSDataType.Boolean, Description = "Collects execution logs. If False LogsZipFile will be empty")]
+        bool collectLogs,
+        [OSParameter(DataType = OSDataType.Boolean, Description = "Attach PDF and HTML files to the logs")]
+        bool attachFilesLogs,
+        [OSParameter(Description = "S3 PreSigned URLs for Ultimate PDf to use to store the resulting binaries")]
+        S3Endpoints s3Endpoints,
+        [OSParameter(Description = "Document metadata applied to the generated PDF")]
+        Structures.DocumentProperties? documentProperties = null) {
+        using var activity = Activity.Current?.Source.StartActivity("UltimatePDF_ExternalLogic.PrintPDF_ToS3");
+
+        var logger = Logger.GetLogger(_odcLogger, collectLogs, attachFilesLogs);
+
+        S3Sender s3Sender = new(s3Endpoints.PdfPreSignedUrl, s3Endpoints.LogsPreSignedUrl, logger);
+
+        var pdf = InnerPrintPDF(url, viewport, environment, cookies, paper, documentProperties, timeoutSeconds, logger);
+
+        logger.Log($"Prepare to send information to the REST API");
+
+        AsyncUtils.StartAndWait(() => s3Sender.S3SendPDFAsync(pdf));
+        AsyncUtils.StartAndWait(() => s3Sender.S3SendLogsAsync());
+    }
 
-        public void PrintPDF_ToRest(
-            [OSParameter(DataType = OSDataType.Text, Description = "URL of the page to download")]
-            string url,
-            [OSParameter(Description = "Bowser viewport configuration")]
-            Viewport viewport,
-            [OSParameter(Description = "Environment information")]
-            Structures.Environment environment,
-            [OSParameter(Description = "List of cookies to add to the browser when accessing the page")]
-            IEnumerable<Structures.Cookie> cookies,
-            [OSParameter(Description = "PDF paper configuration")]
-            Paper paper,
-            [OSParameter(DataType = OSDataType.Integer, Description = "Browser render execution timeout in seconds")]
-            int timeoutSeconds,
-            [OSParameter(DataType = OSDataType.Boolean, Description = "Collects execution logs. If False LogsZipFile will be empty.")]
-            bool collectLogs,
-            [OSParameter(DataType = OSDataType.Boolean, Description = "Attach PDF and HTML files to the logs.")]
-            bool attachFilesLogs,
-            [OSParameter(Description = "Rest call configuration")]
-            RestCaller restCaller,
-            [OSParameter(Description = "Document metadata applied to the generated PDF")]
-            Structures.DocumentProperties? documentProperties = null) {
-
-            var logger = Logger.GetLogger(_odcLogger, collectLogs, attachFilesLogs);
-
-            logger.Log($"Print PDF Rest call for {restCaller.Token}");
-
-            using var restSender = new RestSender(restCaller, logger);
-
-            var pdf = InnerPrintPDF(url, viewport, environment, cookies, paper, documentProperties, timeoutSeconds, logger);
-
-            logger.Log($"Prepare to send information to the REST API");
-
-            try {
-                AsyncUtils.StartAndWait(() => restSender.RestSendPDFAsync(pdf));
-            } catch (Exception ex) {
-                logger.Error(ex, "Error sending PDF using REST API.");
-            }
-
-            if (collectLogs) {
-                AsyncUtils.StartAndWait(restSender.RestSendLogs);
-            }
+    public byte[] ScreenshotPNG(
+        [OSParameter(DataType = OSDataType.Text, Description = "URL of the page to download")]
+        string url,
+        [OSParameter(Description = "Bowser viewport configuration")]
+        Structures.Viewport viewport,
+        [OSParameter(Description = "Environment information")]
+        Structures.Environment environment,
+        [OSParameter(Description = "List of cookies to add to the browser when accessing the page")]
+        IEnumerable<Structures.Cookie> cookies,
+        [OSParameter(Description = "PNG paper configuration")]
+        Structures.Paper paper,
+        [OSParameter(Description = "PNG screenshot options")]
+        Structures.ScreenshotOptions screenshotOptions,
+        [OSParameter(DataType = OSDataType.Integer, Description = "Browser render execution timeout in seconds")]
+        int timeoutSeconds,
+        [OSParameter(DataType = OSDataType.Boolean, Description = "Collects execution logs. If False LogsZipFile will be empty.")]
+        bool collectLogs,
+        [OSParameter(DataType = OSDataType.Boolean, Description = "Attach PDF and HTML files to the logs.")]
+        bool attachFilesLogs,
+        [OSParameter(DataType = OSDataType.BinaryData, Description = "PDF generation task logs")]
+        out byte[] logsZipFile) {
+        using var activity = Activity.Current?.Source.StartActivity("UltimatePDF_ExternalLogic.ScreenshotPNG");
+
+        var logger = Logger.GetLogger(_odcLogger, collectLogs, attachFilesLogs);
+
+        if(!UrlUtils.IsValidHttpsUri(url)) {
+            logger.Error($"The url:'{url}' is not a well-formed, absolute URI with an HTTPS scheme.");
+            throw new UriFormatException("Not a well-formed, absolute URI with an HTTPS scheme");
         }
 
-        public void PrintPDF_ToS3(
-            [OSParameter(DataType = OSDataType.Text, Description = "URL of the page to download")]
-            string url,
-            [OSParameter(Description = "Bowser viewport configuration")]
-            Viewport viewport,
-            [OSParameter(Description = "Environment information")]
-            Structures.Environment environment,
-            [OSParameter(Description = "List of cookies to add to the browser when accessing the page")]
-            IEnumerable<Structures.Cookie> cookies,
-            [OSParameter(Description = "PDF paper configuration")]
-            Paper paper,
-            [OSParameter(DataType = OSDataType.Integer, Description = "Browser render execution timeout in seconds")]
-            int timeoutSeconds,
-            [OSParameter(DataType = OSDataType.Boolean, Description = "Collects execution logs. If False LogsZipFile will be empty")]
-            bool collectLogs,
-            [OSParameter(DataType = OSDataType.Boolean, Description = "Attach PDF and HTML files to the logs")]
-            bool attachFilesLogs,
-            [OSParameter(Description = "S3 PreSigned URLs for Ultimate PDf to use to store the resulting binaries")]
-            S3Endpoints s3Endpoints,
-            [OSParameter(Description = "Document metadata applied to the generated PDF")]
-            Structures.DocumentProperties? documentProperties = null) {
-
-            var logger = Logger.GetLogger(_odcLogger, collectLogs, attachFilesLogs);
-
-            S3Sender s3Sender = new(s3Endpoints.PdfPreSignedUrl, s3Endpoints.LogsPreSignedUrl, logger);
-
-            var pdf = InnerPrintPDF(url, viewport, environment, cookies, paper, documentProperties, timeoutSeconds, logger);
-
-            logger.Log($"Prepare to send information to the REST API");
-
-            AsyncUtils.StartAndWait(() => s3Sender.S3SendPDFAsync(pdf));
-            AsyncUtils.StartAndWait(() => s3Sender.S3SendLogsAsync());
+        var viewportOpt = new ViewPortOptions() {
+            Width = viewport.Width,
+            Height = viewport.Height
+        };
+
+        var options = new PuppeteerSharp.ScreenshotOptions() {
+            FullPage = screenshotOptions.FullPage,
+            OmitBackground = screenshotOptions.TransparentBackground
+        };
+
+        Uri.TryCreate(url, UriKind.Absolute, out var uri);
+
+        if (uri == null) {
+            throw new UriFormatException();
         }
 
-        public byte[] ScreenshotPNG(
-            [OSParameter(DataType = OSDataType.Text, Description = "URL of the page to download")]
-            string url,
-            [OSParameter(Description = "Bowser viewport configuration")]
-            Structures.Viewport viewport,
-            [OSParameter(Description = "Environment information")]
-            Structures.Environment environment,
-            [OSParameter(Description = "List of cookies to add to the browser when accessing the page")]
-            IEnumerable<Structures.Cookie> cookies,
-            [OSParameter(Description = "PNG paper configuration")]
-            Structures.Paper paper,
-            [OSParameter(Description = "PNG screenshot options")]
-            Structures.ScreenshotOptions screenshotOptions,
-            [OSParameter(DataType = OSDataType.Integer, Description = "Browser render execution timeout in seconds")]
-            int timeoutSeconds,
-            [OSParameter(DataType = OSDataType.Boolean, Description = "Collects execution logs. If False LogsZipFile will be empty.")]
-            bool collectLogs,
-            [OSParameter(DataType = OSDataType.Boolean, Description = "Attach PDF and HTML files to the logs.")]
-            bool attachFilesLogs,
-            [OSParameter(DataType = OSDataType.BinaryData, Description = "PDF generation task logs")]
-            out byte[] logsZipFile) {
-
-            var logger = Logger.GetLogger(_odcLogger, collectLogs, attachFilesLogs);
-
-            if(!UrlUtils.IsValidHttpsUri(url)) {
-                logger.Error($"The url:'{url}' is not a well-formed, absolute URI with an HTTPS scheme.");
-                throw new UriFormatException("Not a well-formed, absolute URI with an HTTPS scheme");
-            }
-
-            var viewportOpt = new ViewPortOptions() {
-                Width = viewport.Width,
-                Height = viewport.Height
-            };
-
-            var options = new PuppeteerSharp.ScreenshotOptions() {
-                FullPage = screenshotOptions.FullPage,
-                OmitBackground = screenshotOptions.TransparentBackground
-            };
-
-            Uri.TryCreate(url, UriKind.Absolute, out var uri);
-
-            if (uri == null) {
-                throw new UriFormatException();
-            }
-
-            logger.Log($"Input URL: {url}");
-
-            logger.Log($"Browser will retrieve the document from: {uri}");
-            logger.Log($"Browser will set a Base URL for relative hyperlinks: {environment.BaseURL}");
-
-            logger.Log($"Locale to be used: {environment.Locale}", !string.IsNullOrEmpty(environment.Locale));
-            logger.Log($"Timezone to be used: {environment.Timezone}", !string.IsNullOrEmpty(environment.Timezone));
-
-            IEnumerable<CookieParam> cookieParams = cookies.Select(c => new CookieParam() {
-                Name = c.Name,
-                Value = c.Value,
-                Domain = uri.Host,
-                HttpOnly = c.HttpOnly
-            });
-
-            byte[] png;
-            try {
-                png = AsyncUtils.StartAndWait(
-                   () => UltimatePDFExecutionContext.ScreenshotPNG(uri, environment.BaseURL, environment.Locale,
-                                                 environment.Timezone, cookieParams, viewportOpt,
-                                                 options, timeoutSeconds, logger));
-            } catch (Exception e) {
-                logger.Error(e, "Something went wrong generating the screenshot");
-                throw;
-            }
-
-            png = PNGMetadataUtil.ApplyMetadata(png, screenshotOptions.DocumentProperties ?? default, logger);
-
-            logsZipFile = logger.GetZipFile();
-
-            return png;
+        logger.Log($"Input URL: {url}");
+
+        logger.Log($"Browser will retrieve the document from: {uri}");
+        logger.Log($"Browser will set a Base URL for relative hyperlinks: {environment.BaseURL}");
+
+        logger.Log($"Locale to be used: {environment.Locale}", !string.IsNullOrEmpty(environment.Locale));
+        logger.Log($"Timezone to be used: {environment.Timezone}", !string.IsNullOrEmpty(environment.Timezone));
+
+        IEnumerable<CookieParam> cookieParams = cookies.Select(c => new CookieParam() {
+            Name = c.Name,
+            Value = c.Value,
+            Domain = uri.Host,
+            HttpOnly = c.HttpOnly
+        });
+
+        byte[] png;
+        try {
+            png = AsyncUtils.StartAndWait(
+               () => UltimatePDFExecutionContext.ScreenshotPNG(uri, environment.BaseURL, environment.Locale,
+                                             environment.Timezone, cookieParams, viewportOpt,
+                                             options, timeoutSeconds, logger));
+        } catch (Exception e) {
+            logger.Error(e, "Something went wrong generating the screenshot");
+            throw;
         }
+
+        png = PNGMetadataUtil.ApplyMetadata(png, screenshotOptions.DocumentProperties ?? default, logger);
+
+        logsZipFile = logger.GetZipFile();
+
+        return png;
     }
 }
diff --git a/src/UltimatePDF_ExternalLogic/Utils/AsyncUtils.cs b/src/UltimatePDF_ExternalLogic/Utils/AsyncUtils.cs
index 793a271..8f1cba5 100644
--- a/src/UltimatePDF_ExternalLogic/Utils/AsyncUtils.cs
+++ b/src/UltimatePDF_ExternalLogic/Utils/AsyncUtils.cs
@@ -1,22 +1,24 @@
 using System;
+using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace OutSystems.UltimatePDF_ExternalLogic.Utils {
-    public static class AsyncUtils {
+namespace OutSystems.UltimatePDF_ExternalLogic.Utils;
+public static class AsyncUtils {
 
-        /* Runs async code with default scheduler and waits for the result */
-        public static T StartAndWait<T>(Func<Task<T>> @async) {
-            var tf = new TaskFactory(CancellationToken.None, TaskCreationOptions.None, TaskContinuationOptions.None, TaskScheduler.Default);
-            Task<Task<T>> task = tf.StartNew(@async);
-            return task.Unwrap().GetAwaiter().GetResult();
-        }
+    /* Runs async code with default scheduler and waits for the result */
+    public static T StartAndWait<T>(Func<Task<T>> @async) {
+        using var activity = Activity.Current?.Source.StartActivity("AsyncUtils.StartAndWait");
+        var tf = new TaskFactory(CancellationToken.None, TaskCreationOptions.None, TaskContinuationOptions.None, TaskScheduler.Default);
+        Task<Task<T>> task = tf.StartNew(@async);
+        return task.Unwrap().GetAwaiter().GetResult();
+    }
 
-        /* Runs async code with default scheduler and waits for the result */
-        public static void StartAndWait(Func<Task> @async) {
-            var tf = new TaskFactory(CancellationToken.None, TaskCreationOptions.None, TaskContinuationOptions.None, TaskScheduler.Default);
-            Task<Task> task = tf.StartNew(@async);
-            task.Unwrap().GetAwaiter().GetResult();
-        }
+    /* Runs async code with default scheduler and waits for the result */
+    public static void StartAndWait(Func<Task> @async) {
+        using var activity = Activity.Current?.Source.StartActivity("AsyncUtils.StartAndWait");
+        var tf = new TaskFactory(CancellationToken.None, TaskCreationOptions.None, TaskContinuationOptions.None, TaskScheduler.Default);
+        Task<Task> task = tf.StartNew(@async);
+        task.Unwrap().GetAwaiter().GetResult();
     }
 }
diff --git a/src/UltimatePDF_ExternalLogic/Utils/PDFMetadataUtil.cs b/src/UltimatePDF_ExternalLogic/Utils/PDFMetadataUtil.cs
index 1e1d88e..bf20c06 100644
--- a/src/UltimatePDF_ExternalLogic/Utils/PDFMetadataUtil.cs
+++ b/src/UltimatePDF_ExternalLogic/Utils/PDFMetadataUtil.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.IO;
 using OutSystems.UltimatePDF_ExternalLogic.Management.Troubleshooting;
 using OutSystems.UltimatePDF_ExternalLogic.Structures;
@@ -6,80 +7,80 @@
 using PdfSharp.Pdf;
 using PdfSharp.Pdf.IO;
 
-namespace OutSystems.UltimatePDF_ExternalLogic.Utils {
-    internal static class PDFMetadataUtil {
-
-        /// <summary>
-        /// Applies metadata properties to a PDF document
-        /// </summary>
-        /// <param name="pdfBytes">The PDF document as byte array</param>
-        /// <param name="properties">The metadata properties to apply</param>
-        /// <param name="logger">Optional logger for non-fatal embed failures</param>
-        /// <returns>The PDF with metadata applied as byte array</returns>
-        public static byte[] ApplyMetadata(byte[] pdfBytes, DocumentProperties properties, Logger? logger = null) {
-            if (pdfBytes == null) {
-                return Array.Empty<byte>();
-            }
+namespace OutSystems.UltimatePDF_ExternalLogic.Utils;
+internal static class PDFMetadataUtil {
+
+    /// <summary>
+    /// Applies metadata properties to a PDF document
+    /// </summary>
+    /// <param name="pdfBytes">The PDF document as byte array</param>
+    /// <param name="properties">The metadata properties to apply</param>
+    /// <param name="logger">Optional logger for non-fatal embed failures</param>
+    /// <returns>The PDF with metadata applied as byte array</returns>
+    public static byte[] ApplyMetadata(byte[] pdfBytes, DocumentProperties properties, Logger? logger = null) {
+        using var activity = Activity.Current?.Source.StartActivity("PDFMetadataUtil.ApplyMetadata");
+        if (pdfBytes == null) {
+            return Array.Empty<byte>();
+        }
 
-            if (pdfBytes.Length == 0 || properties.IsEmpty()) {
-                return pdfBytes;
-            }
+        if (pdfBytes.Length == 0 || properties.IsEmpty()) {
+            return pdfBytes;
+        }
 
-            try {
-                using var inputStream = new MemoryStream(pdfBytes);
-                using var outputStream = new MemoryStream();
+        try {
+            using var inputStream = new MemoryStream(pdfBytes);
+            using var outputStream = new MemoryStream();
 
-                var document = PdfReader.Open(inputStream, PdfDocumentOpenMode.Modify);
+            var document = PdfReader.Open(inputStream, PdfDocumentOpenMode.Modify);
 
-                if (!string.IsNullOrWhiteSpace(properties.Title)) {
-                    document.Info.Title = properties.Title;
-                }
+            if (!string.IsNullOrWhiteSpace(properties.Title)) {
+                document.Info.Title = properties.Title;
+            }
 
-                if (!string.IsNullOrWhiteSpace(properties.Author)) {
-                    document.Info.Author = properties.Author;
-                }
+            if (!string.IsNullOrWhiteSpace(properties.Author)) {
+                document.Info.Author = properties.Author;
+            }
 
-                if (!string.IsNullOrWhiteSpace(properties.Subject)) {
-                    document.Info.Subject = properties.Subject;
-                }
+            if (!string.IsNullOrWhiteSpace(properties.Subject)) {
+                document.Info.Subject = properties.Subject;
+            }
 
-                if (!string.IsNullOrWhiteSpace(properties.Keywords)) {
-                    document.Info.Keywords = properties.Keywords;
-                }
+            if (!string.IsNullOrWhiteSpace(properties.Keywords)) {
+                document.Info.Keywords = properties.Keywords;
+            }
 
-                if (!string.IsNullOrWhiteSpace(properties.Creator)) {
-                    document.Info.Creator = properties.Creator;
-                }
+            if (!string.IsNullOrWhiteSpace(properties.Creator)) {
+                document.Info.Creator = properties.Creator;
+            }
 
-                if (!string.IsNullOrWhiteSpace(properties.Company)) {
-                    document.Info.Elements.SetString("/Company", properties.Company);
-                }
+            if (!string.IsNullOrWhiteSpace(properties.Company)) {
+                document.Info.Elements.SetString("/Company", properties.Company);
+            }
 
-                if (!string.IsNullOrWhiteSpace(properties.Producer)) {
-                    document.Info.Elements.SetString("/Producer", properties.Producer);
-                }
+            if (!string.IsNullOrWhiteSpace(properties.Producer)) {
+                document.Info.Elements.SetString("/Producer", properties.Producer);
+            }
 
-                if (!string.IsNullOrWhiteSpace(properties.Copyright)) {
-                    document.Info.Elements.SetString("/Copyright", properties.Copyright);
-                }
+            if (!string.IsNullOrWhiteSpace(properties.Copyright)) {
+                document.Info.Elements.SetString("/Copyright", properties.Copyright);
+            }
 
-                if (!string.IsNullOrWhiteSpace(properties.Language)) {
-                    document.Internals.Catalog.Elements.SetString("/Lang", properties.Language);
-                }
+            if (!string.IsNullOrWhiteSpace(properties.Language)) {
+                document.Internals.Catalog.Elements.SetString("/Lang", properties.Language);
+            }
 
-                if (!string.IsNullOrWhiteSpace(properties.Source)) {
-                    document.Info.Elements.SetString("/Source", properties.Source);
-                }
+            if (!string.IsNullOrWhiteSpace(properties.Source)) {
+                document.Info.Elements.SetString("/Source", properties.Source);
+            }
 
-                document.Info.ModificationDate = DateTime.UtcNow;
+            document.Info.ModificationDate = DateTime.UtcNow;
 
-                document.Save(outputStream, false);
-                return outputStream.ToArray();
-            } catch (Exception ex) when (ex is PdfSharpException or IOException or InvalidOperationException or ArgumentException) {
-                logger?.Error(ex, "Failed to embed PDF metadata; returning original bytes.");
-                return pdfBytes;
-            }
+            document.Save(outputStream, false);
+            return outputStream.ToArray();
+        } catch (Exception ex) when (ex is PdfSharpException or IOException or InvalidOperationException or ArgumentException) {
+            logger?.Error(ex, "Failed to embed PDF metadata; returning original bytes.");
+            return pdfBytes;
         }
-
     }
+
 }
diff --git a/src/UltimatePDF_ExternalLogic/Utils/PNGMetadataUtil.cs b/src/UltimatePDF_ExternalLogic/Utils/PNGMetadataUtil.cs
index c93212d..fb21ba9 100644
--- a/src/UltimatePDF_ExternalLogic/Utils/PNGMetadataUtil.cs
+++ b/src/UltimatePDF_ExternalLogic/Utils/PNGMetadataUtil.cs
@@ -1,121 +1,124 @@
 using System;
+using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Text;
 using OutSystems.UltimatePDF_ExternalLogic.Management.Troubleshooting;
 using OutSystems.UltimatePDF_ExternalLogic.Structures;
 
-namespace OutSystems.UltimatePDF_ExternalLogic.Utils {
-    internal static class PNGMetadataUtil {
-
-        private static readonly byte[] PngSignature = { 0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A };
-        private const int IhdrEnd = 33;
-
-        /// <summary>
-        /// Applies metadata properties to a PNG image by inserting tEXt / iTXt text chunks
-        /// after the IHDR chunk. Returns the original bytes on any error or when input is empty.
-        /// </summary>
-        /// <remarks>
-        /// This method is NOT idempotent: calling it twice on the same input produces duplicate
-        /// text chunks (PNG decoders accept duplicates for most keywords). The library's only
-        /// caller is <c>ScreenshotPNG</c>, which always passes a freshly-rendered PNG straight
-        /// from PuppeteerSharp and therefore never reapplies metadata on already-tagged bytes.
-        /// </remarks>
-        public static byte[] ApplyMetadata(byte[] pngBytes, DocumentProperties properties, Logger? logger = null) {
-            if (pngBytes == null) {
-                return Array.Empty<byte>();
-            }
-
-            if (properties.IsEmpty()) {
-                return pngBytes;
-            }
+namespace OutSystems.UltimatePDF_ExternalLogic.Utils;
+internal static class PNGMetadataUtil {
+
+    private static readonly byte[] PngSignature = { 0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A };
+    private const int IhdrEnd = 33;
+
+    /// <summary>
+    /// Applies metadata properties to a PNG image by inserting tEXt / iTXt text chunks
+    /// after the IHDR chunk. Returns the original bytes on any error or when input is empty.
+    /// </summary>
+    /// <remarks>
+    /// This method is NOT idempotent: calling it twice on the same input produces duplicate
+    /// text chunks (PNG decoders accept duplicates for most keywords). The library's only
+    /// caller is <c>ScreenshotPNG</c>, which always passes a freshly-rendered PNG straight
+    /// from PuppeteerSharp and therefore never reapplies metadata on already-tagged bytes.
+    /// </remarks>
+    public static byte[] ApplyMetadata(byte[] pngBytes, DocumentProperties properties, Logger? logger = null) {
+        using var activity = Activity.Current?.Source.StartActivity("PNGMetadataUtil.ApplyMetadata");
+        if (pngBytes == null) {
+            return Array.Empty<byte>();
+        }
 
-            if (pngBytes.Length < IhdrEnd) {
-                logger?.Warning("PNG metadata: input too short to be a valid PNG; metadata not embedded.");
-                return pngBytes;
-            }
+        if (properties.IsEmpty()) {
+            return pngBytes;
+        }
 
-            try {
-                for (int i = 0; i < PngSignature.Length; i++) {
-                    if (pngBytes[i] != PngSignature[i]) {
-                        logger?.Warning("PNG metadata: invalid PNG signature; metadata not embedded.");
-                        return pngBytes;
-                    }
-                }
+        if (pngBytes.Length < IhdrEnd) {
+            logger?.Warning("PNG metadata: input too short to be a valid PNG; metadata not embedded.");
+            return pngBytes;
+        }
 
-                if (pngBytes[12] != (byte)'I' || pngBytes[13] != (byte)'H'
-                 || pngBytes[14] != (byte)'D' || pngBytes[15] != (byte)'R') {
-                    logger?.Warning("PNG metadata: missing IHDR chunk; metadata not embedded.");
+        try {
+            for (int i = 0; i < PngSignature.Length; i++) {
+                if (pngBytes[i] != PngSignature[i]) {
+                    logger?.Warning("PNG metadata: invalid PNG signature; metadata not embedded.");
                     return pngBytes;
                 }
+            }
 
-                using var output = new MemoryStream(pngBytes.Length + 1024);
+            if (pngBytes[12] != (byte)'I' || pngBytes[13] != (byte)'H'
+             || pngBytes[14] != (byte)'D' || pngBytes[15] != (byte)'R') {
+                logger?.Warning("PNG metadata: missing IHDR chunk; metadata not embedded.");
+                return pngBytes;
+            }
 
-                output.Write(pngBytes, 0, IhdrEnd);
+            using var output = new MemoryStream(pngBytes.Length + 1024);
 
-                WriteTextChunkIfNotEmpty(output, "Title", properties.Title);
-                WriteTextChunkIfNotEmpty(output, "Author", properties.Author);
-                WriteTextChunkIfNotEmpty(output, "Description", properties.Subject);
-                WriteTextChunkIfNotEmpty(output, "Keywords", properties.Keywords);
-                WriteTextChunkIfNotEmpty(output, "Creator", properties.Creator);
-                WriteTextChunkIfNotEmpty(output, "Company", properties.Company);
-                WriteTextChunkIfNotEmpty(output, "Software", properties.Producer);
-                WriteTextChunkIfNotEmpty(output, "Copyright", properties.Copyright);
-                WriteTextChunkIfNotEmpty(output, "Language", properties.Language);
-                WriteTextChunkIfNotEmpty(output, "Source", properties.Source);
+            output.Write(pngBytes, 0, IhdrEnd);
 
-                var creationTime = DateTime.UtcNow.ToString("R", CultureInfo.InvariantCulture);
-                WriteTextChunk(output, "Creation Time", creationTime);
+            WriteTextChunkIfNotEmpty(output, "Title", properties.Title);
+            WriteTextChunkIfNotEmpty(output, "Author", properties.Author);
+            WriteTextChunkIfNotEmpty(output, "Description", properties.Subject);
+            WriteTextChunkIfNotEmpty(output, "Keywords", properties.Keywords);
+            WriteTextChunkIfNotEmpty(output, "Creator", properties.Creator);
+            WriteTextChunkIfNotEmpty(output, "Company", properties.Company);
+            WriteTextChunkIfNotEmpty(output, "Software", properties.Producer);
+            WriteTextChunkIfNotEmpty(output, "Copyright", properties.Copyright);
+            WriteTextChunkIfNotEmpty(output, "Language", properties.Language);
+            WriteTextChunkIfNotEmpty(output, "Source", properties.Source);
 
-                output.Write(pngBytes, IhdrEnd, pngBytes.Length - IhdrEnd);
+            var creationTime = DateTime.UtcNow.ToString("R", CultureInfo.InvariantCulture);
+            WriteTextChunk(output, "Creation Time", creationTime);
 
-                return output.ToArray();
-            } catch (Exception ex) when (ex is IOException or InvalidOperationException or ArgumentException) {
-                logger?.Error(ex, "Failed to embed PNG metadata; returning original bytes.");
-                return pngBytes;
-            }
+            output.Write(pngBytes, IhdrEnd, pngBytes.Length - IhdrEnd);
+
+            return output.ToArray();
+        } catch (Exception ex) when (ex is IOException or InvalidOperationException or ArgumentException) {
+            logger?.Error(ex, "Failed to embed PNG metadata; returning original bytes.");
+            return pngBytes;
         }
+    }
 
-        private static void WriteTextChunkIfNotEmpty(MemoryStream output, string keyword, string text) {
-            if (string.IsNullOrWhiteSpace(text)) {
-                return;
-            }
-            WriteTextChunk(output, keyword, text);
+    private static void WriteTextChunkIfNotEmpty(MemoryStream output, string keyword, string text) {
+        using var activity = Activity.Current?.Source.StartActivity("PNGMetadataUtil.WriteTextChunkIfNotEmpty");
+        if (string.IsNullOrWhiteSpace(text)) {
+            return;
         }
+        WriteTextChunk(output, keyword, text);
+    }
 
-        private static void WriteTextChunk(MemoryStream output, string keyword, string text) {
-            bool isAscii = true;
-            for (int i = 0; i < text.Length; i++) {
-                char c = text[i];
-                if (c < 0x20 || c > 0x7E) {
-                    isAscii = false;
-                    break;
-                }
+    private static void WriteTextChunk(MemoryStream output, string keyword, string text) {
+        using var activity = Activity.Current?.Source.StartActivity("PNGMetadataUtil.WriteTextChunk");
+        bool isAscii = true;
+        for (int i = 0; i < text.Length; i++) {
+            char c = text[i];
+            if (c < 0x20 || c > 0x7E) {
+                isAscii = false;
+                break;
             }
+        }
 
-            if (isAscii) {
-                var keywordBytes = Encoding.Latin1.GetBytes(keyword);
-                var textBytes = Encoding.Latin1.GetBytes(text);
-                var data = new byte[keywordBytes.Length + 1 + textBytes.Length];
-                Buffer.BlockCopy(keywordBytes, 0, data, 0, keywordBytes.Length);
-                data[keywordBytes.Length] = 0;
-                Buffer.BlockCopy(textBytes, 0, data, keywordBytes.Length + 1, textBytes.Length);
-                PngEncoding.WriteChunk(output, "tEXt", data);
-            } else {
-                var keywordBytes = Encoding.Latin1.GetBytes(keyword);
-                var textBytes = Encoding.UTF8.GetBytes(text);
-                var data = new byte[keywordBytes.Length + 1 + 1 + 1 + 1 + 1 + textBytes.Length];
-                int p = 0;
-                Buffer.BlockCopy(keywordBytes, 0, data, p, keywordBytes.Length);
-                p += keywordBytes.Length;
-                data[p++] = 0;   // keyword null separator
-                data[p++] = 0;   // compression flag (uncompressed)
-                data[p++] = 0;   // compression method
-                data[p++] = 0;   // language tag (empty) null terminator
-                data[p++] = 0;   // translated keyword (empty) null terminator
-                Buffer.BlockCopy(textBytes, 0, data, p, textBytes.Length);
-                PngEncoding.WriteChunk(output, "iTXt", data);
-            }
+        if (isAscii) {
+            var keywordBytes = Encoding.Latin1.GetBytes(keyword);
+            var textBytes = Encoding.Latin1.GetBytes(text);
+            var data = new byte[keywordBytes.Length + 1 + textBytes.Length];
+            Buffer.BlockCopy(keywordBytes, 0, data, 0, keywordBytes.Length);
+            data[keywordBytes.Length] = 0;
+            Buffer.BlockCopy(textBytes, 0, data, keywordBytes.Length + 1, textBytes.Length);
+            PngEncoding.WriteChunk(output, "tEXt", data);
+        } else {
+            var keywordBytes = Encoding.Latin1.GetBytes(keyword);
+            var textBytes = Encoding.UTF8.GetBytes(text);
+            var data = new byte[keywordBytes.Length + 1 + 1 + 1 + 1 + 1 + textBytes.Length];
+            int p = 0;
+            Buffer.BlockCopy(keywordBytes, 0, data, p, keywordBytes.Length);
+            p += keywordBytes.Length;
+            data[p++] = 0;   // keyword null separator
+            data[p++] = 0;   // compression flag (uncompressed)
+            data[p++] = 0;   // compression method
+            data[p++] = 0;   // language tag (empty) null terminator
+            data[p++] = 0;   // translated keyword (empty) null terminator
+            Buffer.BlockCopy(textBytes, 0, data, p, textBytes.Length);
+            PngEncoding.WriteChunk(output, "iTXt", data);
         }
     }
 }
diff --git a/src/UltimatePDF_ExternalLogic/Utils/PngEncoding.cs b/src/UltimatePDF_ExternalLogic/Utils/PngEncoding.cs
index 6df40eb..ce9496d 100644
--- a/src/UltimatePDF_ExternalLogic/Utils/PngEncoding.cs
+++ b/src/UltimatePDF_ExternalLogic/Utils/PngEncoding.cs
@@ -1,53 +1,56 @@
 using System;
+using System.Diagnostics;
 using System.IO;
 using System.Text;
 
-namespace OutSystems.UltimatePDF_ExternalLogic.Utils {
+namespace OutSystems.UltimatePDF_ExternalLogic.Utils;
+/// <summary>
+/// Low-level PNG chunk encoding helpers. Centralized so the production code and the
+/// PNG fixtures in the unit-test project share a single implementation of CRC32 and
+/// big-endian length / type / data / CRC framing.
+/// </summary>
+internal static class PngEncoding {
+
     /// <summary>
-    /// Low-level PNG chunk encoding helpers. Centralized so the production code and the
-    /// PNG fixtures in the unit-test project share a single implementation of CRC32 and
-    /// big-endian length / type / data / CRC framing.
+    /// Writes one PNG chunk (length, type, data, CRC32 over type+data) to the output stream.
     /// </summary>
-    internal static class PngEncoding {
-
-        /// <summary>
-        /// Writes one PNG chunk (length, type, data, CRC32 over type+data) to the output stream.
-        /// </summary>
-        internal static void WriteChunk(MemoryStream output, string type, byte[] data) {
-            var typeBytes = Encoding.ASCII.GetBytes(type);
+    internal static void WriteChunk(MemoryStream output, string type, byte[] data) {
+        using var activity = Activity.Current?.Source.StartActivity("PngEncoding.WriteChunk");
+        var typeBytes = Encoding.ASCII.GetBytes(type);
 
-            WriteUInt32BigEndian(output, (uint)data.Length);
-            output.Write(typeBytes, 0, typeBytes.Length);
-            output.Write(data, 0, data.Length);
+        WriteUInt32BigEndian(output, (uint)data.Length);
+        output.Write(typeBytes, 0, typeBytes.Length);
+        output.Write(data, 0, data.Length);
 
-            var crcInput = new byte[typeBytes.Length + data.Length];
-            Buffer.BlockCopy(typeBytes, 0, crcInput, 0, typeBytes.Length);
-            Buffer.BlockCopy(data, 0, crcInput, typeBytes.Length, data.Length);
-            WriteUInt32BigEndian(output, Crc32(crcInput));
-        }
+        var crcInput = new byte[typeBytes.Length + data.Length];
+        Buffer.BlockCopy(typeBytes, 0, crcInput, 0, typeBytes.Length);
+        Buffer.BlockCopy(data, 0, crcInput, typeBytes.Length, data.Length);
+        WriteUInt32BigEndian(output, Crc32(crcInput));
+    }
 
-        /// <summary>
-        /// Writes a 32-bit unsigned integer in big-endian order (PNG chunk length / CRC layout).
-        /// </summary>
-        internal static void WriteUInt32BigEndian(MemoryStream output, uint value) {
-            output.WriteByte((byte)(value >> 24));
-            output.WriteByte((byte)(value >> 16));
-            output.WriteByte((byte)(value >> 8));
-            output.WriteByte((byte)value);
-        }
+    /// <summary>
+    /// Writes a 32-bit unsigned integer in big-endian order (PNG chunk length / CRC layout).
+    /// </summary>
+    internal static void WriteUInt32BigEndian(MemoryStream output, uint value) {
+        using var activity = Activity.Current?.Source.StartActivity("PngEncoding.WriteUInt32BigEndian");
+        output.WriteByte((byte)(value >> 24));
+        output.WriteByte((byte)(value >> 16));
+        output.WriteByte((byte)(value >> 8));
+        output.WriteByte((byte)value);
+    }
 
-        /// <summary>
-        /// Computes the CRC-32 used by PNG chunks (polynomial 0xEDB88320, initial 0xFFFFFFFF, output XOR'd with 0xFFFFFFFF).
-        /// </summary>
-        internal static uint Crc32(byte[] data) {
-            uint crc = 0xFFFFFFFFu;
-            for (int i = 0; i < data.Length; i++) {
-                crc ^= data[i];
-                for (int j = 0; j < 8; j++) {
-                    crc = (crc & 1u) != 0 ? (crc >> 1) ^ 0xEDB88320u : (crc >> 1);
-                }
+    /// <summary>
+    /// Computes the CRC-32 used by PNG chunks (polynomial 0xEDB88320, initial 0xFFFFFFFF, output XOR'd with 0xFFFFFFFF).
+    /// </summary>
+    internal static uint Crc32(byte[] data) {
+        using var activity = Activity.Current?.Source.StartActivity("PngEncoding.Crc32");
+        uint crc = 0xFFFFFFFFu;
+        for (int i = 0; i < data.Length; i++) {
+            crc ^= data[i];
+            for (int j = 0; j < 8; j++) {
+                crc = (crc & 1u) != 0 ? (crc >> 1) ^ 0xEDB88320u : (crc >> 1);
             }
-            return ~crc;
         }
+        return ~crc;
     }
 }
diff --git a/src/UltimatePDF_ExternalLogic/Utils/ResourceAccessor.cs b/src/UltimatePDF_ExternalLogic/Utils/ResourceAccessor.cs
index ea0ca82..d9f1d7d 100644
--- a/src/UltimatePDF_ExternalLogic/Utils/ResourceAccessor.cs
+++ b/src/UltimatePDF_ExternalLogic/Utils/ResourceAccessor.cs
@@ -1,21 +1,22 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace UltimatePDF_ExternalLogic.Utils {
-    internal class ResourceAccessor {
-        public static string GetResource(string resourceName) {
-            var assembly = Assembly.GetExecutingAssembly();
-            using var stream = assembly.GetManifestResourceStream(resourceName);
-            if (stream == null) {
-                throw new ArgumentException("Resource not found");
-            }
-            using var reader = new StreamReader(stream);
-            return reader.ReadToEnd();
+namespace UltimatePDF_ExternalLogic.Utils;
+internal class ResourceAccessor {
+    public static string GetResource(string resourceName) {
+        using var activity = Activity.Current?.Source.StartActivity("ResourceAccessor.GetResource");
+        var assembly = Assembly.GetExecutingAssembly();
+        using var stream = assembly.GetManifestResourceStream(resourceName);
+        if (stream == null) {
+            throw new ArgumentException("Resource not found");
         }
+        using var reader = new StreamReader(stream);
+        return reader.ReadToEnd();
     }
 }
diff --git a/src/UltimatePDF_ExternalLogic/Utils/RestSender.cs b/src/UltimatePDF_ExternalLogic/Utils/RestSender.cs
index 8c9e165..96d244c 100644
--- a/src/UltimatePDF_ExternalLogic/Utils/RestSender.cs
+++ b/src/UltimatePDF_ExternalLogic/Utils/RestSender.cs
@@ -1,56 +1,59 @@
 using System;
+using System.Diagnostics;
 using System.IO;
 using System.Net.Http;
 using System.Threading.Tasks;
 using OutSystems.UltimatePDF_ExternalLogic.Management.Troubleshooting;
 using OutSystems.UltimatePDF_ExternalLogic.Structures;
 
-namespace UltimatePDF_ExternalLogic.Utils {
-    internal class RestSender : IDisposable {
-        private readonly RestCaller restCaller;
-        private readonly Logger logger;
-        private readonly HttpClient client;
+namespace UltimatePDF_ExternalLogic.Utils;
+internal class RestSender : IDisposable {
+    private readonly RestCaller restCaller;
+    private readonly Logger logger;
+    private readonly HttpClient client;
 
-        public RestSender(RestCaller restCaller, Logger logger)
-            : this(restCaller, logger, new HttpClientHandler()) { }
+    public RestSender(RestCaller restCaller, Logger logger)
+        : this(restCaller, logger, new HttpClientHandler()) { }
 
-        internal RestSender(RestCaller restCaller, Logger logger, HttpMessageHandler handler) {
-            this.restCaller = restCaller;
-            this.logger = logger;
-            client = new HttpClient(handler);
-        }
+    internal RestSender(RestCaller restCaller, Logger logger, HttpMessageHandler handler) {
+        this.restCaller = restCaller;
+        this.logger = logger;
+        client = new HttpClient(handler);
+    }
 
-        internal async Task RestSendPDFAsync(byte[] pdf) {
-            var restEndpoint = UrlUtils.BuildUrl(restCaller.BaseUrl, restCaller.Module, restCaller.StorePath);
+    internal async Task RestSendPDFAsync(byte[] pdf) {
+        using var activity = Activity.Current?.Source.StartActivity("RestSender.RestSendPDFAsync");
+        var restEndpoint = UrlUtils.BuildUrl(restCaller.BaseUrl, restCaller.Module, restCaller.StorePath);
 
-            logger.Log($"Sending the generated PDF using a REST API. Calling to {restEndpoint}.");
+        logger.Log($"Sending the generated PDF using a REST API. Calling to {restEndpoint}.");
 
-            await RestCall(restEndpoint, restCaller.Token, "application/pdf", pdf);
+        await RestCall(restEndpoint, restCaller.Token, "application/pdf", pdf);
 
-            logger.Log($"PDF successfully sent via REST API.");
-        }
+        logger.Log($"PDF successfully sent via REST API.");
+    }
 
-        internal async Task RestSendLogs() {
-            var restEndpoint = UrlUtils.BuildUrl(restCaller.BaseUrl, restCaller.Module, restCaller.LogPath);
+    internal async Task RestSendLogs() {
+        using var activity = Activity.Current?.Source.StartActivity("RestSender.RestSendLogs");
+        var restEndpoint = UrlUtils.BuildUrl(restCaller.BaseUrl, restCaller.Module, restCaller.LogPath);
 
-            logger.Log($"Sending the generated Logs using a REST API. Calling to {restEndpoint}.");
+        logger.Log($"Sending the generated Logs using a REST API. Calling to {restEndpoint}.");
 
-            await RestCall(restEndpoint, restCaller.Token, "application/zip", logger.GetZipFile());
+        await RestCall(restEndpoint, restCaller.Token, "application/zip", logger.GetZipFile());
 
-            logger.Log($"Logs successfully sent via REST API.");
-        }
+        logger.Log($"Logs successfully sent via REST API.");
+    }
 
-        private async Task RestCall(string endpoint, string token, string contentType, byte[] binary) {
-            using var request = new HttpRequestMessage(HttpMethod.Post, endpoint);
-            request.Headers.Add("Authorization", $"Bearer {token}");
-            request.Content = new StreamContent(new MemoryStream(binary));
-            request.Content.Headers.Add("Content-Type", contentType);
-            using var response = await client.SendAsync(request);
-            response.EnsureSuccessStatusCode();
-        }
+    private async Task RestCall(string endpoint, string token, string contentType, byte[] binary) {
+        using var activity = Activity.Current?.Source.StartActivity("RestSender.RestCall");
+        using var request = new HttpRequestMessage(HttpMethod.Post, endpoint);
+        request.Headers.Add("Authorization", $"Bearer {token}");
+        request.Content = new StreamContent(new MemoryStream(binary));
+        request.Content.Headers.Add("Content-Type", contentType);
+        using var response = await client.SendAsync(request);
+        response.EnsureSuccessStatusCode();
+    }
 
-        public void Dispose() {
-            client.Dispose();
-        }
+    public void Dispose() {
+        client.Dispose();
     }
 }
diff --git a/src/UltimatePDF_ExternalLogic/Utils/S3Sender.cs b/src/UltimatePDF_ExternalLogic/Utils/S3Sender.cs
index 27362c1..e7b5064 100644
--- a/src/UltimatePDF_ExternalLogic/Utils/S3Sender.cs
+++ b/src/UltimatePDF_ExternalLogic/Utils/S3Sender.cs
@@ -1,54 +1,56 @@
-using System.Net.Http;
+using System.Diagnostics;
+using System.Net.Http;
 using System.Threading.Tasks;
 using OutSystems.UltimatePDF_ExternalLogic.Management.Troubleshooting;
 
-namespace UltimatePDF_ExternalLogic.Utils {
-    internal class S3Sender {
-        private readonly string pdfPreSignedUrl;
-        private readonly string logsPreSignedUrl;
-        private readonly Logger logger;
+namespace UltimatePDF_ExternalLogic.Utils;
+internal class S3Sender {
+    private readonly string pdfPreSignedUrl;
+    private readonly string logsPreSignedUrl;
+    private readonly Logger logger;
 
-        public S3Sender(string pdfPreSignedUrl, string logsPreSignedUrl, Logger logger) {
-            this.pdfPreSignedUrl = pdfPreSignedUrl;
-            this.logsPreSignedUrl = logsPreSignedUrl;
-            this.logger = logger;
-        }
-
-        internal async Task S3SendPDFAsync(byte[] pdf) {
-            if(string.IsNullOrEmpty(this.pdfPreSignedUrl)) {
-                logger.Log("The PreSigned URL to store the PDF is null or empty.");
-                return;
-            }
+    public S3Sender(string pdfPreSignedUrl, string logsPreSignedUrl, Logger logger) {
+        this.pdfPreSignedUrl = pdfPreSignedUrl;
+        this.logsPreSignedUrl = logsPreSignedUrl;
+        this.logger = logger;
+    }
 
-            if(pdf == null || pdf.Length == 0) {
-                logger.Log("The PDF binary is null or empty.");
-                return;
-            }
+    internal async Task S3SendPDFAsync(byte[] pdf) {
+        using var activity = Activity.Current?.Source.StartActivity("S3Sender.S3SendPDFAsync");
+        if(string.IsNullOrEmpty(this.pdfPreSignedUrl)) {
+            logger.Log("The PreSigned URL to store the PDF is null or empty.");
+            return;
+        }
 
-            logger.Log($"Sending the generated PDF to S3. Calling to {pdfPreSignedUrl}.");
+        if(pdf == null || pdf.Length == 0) {
+            logger.Log("The PDF binary is null or empty.");
+            return;
+        }
 
-            using (HttpClient client = new HttpClient()) {
-                HttpResponseMessage response = await client.PutAsync(pdfPreSignedUrl, new ByteArrayContent(pdf));
-                response.EnsureSuccessStatusCode();
-            }
+        logger.Log($"Sending the generated PDF to S3. Calling to {pdfPreSignedUrl}.");
 
-            logger.Log($"PDF successfully sent to S3.");
+        using (HttpClient client = new HttpClient()) {
+            HttpResponseMessage response = await client.PutAsync(pdfPreSignedUrl, new ByteArrayContent(pdf));
+            response.EnsureSuccessStatusCode();
         }
 
-        internal async Task S3SendLogsAsync() {
-            if (string.IsNullOrEmpty(this.logsPreSignedUrl)) {
-                logger.Log("The PreSigned URL to store the PDF is null or empty.");
-                return;
-            }
+        logger.Log($"PDF successfully sent to S3.");
+    }
 
-            logger.Log($"Sending the generated Logs to S3. Calling to {logsPreSignedUrl}.");
+    internal async Task S3SendLogsAsync() {
+        using var activity = Activity.Current?.Source.StartActivity("S3Sender.S3SendLogsAsync");
+        if (string.IsNullOrEmpty(this.logsPreSignedUrl)) {
+            logger.Log("The PreSigned URL to store the PDF is null or empty.");
+            return;
+        }
 
-            using (HttpClient client = new HttpClient()) {
-                HttpResponseMessage response = await client.PutAsync(logsPreSignedUrl, new ByteArrayContent(logger.GetZipFile()));
-                response.EnsureSuccessStatusCode();
-            }
+        logger.Log($"Sending the generated Logs to S3. Calling to {logsPreSignedUrl}.");
 
-            logger.Log($"Logs successfully sent to S3.");
+        using (HttpClient client = new HttpClient()) {
+            HttpResponseMessage response = await client.PutAsync(logsPreSignedUrl, new ByteArrayContent(logger.GetZipFile()));
+            response.EnsureSuccessStatusCode();
         }
+
+        logger.Log($"Logs successfully sent to S3.");
     }
 }
diff --git a/src/UltimatePDF_ExternalLogic/Utils/UrlUtils.cs b/src/UltimatePDF_ExternalLogic/Utils/UrlUtils.cs
index b142d11..373ab2d 100644
--- a/src/UltimatePDF_ExternalLogic/Utils/UrlUtils.cs
+++ b/src/UltimatePDF_ExternalLogic/Utils/UrlUtils.cs
@@ -1,60 +1,64 @@
 using System;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
 
-namespace UltimatePDF_ExternalLogic.Utils {
-    internal class UrlUtils {
-        internal static string BuildUrl(string baseUrl, string module, string path) {
-            var urlBuilder = new StringBuilder();
-            
-            if (!baseUrl.StartsWith("https://") && !baseUrl.StartsWith("http://")) {
-                urlBuilder.Append("https://");
-            }
-            
-            urlBuilder.Append(RemoveEndDash(baseUrl));
-            
-            if(!module.StartsWith("/")) {
-                urlBuilder.Append('/');
-            }
-
-            urlBuilder.Append(RemoveEndDash(module));
-
-            if (!path.StartsWith("/")) {
-                urlBuilder.Append('/');
-            }
-
-            return urlBuilder.Append(path).ToString();
+namespace UltimatePDF_ExternalLogic.Utils;
+internal class UrlUtils {
+    internal static string BuildUrl(string baseUrl, string module, string path) {
+        using var activity = Activity.Current?.Source.StartActivity("UrlUtils.BuildUrl");
+        var urlBuilder = new StringBuilder();
+        
+        if (!baseUrl.StartsWith("https://") && !baseUrl.StartsWith("http://")) {
+            urlBuilder.Append("https://");
         }
-
-        internal static string GetFilenameFromUrl(string url) {
-            return new Uri(url).Segments.Last().ToString();
+        
+        urlBuilder.Append(RemoveEndDash(baseUrl));
+        
+        if(!module.StartsWith("/")) {
+            urlBuilder.Append('/');
         }
 
-        private static string RemoveEndDash(string str) {
-            return str.EndsWith("/") ? str.Remove(str.Length-1) : str;
+        urlBuilder.Append(RemoveEndDash(module));
+
+        if (!path.StartsWith("/")) {
+            urlBuilder.Append('/');
         }
 
-        /// <summary>
-        /// Validates if a string is a well-formed, absolute URI with an HTTP or HTTPS scheme.
-        /// </summary>
-        /// <param name="uriString">The string to validate.</param>
-        /// <returns>True if the string is a valid HTTP or HTTPS URI; otherwise, false.</returns>
-        internal static bool IsValidHttpsUri(string? uriString) {
-            // 1. Check for null or empty string.
-            // An empty or null string is not a valid URI.
-            if (string.IsNullOrWhiteSpace(uriString)) {
-                return false;
-            }
-
-            // 2. Use Uri.TryCreate for safe parsing.
-            // This method is secure because it doesn't throw exceptions for malformed strings.
-            // We specify UriKind.Absolute to ensure it's a full URI (e.g., "https://example.com")
-            // and not a relative one (e.g., "/path/to/resource").
-            bool isWellFormedUri = Uri.TryCreate(uriString, UriKind.Absolute, out Uri? uriResult);
-
-            // 3. Check the scheme.
-            // uriResult will be null if TryCreate fails.
-            return isWellFormedUri && (uriResult?.Scheme == Uri.UriSchemeHttps || uriResult?.Scheme == Uri.UriSchemeHttp);
+        return urlBuilder.Append(path).ToString();
+    }
+
+    internal static string GetFilenameFromUrl(string url) {
+        using var activity = Activity.Current?.Source.StartActivity("UrlUtils.GetFilenameFromUrl");
+        return new Uri(url).Segments.Last().ToString();
+    }
+
+    private static string RemoveEndDash(string str) {
+        using var activity = Activity.Current?.Source.StartActivity("UrlUtils.RemoveEndDash");
+        return str.EndsWith("/") ? str.Remove(str.Length-1) : str;
+    }
+
+    /// <summary>
+    /// Validates if a string is a well-formed, absolute URI with an HTTP or HTTPS scheme.
+    /// </summary>
+    /// <param name="uriString">The string to validate.</param>
+    /// <returns>True if the string is a valid HTTP or HTTPS URI; otherwise, false.</returns>
+    internal static bool IsValidHttpsUri(string? uriString) {
+        using var activity = Activity.Current?.Source.StartActivity("UrlUtils.IsValidHttpsUri");
+        // 1. Check for null or empty string.
+        // An empty or null string is not a valid URI.
+        if (string.IsNullOrWhiteSpace(uriString)) {
+            return false;
         }
+
+        // 2. Use Uri.TryCreate for safe parsing.
+        // This method is secure because it doesn't throw exceptions for malformed strings.
+        // We specify UriKind.Absolute to ensure it's a full URI (e.g., "https://example.com")
+        // and not a relative one (e.g., "/path/to/resource").
+        bool isWellFormedUri = Uri.TryCreate(uriString, UriKind.Absolute, out Uri? uriResult);
+
+        // 3. Check the scheme.
+        // uriResult will be null if TryCreate fails.
+        return isWellFormedUri && (uriResult?.Scheme == Uri.UriSchemeHttps || uriResult?.Scheme == Uri.UriSchemeHttp);
     }
 }