diff --git a/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/POM/POMLearner.cs b/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/POM/POMLearner.cs
index 458cb1a3cc..9d419f6350 100644
--- a/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/POM/POMLearner.cs
+++ b/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/POM/POMLearner.cs
@@ -93,14 +93,14 @@ private async Task LearnHtmlNodeChildElements(HtmlNode htmlNode, Predicate<HtmlN
                     {
                         childElement = await CreateHTMLElementInfoAsync(childNode, browserElement);
                     }
-                }
 
-                if (childElement != null && shouldLearnNode(childNode))
-                {
-                    learnedElements.Add(childElement);
-                    if (childElements != null)
+                    if (childElement != null && shouldLearnNode(childNode))
                     {
-                        childElements.Add(childElement);
+                        learnedElements.Add(childElement);
+                        if (childElements != null)
+                        {
+                            childElements.Add(childElement);
+                        }
                     }
                 }
 
@@ -152,11 +152,15 @@ private static bool IsNodeLearnable(HtmlNode htmlNode)
 
         private static bool ShouldLearnFormChildNode(HtmlNode htmlNode)
         {
-            string tagName = htmlNode.Name ?? "";
-            if (tagName.StartsWith("input", StringComparison.OrdinalIgnoreCase) || tagName.StartsWith("button", StringComparison.OrdinalIgnoreCase))
+            try
             {
-                return true;
+                string tagName = htmlNode.Name ?? "";
+                if (tagName.StartsWith("input", StringComparison.OrdinalIgnoreCase) || tagName.StartsWith("button", StringComparison.OrdinalIgnoreCase))
+                {
+                    return true;
+                }
             }
+            catch (Exception) { }
 
             return false;
         }
@@ -745,7 +749,7 @@ internal static string GenerateRelativeXPathFromHTMLElementInfo(HTMLElementInfo
 
             try
             {
-                return Convert.ToBase64String(await browserElement.ScreenshotAsync().WaitAsync(timeout: TimeSpan.FromSeconds(3)));
+                return Convert.ToBase64String(await browserElement.ScreenshotAsync());
             }
             catch(Exception)
             {
diff --git a/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Playwright/PlaywrightBrowserElement.cs b/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Playwright/PlaywrightBrowserElement.cs
index 1641a734fc..13ee59e483 100644
--- a/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Playwright/PlaywrightBrowserElement.cs
+++ b/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Playwright/PlaywrightBrowserElement.cs
@@ -819,26 +819,33 @@ public async Task AssertTypeAttributeAsync(string expected)
 
         public Task<byte[]> ScreenshotAsync()
         {
+            int timeout = 3000;
             if (_playwrightLocator != null)
             {
-                return ScreenshotAsync(_playwrightLocator);
+                return ScreenshotAsync(_playwrightLocator, timeout);
             }
             else
             {
-                return ScreenshotAsync(_playwrightElementHandle!);
+                return ScreenshotAsync(_playwrightElementHandle!, timeout);
             }
         }
 
-        public Task<byte[]> ScreenshotAsync(IPlaywrightLocator playwrightLocator)
+        public Task<byte[]> ScreenshotAsync(IPlaywrightLocator playwrightLocator, int timeout)
         {
             ArgumentNullException.ThrowIfNull(playwrightLocator, nameof(playwrightLocator));
-            return playwrightLocator.ScreenshotAsync();
+            return playwrightLocator.ScreenshotAsync(new LocatorScreenshotOptions()
+            {
+                Timeout = timeout,
+            });
         }
 
-        public Task<byte[]> ScreenshotAsync(IPlaywrightElementHandle playwrightElementHandle)
+        public Task<byte[]> ScreenshotAsync(IPlaywrightElementHandle playwrightElementHandle, int timeout)
         {
             ArgumentNullException.ThrowIfNull(playwrightElementHandle, nameof(playwrightElementHandle));
-            return playwrightElementHandle.ScreenshotAsync();
+            return playwrightElementHandle.ScreenshotAsync(new ElementHandleScreenshotOptions()
+            {
+                Timeout = timeout,
+            });
         }
 
         public async Task<IBrowserShadowRoot?> ShadowRootAsync()
diff --git a/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Playwright/PlaywrightDriver.cs b/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Playwright/PlaywrightDriver.cs
index 93779b7ece..8c655a56e9 100644
--- a/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Playwright/PlaywrightDriver.cs
+++ b/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Playwright/PlaywrightDriver.cs
@@ -24,7 +24,6 @@
 using GingerCore.Actions.VisualTesting;
 using GingerCoreNET.SolutionRepositoryLib.RepositoryObjectsLib.PlatformsLib;
 using amdocs.ginger.GingerCoreNET;
-using Amdocs.Ginger.CoreNET.Drivers.CoreDrivers.Web.Selenium;
 
 #nullable enable
 namespace Amdocs.Ginger.CoreNET.Drivers.CoreDrivers.Web.Playwright
diff --git a/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Selenium/SeleniumDriver.cs b/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Selenium/SeleniumDriver.cs
index 78cf02f33d..5b682074c0 100644
--- a/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Selenium/SeleniumDriver.cs
+++ b/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Selenium/SeleniumDriver.cs
@@ -27,7 +27,6 @@ limitations under the License.
 using Amdocs.Ginger.CoreNET.Application_Models.Execution.POM;
 using Amdocs.Ginger.CoreNET.Drivers.CoreDrivers.Web;
 using Amdocs.Ginger.CoreNET.Drivers.CoreDrivers.Mobile;
-using Amdocs.Ginger.CoreNET.Drivers.CoreDrivers.Web.Selenium;
 using Amdocs.Ginger.CoreNET.Execution;
 using Amdocs.Ginger.CoreNET.GeneralLib;
 using Amdocs.Ginger.CoreNET.RunLib;
diff --git a/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Selenium/ShadowDOM.cs b/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/ShadowDOM.cs
similarity index 94%
rename from Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Selenium/ShadowDOM.cs
rename to Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/ShadowDOM.cs
index 1b21118a4a..e2b28c6f37 100644
--- a/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Selenium/ShadowDOM.cs
+++ b/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/ShadowDOM.cs
@@ -22,7 +22,7 @@ limitations under the License.
 using System.Collections.Generic;
 using System.Text;
 
-namespace Amdocs.Ginger.CoreNET.Drivers.CoreDrivers.Web.Selenium
+namespace Amdocs.Ginger.CoreNET.Drivers.CoreDrivers.Web
 {
     public class ShadowDOM
     {
@@ -48,7 +48,7 @@ public ISearchContext GetShadowRootIfExists(ISearchContext webElement)
                 return null;
             }
         }
-        
+
         /// <summary>
         /// Gets the inner HTML of the giver root
         /// </summary>
@@ -64,14 +64,14 @@ public string GetHTML(ISearchContext root, IWebDriver driver)
 
         public string ConvertXPathToCssSelector(string XPath)
         {
-            IEnumerable<string> tags = XPath.Split('/').Where((x)=>!string.IsNullOrEmpty(x));
+            IEnumerable<string> tags = XPath.Split('/').Where((x) => !string.IsNullOrEmpty(x));
             StringBuilder strBuilder = new();
 
             foreach (string tag in tags)
             {
                 int indexOfOpenBracket = tag.IndexOf('[');
 
-                if(indexOfOpenBracket!= -1)
+                if (indexOfOpenBracket != -1)
                 {
                     string tagName = tag.Substring(0, indexOfOpenBracket);
                     string count = tag.Substring(indexOfOpenBracket);