diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000..2521cd6e
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,17 @@
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    cooldown:
+      default-days: 2
+    allow:
+      - dependency-type: "production"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    cooldown:
+      default-days: 2
diff --git a/examples/ui5-js-app/jsconfig.json b/examples/ui5-js-app/jsconfig.json
index 3c53f59a..c915f74b 100644
--- a/examples/ui5-js-app/jsconfig.json
+++ b/examples/ui5-js-app/jsconfig.json
@@ -5,7 +5,7 @@
       "@openui5/types",
       "@wdio/globals/types",
       "@wdio/mocha-framework",
-      "wdio-ui5-service/dist/cjs",
+      "wdio-ui5-service",
       "expect-webdriverio"
     ]
   }
diff --git a/examples/ui5-js-app/webapp/controller/Main.controller.js b/examples/ui5-js-app/webapp/controller/Main.controller.js
index 9d442ed4..70c3833a 100644
--- a/examples/ui5-js-app/webapp/controller/Main.controller.js
+++ b/examples/ui5-js-app/webapp/controller/Main.controller.js
@@ -49,6 +49,13 @@ sap.ui.define(
             onSearch(oEvent) {
                 this.getView().byId("idSearchResult").setText(oEvent.getSource().getValue())
             },
+            onKeepFocusInputChange(oEvent) {
+                this.getView().byId("idKeepFocusResult").setText(oEvent.getSource().getValue())
+            },
+            onClearTextInputChange(oEvent) {
+                console.log(oEvent.getSource().getValue())
+                this.getView().byId("idClearTextResult").setText(oEvent.getSource().getValue())
+            },
             onTest(oEvent) {
                 this.onBoo(oEvent)
             },
diff --git a/examples/ui5-js-app/webapp/test/e2e/allControlsInteraction.test.js b/examples/ui5-js-app/webapp/test/e2e/allControlsInteraction.test.js
new file mode 100644
index 00000000..49ec792a
--- /dev/null
+++ b/examples/ui5-js-app/webapp/test/e2e/allControlsInteraction.test.js
@@ -0,0 +1,65 @@
+const Main = require("./pageObjects/Main")
+
+describe("allControls interaction", () => {
+    before(async () => {
+        await Main.open()
+    })
+
+    it("should press a specific button from allControls", async () => {
+        const selector = {
+            selector: {
+                controlType: "sap.m.Button",
+                viewName: "test.Sample.view.Main",
+                interaction: "root"
+            }
+        }
+
+        const buttons = await browser.allControls(selector)
+        // Find the button with a specific ID among all buttons
+
+        let targetButton
+        for (const btn of buttons) {
+            const id = await btn.getId()
+            if (id.includes("idIaSync")) {
+                targetButton = btn
+                break
+            }
+        }
+
+        expect(targetButton).toBeDefined()
+        // The fix ensures that .press() uses the specific ID of this control instance
+        await targetButton.press()
+
+        // Verification: we can check if the button is still there or some other state
+        // In Main.controller.js, onPress shows a MessageToast.
+        // Hard to verify MessageToast without further setup, but we can at least ensure the call doesn't fail
+        // and targets the right element.
+        expect(await targetButton.getVisible()).toBeTruthy()
+    })
+
+    it("should enter text into a specific input from allControls", async () => {
+        const selector = {
+            selector: {
+                controlType: "sap.m.Input",
+                viewName: "test.Sample.view.Main",
+                interaction: "root"
+            }
+        }
+
+        const inputs = await browser.allControls(selector)
+        let targetInput
+        for (const input of inputs) {
+            const id = await input.getId()
+            if (id.includes("mainUserInput")) {
+                targetInput = input
+                break
+            }
+        }
+
+        expect(targetInput).toBeDefined()
+        const testText = "Typed from allControls"
+        await targetInput.enterText(testText)
+
+        expect(await targetInput.getValue()).toEqual(testText)
+    })
+})
diff --git a/examples/ui5-js-app/webapp/test/e2e/allControlsPress.test.js b/examples/ui5-js-app/webapp/test/e2e/allControlsPress.test.js
new file mode 100644
index 00000000..9e7488f9
--- /dev/null
+++ b/examples/ui5-js-app/webapp/test/e2e/allControlsPress.test.js
@@ -0,0 +1,27 @@
+const Other = require("./pageObjects/Other")
+
+describe("ui5 basic, press all buttons", () => {
+    before(async () => {
+        await Other.open()
+    })
+
+    it("test with pressing multiple checkboxes", async () => {
+        const selector = {
+            selector: {
+                controlType: "sap.m.CheckBox",
+                viewName: "test.Sample.view.Other",
+                interaction: "press"
+            }
+        }
+        const checkboxList = await browser.allControls(selector)
+
+        expect(checkboxList.length).toEqual(9)
+
+        for await (let checkbox of checkboxList) {
+            const selectedBeforePress = await checkbox.getSelected()
+            await checkbox.press()
+            const selectedAfterPress = await checkbox.getSelected()
+            expect(selectedAfterPress).toEqual(!selectedBeforePress)
+        }
+    })
+})
diff --git a/examples/ui5-js-app/webapp/test/e2e/ancestor-descendant.test.js b/examples/ui5-js-app/webapp/test/e2e/ancestor-descendant.test.js
new file mode 100644
index 00000000..ed147826
--- /dev/null
+++ b/examples/ui5-js-app/webapp/test/e2e/ancestor-descendant.test.js
@@ -0,0 +1,95 @@
+const Main = require("./pageObjects/Main")
+
+describe("ancestor and descendant selector resolution", () => {
+    before(async () => {
+        await Main.open()
+    })
+
+    it("should find a control using an ancestor selector (asControl)", async () => {
+        const selector = {
+            selector: {
+                controlType: "sap.m.Title",
+                ancestor: {
+                    controlType: "sap.m.Panel",
+                    properties: {
+                        headerText: "Header Text"
+                    }
+                }
+            }
+        }
+        const title = await browser.asControl(selector)
+        expect(await title.getText()).toBe("Custom Toolbar with a header text")
+    })
+
+    it("should find a control using a descendant selector (asControl)", async () => {
+        const selector = {
+            selector: {
+                controlType: "sap.m.Panel",
+                descendant: {
+                    controlType: "sap.m.Title",
+                    properties: {
+                        text: "Custom Toolbar with a header text"
+                    }
+                }
+            }
+        }
+        const panel = await browser.asControl(selector)
+        expect(await panel.getHeaderText()).toBe("Header Text")
+    })
+
+    it("should find all controls using an ancestor selector (allControls)", async () => {
+        const selector = {
+            wdio_ui5_key: "allButtonsWithAncestor",
+            selector: {
+                controlType: "sap.m.Button",
+                ancestor: {
+                    id: "page",
+                    viewName: "test.Sample.view.Main"
+                }
+            }
+        }
+        const buttons = await browser.allControls(selector)
+        expect(Array.isArray(buttons)).toBe(true)
+        expect(buttons.length).toBe(9)
+    })
+
+    it("should find all controls using a descendant selector (allControls)", async () => {
+        const selector = {
+            wdio_ui5_key: "allPanelsWithDescendant",
+            selector: {
+                controlType: "sap.m.Panel",
+                descendant: {
+                    controlType: "sap.m.Title",
+                    properties: {
+                        text: "Custom Toolbar with a header text"
+                    }
+                }
+            }
+        }
+        const panels = await browser.allControls(selector)
+        expect(Array.isArray(panels)).toBe(true)
+        expect(panels.length).toBe(1)
+        expect(await panels[0].getHeaderText()).toBe("Header Text")
+    })
+
+    it("should find a control using nested ancestor/descendant selectors", async () => {
+        // Find the Title inside the Panel, which is inside the Page
+        const selector = {
+            selector: {
+                controlType: "sap.m.Title",
+                properties: {
+                    text: "Custom Toolbar with a header text"
+                },
+                ancestor: {
+                    controlType: "sap.m.Panel",
+                    ancestor: {
+                        id: "page",
+                        viewName: "test.Sample.view.Main"
+                    }
+                }
+            }
+        }
+        const title = await browser.asControl(selector)
+        expect(await title.getText()).toBe("Custom Toolbar with a header text")
+    })
+})
diff --git a/examples/ui5-js-app/webapp/test/e2e/interaction.test.js b/examples/ui5-js-app/webapp/test/e2e/interaction.test.js
index b619e8e8..73b9d5ab 100644
--- a/examples/ui5-js-app/webapp/test/e2e/interaction.test.js
+++ b/examples/ui5-js-app/webapp/test/e2e/interaction.test.js
@@ -68,4 +68,158 @@ describe("interaction + binding", () => {
 
         expect(await ui5Input.getProperty("value")).toEqual(inputText)
     })
+
+    it("enterText() with pressEnterKey:true triggers search event", async () => {
+        const searchFieldSelector = {
+            selector: {
+                id: "idSearchfield",
+                viewName: viewName,
+                interaction: "focus"
+            }
+        }
+        const searchResultSelector = {
+            selector: {
+                id: "idSearchResult",
+                viewName: viewName
+            }
+        }
+
+        const searchTerm = "Alice"
+        const searchField = await browser.asControl(searchFieldSelector)
+        await searchField.enterText(searchTerm, { pressEnterKey: true })
+
+        const searchResult = await browser.asControl(searchResultSelector)
+        expect(await searchResult.getProperty("text")).toEqual(searchTerm)
+    })
+
+    it("enterText() with pressEnterKey:false does not trigger search event", async () => {
+        const searchFieldSelector = {
+            selector: {
+                id: "idSearchfield",
+                viewName: viewName
+            }
+        }
+        const searchResultSelector = {
+            selector: {
+                id: "idSearchResult",
+                viewName: viewName
+            }
+        }
+
+        // capture the current search result before typing (set by the previous test)
+        const searchResult = await browser.asControl(searchResultSelector)
+        const previousResult = await searchResult.getProperty("text")
+
+        const searchTerm = "Charlie"
+        const searchField = await browser.asControl(searchFieldSelector)
+        // pressEnterKey:false — text is entered but Enter is not pressed, so onSearch is not fired
+        await searchField.enterText(searchTerm, { pressEnterKey: false, keepFocus: true })
+
+        // result text must remain unchanged since the search event was not triggered
+        expect(await searchResult.getProperty("text")).toEqual(previousResult)
+    })
+
+    it("enterText() with keepFocus:false blurs the input and triggers change event", async () => {
+        const inputSelector = {
+            selector: {
+                id: "idKeepFocusInput",
+                viewName: viewName,
+                interaction: "focus"
+            }
+        }
+        const resultSelector = {
+            selector: {
+                id: "idKeepFocusResult",
+                viewName: viewName
+            }
+        }
+
+        const inputText = "keep focus off"
+        const input = await browser.asControl(inputSelector)
+        // keepFocus:false (default) — focus is removed after enterText, which fires the change event
+        await input.enterText(inputText, { keepFocus: false })
+
+        const result = await browser.asControl(resultSelector)
+        expect(await result.getProperty("text")).toEqual(inputText)
+    })
+
+    it("enterText() with keepFocus:true retains focus and does not trigger change event", async () => {
+        const inputSelector = {
+            selector: {
+                id: "idKeepFocusInput",
+                viewName: viewName,
+                interaction: "focus"
+            }
+        }
+        const resultSelector = {
+            selector: {
+                id: "idKeepFocusResult",
+                viewName: viewName
+            }
+        }
+
+        // capture current result (set by previous test)
+        const result = await browser.asControl(resultSelector)
+        const previousResult = await result.getProperty("text")
+
+        const inputText = "keep focus on"
+        const input = await browser.asControl(inputSelector)
+        // keepFocus:true — focus is retained after enterText, so no blur occurs and change event does not fire
+        await input.enterText(inputText, { keepFocus: true })
+
+        // result text must remain unchanged since the change event was not triggered
+        expect(await result.getProperty("text")).toEqual(previousResult)
+    })
+
+    it("enterText() with clearTextFirst:true replaces existing input value", async () => {
+        const inputSelector = {
+            selector: {
+                id: "idClearTextInput",
+                viewName: viewName,
+                interaction: "focus"
+            }
+        }
+        const resultSelector = {
+            selector: {
+                id: "idClearTextResult",
+                viewName: viewName
+            }
+        }
+
+        const appendedText = " World"
+        const input = await browser.asControl(inputSelector)
+        // clearTextFirst:true (default) — existing "Hello" is cleared before typing, so only appended text remains
+        await input.enterText(appendedText, { clearTextFirst: true })
+
+        const result = await browser.asControl(resultSelector)
+        expect(await result.getProperty("text")).toEqual(appendedText)
+    })
+
+    it.skip("enterText() with clearTextFirst:false appends to existing input value", async () => {
+        // TODO: perhaps capture UI5 event in a browser.execute command to ensure whether this has been triggered
+        const inputSelector = {
+            selector: {
+                id: "idClearTextInput",
+                viewName: viewName,
+                interaction: "focus"
+            }
+        }
+        const resultSelector = {
+            selector: {
+                id: "idClearTextResult",
+                viewName: viewName
+            }
+        }
+
+        const initialText = "Hello"
+        const appendedText = " World"
+        // restore a known value first (clearTextFirst:true so we start clean)
+        const input = await browser.asControl(inputSelector)
+        await input.enterText(initialText, { clearTextFirst: true })
+        // clearTextFirst:false — existing "Hello" is kept and new text is appended after it
+        await input.enterText(appendedText, { clearTextFirst: false })
+
+        const result = await browser.asControl(resultSelector)
+        expect(await result.getProperty("text")).toEqual(initialText + appendedText)
+    })
 })
diff --git a/examples/ui5-js-app/webapp/test/e2e/press.test.js b/examples/ui5-js-app/webapp/test/e2e/press.test.js
index 501a5815..fa38525e 100644
--- a/examples/ui5-js-app/webapp/test/e2e/press.test.js
+++ b/examples/ui5-js-app/webapp/test/e2e/press.test.js
@@ -62,7 +62,8 @@ describe("custom wdi5 press event", async () => {
                 id: "container-Sample---Main--idDateTime-icon"
             }
         })
-        await element.fireEvent("press")
+        // await element.fireEvent("press")
+        await element.press()
 
         startDate.setDate(startDate.getDate() + 1) // add one day to the start date
         const tomorrowSuffix = startDate.toJSON().substring(0, 10).replaceAll("-", "")
diff --git a/examples/ui5-js-app/webapp/test/e2e/ui5-features-available.test.js b/examples/ui5-js-app/webapp/test/e2e/ui5-features-available.test.js
new file mode 100644
index 00000000..541254a3
--- /dev/null
+++ b/examples/ui5-js-app/webapp/test/e2e/ui5-features-available.test.js
@@ -0,0 +1,95 @@
+// only requiring the service for late inject/init
+const { mock } = require("node:test")
+const { default: _ui5Service } = require("wdio-ui5-service")
+const ui5Service = new _ui5Service()
+
+/**
+ * All tests have the same setup and initial assertions
+ */
+async function setupMockInjectAssert(ui5Version) {
+    let ui5Features = await browser.execute(() => window.wdi5Ui5FeaturesAvailable)
+    expect(ui5Features).toBeUndefined()
+    const browserMock = mock.method(browser, "getUI5Version", () => ui5Version)
+    await ui5Service.injectUI5()
+    browserMock.mock.restore()
+    ui5Features = await browser.execute(() => window.wdi5Ui5FeaturesAvailable)
+    expect(ui5Features.version).toBe(ui5Version)
+    return ui5Features
+}
+
+describe("ui5 features available", () => {
+    beforeEach(async () => {
+        // Start fresh every test
+        await browser.url("http://localhost:8081/index.html")
+    })
+
+    it("should show UI5 features available for the UI5 v1.71", async () => {
+        const ui5Features = await setupMockInjectAssert("1.71.0")
+        expect(ui5Features.useFetchWaiter).toBeFalsy()
+        expect(ui5Features.useGetComponentById).toBeFalsy()
+        expect(ui5Features.useUI5ElementClosestTo).toBeFalsy()
+        expect(ui5Features.useOldHashChanger).toBeTruthy()
+        expect(ui5Features.useOldDoubleLeadingSlash).toBeTruthy()
+        expect(ui5Features.useOldMatcherAPI).toBeTruthy()
+    })
+
+    it("should show UI5 features available for the UI5 v1.74", async () => {
+        const ui5Features = await setupMockInjectAssert("1.74.0")
+        expect(ui5Features.useFetchWaiter).toBeFalsy()
+        expect(ui5Features.useGetComponentById).toBeFalsy()
+        expect(ui5Features.useUI5ElementClosestTo).toBeFalsy()
+        expect(ui5Features.useOldHashChanger).toBeTruthy()
+        expect(ui5Features.useOldDoubleLeadingSlash).toBeTruthy()
+        expect(ui5Features.useOldMatcherAPI).toBeFalsy()
+    })
+
+    it("should show UI5 features available for the UI5 v1.80", async () => {
+        const ui5Features = await setupMockInjectAssert("1.80.0")
+        expect(ui5Features.useFetchWaiter).toBeFalsy()
+        expect(ui5Features.useGetComponentById).toBeFalsy()
+        expect(ui5Features.useUI5ElementClosestTo).toBeFalsy()
+        expect(ui5Features.useOldHashChanger).toBeFalsy()
+        expect(ui5Features.useOldDoubleLeadingSlash).toBeTruthy()
+        expect(ui5Features.useOldMatcherAPI).toBeFalsy()
+    })
+
+    it("should show UI5 features available for the UI5 v1.107", async () => {
+        const ui5Features = await setupMockInjectAssert("1.107.0")
+        expect(ui5Features.useFetchWaiter).toBeFalsy()
+        expect(ui5Features.useGetComponentById).toBeFalsy()
+        expect(ui5Features.useUI5ElementClosestTo).toBeFalsy()
+        expect(ui5Features.useOldHashChanger).toBeFalsy()
+        expect(ui5Features.useOldDoubleLeadingSlash).toBeFalsy()
+        expect(ui5Features.useOldMatcherAPI).toBeFalsy()
+    })
+
+    it("should show UI5 features available for the UI5 v1.113", async () => {
+        const ui5Features = await setupMockInjectAssert("1.113.0")
+        expect(ui5Features.useFetchWaiter).toBeFalsy()
+        expect(ui5Features.useGetComponentById).toBeFalsy()
+        expect(ui5Features.useUI5ElementClosestTo).toBeTruthy()
+        expect(ui5Features.useOldHashChanger).toBeFalsy()
+        expect(ui5Features.useOldDoubleLeadingSlash).toBeFalsy()
+        expect(ui5Features.useOldMatcherAPI).toBeFalsy()
+    })
+
+    it("should show UI5 features available for the UI5 v1.119", async () => {
+        const ui5Features = await setupMockInjectAssert("1.119.0")
+        expect(ui5Features.useFetchWaiter).toBeTruthy()
+        expect(ui5Features.useGetComponentById).toBeFalsy()
+        expect(ui5Features.useUI5ElementClosestTo).toBeTruthy()
+        expect(ui5Features.useOldHashChanger).toBeFalsy()
+        expect(ui5Features.useOldDoubleLeadingSlash).toBeFalsy()
+        expect(ui5Features.useOldMatcherAPI).toBeFalsy()
+    })
+
+    it("should show UI5 features available for the UI5 v1.136", async () => {
+        const ui5Features = await setupMockInjectAssert("1.136.0")
+        expect(ui5Features.useFetchWaiter).toBeTruthy()
+        expect(ui5Features.useGetComponentById).toBeTruthy()
+        expect(ui5Features.useUI5ElementClosestTo).toBeTruthy()
+        expect(ui5Features.useOldHashChanger).toBeFalsy()
+        expect(ui5Features.useOldDoubleLeadingSlash).toBeFalsy()
+        expect(ui5Features.useOldMatcherAPI).toBeFalsy()
+    })
+})
diff --git a/examples/ui5-js-app/webapp/test/e2e/ui5-late.test.js b/examples/ui5-js-app/webapp/test/e2e/ui5-late.test.js
index 965c5119..b07480f7 100644
--- a/examples/ui5-js-app/webapp/test/e2e/ui5-late.test.js
+++ b/examples/ui5-js-app/webapp/test/e2e/ui5-late.test.js
@@ -5,11 +5,17 @@ const ui5Service = new _ui5Service()
 describe("ui5 basic", () => {
     it('should show a non UI5 page, then advance to a UI5 page and late init "wdi5"', async () => {
         // native wdio functionality - navigates to the wdi5 github page
-        await browser.$("#user-content-wdi5-").waitForExist()
+        const link = await $("=wdi5")
+        await expect(link).toHaveText("wdi5")
         // open local app
         await browser.url("http://localhost:8081/index.html")
+        let hasWdi5InBrowser = await browser.execute(() => !!window.wdi5)
+        expect(hasWdi5InBrowser).toBeFalsy()
+
         // do the late injection
         await ui5Service.injectUI5()
+        hasWdi5InBrowser = await browser.execute(() => !!window.wdi5)
+        expect(hasWdi5InBrowser).toBeTruthy()
     })
 
     it("should verify the caching of the wdi5 config", async () => {
diff --git a/examples/ui5-js-app/webapp/test/wdio-ui5-late.conf.js b/examples/ui5-js-app/webapp/test/wdio-ui5-late.conf.js
index ee2960db..b8a73cdf 100644
--- a/examples/ui5-js-app/webapp/test/wdio-ui5-late.conf.js
+++ b/examples/ui5-js-app/webapp/test/wdio-ui5-late.conf.js
@@ -5,7 +5,7 @@ const _config = {
         skipInjectUI5OnStart: true,
         waitForUI5Timeout: 654321
     },
-    specs: ["e2e/ui5-late.test.js"],
+    specs: ["e2e/ui5-late.test.js", "e2e/ui5-features-available.test.js"],
     baseUrl: "https://github.com/ui5-community/wdi5/"
 }
 
diff --git a/examples/ui5-js-app/webapp/view/Main.view.xml b/examples/ui5-js-app/webapp/view/Main.view.xml
index 09fb4082..84147aec 100644
--- a/examples/ui5-js-app/webapp/view/Main.view.xml
+++ b/examples/ui5-js-app/webapp/view/Main.view.xml
@@ -61,6 +61,14 @@
 					<SearchField id="idSearchfield" value="{testModel>/searchValue}" placeholder="Search..." search="onSearch" />
 					<Text id="idSearchResult" text="" />
 
+					<Label text="keepFocus Input" />
+					<Input id="idKeepFocusInput" value="" change="onKeepFocusInputChange" />
+					<Text id="idKeepFocusResult" text="" />
+
+					<Label text="clearTextFirst Input" />
+					<Input id="idClearTextInput" value="Hello" liveChange="onClearTextInputChange" />
+					<Text id="idClearTextResult" text="" />
+
 					<Label text="sap.m.Select" />
 					<Select id="select" items="{
 						path: 'Countries>/CountriesCollection',
diff --git a/examples/ui5-ts-app/test/e2e/ui5-late.test.ts b/examples/ui5-ts-app/test/e2e/ui5-late.test.ts
index 75d41d72..7a78c99a 100644
--- a/examples/ui5-ts-app/test/e2e/ui5-late.test.ts
+++ b/examples/ui5-ts-app/test/e2e/ui5-late.test.ts
@@ -19,7 +19,7 @@ describe("late inject wdi5", () => {
         // do the late injection
         await wdi5.injectUI5()
         // check if config have been cached properly
-        expect(__wdi5Config.wdi5.waitForUI5Timeout).toBe(654321)
+        expect(__wdi5Config?.wdi5?.waitForUI5Timeout).toBe(654321)
     })
 
     it("wdi5 should subsequently work with UI5 enablement", async () => {
diff --git a/examples/ui5-ts-app/test/tsconfig.json b/examples/ui5-ts-app/test/tsconfig.json
index b545c9ea..3036bf72 100644
--- a/examples/ui5-ts-app/test/tsconfig.json
+++ b/examples/ui5-ts-app/test/tsconfig.json
@@ -1,7 +1,8 @@
 {
   "compilerOptions": {
-    "moduleResolution": "node",
-    "types": ["node", "@sapui5/types", "@wdio/globals/types", "@wdio/mocha-framework", "wdio-ui5-service"],
-    "target": "es2019"
+    "target": "esnext",
+    "module": "esnext",
+    "moduleResolution": "bundler",
+    "types": ["node", "@sapui5/types", "@wdio/globals/types", "@wdio/mocha-framework", "wdio-ui5-service"]
   }
 }
diff --git a/examples/ui5-ts-app/tsconfig.json b/examples/ui5-ts-app/tsconfig.json
index 53915337..e7646439 100644
--- a/examples/ui5-ts-app/tsconfig.json
+++ b/examples/ui5-ts-app/tsconfig.json
@@ -1,11 +1,11 @@
 {
   "compilerOptions": {
-    "target": "ESNext",
-    "module": "ESNext",
-    "moduleResolution": "node",
+    "target": "esnext",
+    "module": "esnext",
+    "moduleResolution": "bundler",
     "skipLibCheck": true,
     "allowJs": true,
-    "strict": true,
+    "strict": false,
     "strictPropertyInitialization": false,
     "rootDir": "./webapp",
     "paths": {
diff --git a/examples/ui5-ts-app/webapp/Component.ts b/examples/ui5-ts-app/webapp/Component.ts
index 93ef3314..7e055c84 100644
--- a/examples/ui5-ts-app/webapp/Component.ts
+++ b/examples/ui5-ts-app/webapp/Component.ts
@@ -1,5 +1,5 @@
 import UIComponent from "sap/ui/core/UIComponent"
-import support from "sap/ui/Device"
+import Device from "sap/ui/Device"
 
 /**
  * @namespace test.Sample.tsapp
@@ -34,7 +34,8 @@ export default class Component extends UIComponent {
                 document.body.classList.contains("sapUiSizeCompact")
             ) {
                 this.contentDensityClass = ""
-            } else if (!support.touch) {
+                // @ ts-expect-error: Property 'touch' does not exist on type 'Device'
+            } else if (!Device.support.touch) {
                 // apply "compact" mode if touch is not supported
                 this.contentDensityClass = "sapUiSizeCompact"
             } else {
diff --git a/examples/ui5-ts-app/webapp/controller/App.controller.ts b/examples/ui5-ts-app/webapp/controller/App.controller.ts
index 2ff003a4..4bf8860d 100644
--- a/examples/ui5-ts-app/webapp/controller/App.controller.ts
+++ b/examples/ui5-ts-app/webapp/controller/App.controller.ts
@@ -6,6 +6,6 @@ import BaseController from "./BaseController"
 export default class App extends BaseController {
     public onInit(): void {
         // apply content density mode to root view
-        this.getView().addStyleClass(this.getOwnerComponent().getContentDensityClass())
+        this.getView()?.addStyleClass(this.getOwnerComponent().getContentDensityClass())
     }
 }
diff --git a/examples/ui5-ts-app/webapp/controller/BaseController.ts b/examples/ui5-ts-app/webapp/controller/BaseController.ts
index 68813b34..9cbee75e 100644
--- a/examples/ui5-ts-app/webapp/controller/BaseController.ts
+++ b/examples/ui5-ts-app/webapp/controller/BaseController.ts
@@ -41,8 +41,8 @@ export default abstract class BaseController extends Controller {
      * @param [sName] The model name
      * @returns The model instance
      */
-    public getModel(sName?: string): Model {
-        return this.getView().getModel(sName)
+    public getModel(sName?: string): Model | undefined {
+        return this.getView()?.getModel(sName)
     }
 
     /**
@@ -52,7 +52,7 @@ export default abstract class BaseController extends Controller {
      * @returns The current base controller instance
      */
     public setModel(oModel: Model, sName?: string): BaseController {
-        this.getView().setModel(oModel, sName)
+        this.getView()?.setModel(oModel, sName)
         return this
     }
 
diff --git a/examples/ui5-ts-app/webapp/controller/Other.controller.ts b/examples/ui5-ts-app/webapp/controller/Other.controller.ts
index 2e86eaf9..50c7e7d0 100644
--- a/examples/ui5-ts-app/webapp/controller/Other.controller.ts
+++ b/examples/ui5-ts-app/webapp/controller/Other.controller.ts
@@ -8,12 +8,12 @@ import BaseController from "./BaseController"
  */
 export default class Main extends BaseController {
     onItemClick(oEvent): void {
-        ;(this.getView().byId("idTextFieldClickResult") as Text).setText(
+        ;(this.getView()?.byId("idTextFieldClickResult") as Text).setText(
             (oEvent.getParameter("item") as StandardListItem).getText()
         )
     }
 
     onAddLineItem(/* oEvent */): void {
-        ;(this.getView().byId("PeopleList") as List).addItem(new StandardListItem({ text: "Peter Parker" }))
+        ;(this.getView()?.byId("PeopleList") as List).addItem(new StandardListItem({ text: "Peter Parker" }))
     }
 }
diff --git a/examples/ui5-v2-js-app/webapp/index.html b/examples/ui5-v2-js-app/webapp/index.html
index 4744524a..5d287af2 100644
--- a/examples/ui5-v2-js-app/webapp/index.html
+++ b/examples/ui5-v2-js-app/webapp/index.html
@@ -9,7 +9,7 @@
   <meta http-equiv="Content-Security-Policy"
         content="default-src *; style-src * 'self' 'unsafe-inline'; script-src * 'self' 'unsafe-inline' 'unsafe-eval'">
 
-  <script id="sap-ui-bootstrap" src="https://ui5.sap.com/1-legacy-free/resources/sap-ui-core.js"
+  <script id="sap-ui-bootstrap" src="https://ui5.sap.com/1.142-legacy-free/resources/sap-ui-core.js"
           data-sap-ui-theme="sap_horizon" data-sap-ui-resourceroots='{"test.Sample": "./"}'
           data-sap-ui-compatVersion="edge"
           data-sap-ui-oninit="module:sap/ui/core/ComponentSupport" data-sap-ui-async="true"
diff --git a/examples/ui5-v2-js-app/webapp/test/e2e/press.test.js b/examples/ui5-v2-js-app/webapp/test/e2e/press.test.js
index 1063f97c..aae6f760 100644
--- a/examples/ui5-v2-js-app/webapp/test/e2e/press.test.js
+++ b/examples/ui5-v2-js-app/webapp/test/e2e/press.test.js
@@ -62,7 +62,8 @@ describe("custom wdi5 press event", async () => {
                 id: "container-Sample---Main--idDateTime-icon"
             }
         })
-        await element.fireEvent("press")
+        // await element.fireEvent("press")
+        await element.press()
 
         startDate.setDate(startDate.getDate() + 1) // add one day to the start date
         const tomorrowSuffix = startDate.toJSON().substring(0, 10).replaceAll("-", "")
diff --git a/examples/wdio-classic/ui5.test.js b/examples/wdio-classic/ui5.test.js
index 375a7bba..9b3cf657 100644
--- a/examples/wdio-classic/ui5.test.js
+++ b/examples/wdio-classic/ui5.test.js
@@ -1,7 +1,14 @@
+import { browser, expect } from "@wdio/globals"
 import { mock } from "node:test"
 import { wdi5 } from "wdio-ui5-service"
 
+const logSpyInjectTools = mock.method(console, "log")
+
 describe("ui5 basic", () => {
+    after(() => {
+        logSpyInjectTools.mock.restore()
+    })
+
     it("should use the ESM style logger", () => {
         const logSpy = mock.method(console, "log", () => {})
         const Logger = wdi5.getLogger("esm!")
diff --git a/examples/wdio-ui5-lts/wdio.conf.js b/examples/wdio-ui5-lts/wdio.conf.js
index f4023e8d..3137bc40 100644
--- a/examples/wdio-ui5-lts/wdio.conf.js
+++ b/examples/wdio-ui5-lts/wdio.conf.js
@@ -30,5 +30,8 @@ export const config = {
 
     reporters: ["spec"],
 
-    framework: "mocha"
+    framework: "mocha",
+    mochaOpts: {
+        timeout: 120000
+    }
 }
diff --git a/package-lock.json b/package-lock.json
index 3f0e5e2d..92f5dcf3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,9 +23,9 @@
         "@sap-ux/ui5-middleware-fe-mockserver": "^2.4.0",
         "@sap/approuter": "^20.8.8",
         "@sap/ux-ui5-fe-mockserver-middleware": "^1.6.5",
-        "@sapui5/types": "^1.143.0",
+        "@sapui5/types": "^1.148.0",
         "@types/node": "^25.0.7",
-        "@types/openui5": "^1.143.0",
+        "@types/openui5": "^1.148.0",
         "@ui5/cli": "^4.0.39",
         "@wdio/browserstack-service": "^9.23.0",
         "@wdio/sauce-service": "^9.23.0",
@@ -142,6 +142,7 @@
       "integrity": "sha512-PuvK6xZzGhKPvlx3fpfdM2kYY3P/hB1URtK8wA7XUJ6prn6pp22zvJHu48th0SGcHL9SutbPHrFuQgfXTFobWA==",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "debug": "4.3.4",
         "extract-zip": "2.0.1",
@@ -163,7 +164,6 @@
       "resolved": "https://registry.npmjs.org/@sap/cds/-/cds-9.6.2.tgz",
       "integrity": "sha512-BBn2k3fZFfOC8Qmgo/kC9Sjs7ClhtVjf480++LmY/vtthfuybnLA2g4SdisTbCBVePALN44JNA339wVfHCAPSw==",
       "license": "SEE LICENSE IN LICENSE",
-      "peer": true,
       "dependencies": {
         "@sap/cds-compiler": "^6.3",
         "@sap/cds-fiori": "^2",
@@ -206,6 +206,7 @@
       "integrity": "sha512-TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=14.16"
       },
@@ -219,6 +220,7 @@
       "integrity": "sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "defer-to-connect": "^2.0.1"
       },
@@ -232,6 +234,7 @@
       "integrity": "sha512-HfF8+mYcHPcPypui3w3mvzuIErlNOh2OAG+BCeBZCEwyiD5ls2SiCwEyT47OELtf7M3nHxBdu0FsmzdKxkN52Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "undici-types": "~6.21.0"
       }
@@ -242,6 +245,7 @@
       "integrity": "sha512-WrNPCqm22vuNimGJc8UCc6duEcvOy2foY5I8mv2AUaoTtvCZOfVGRrFnPreypOKVdZChubFCaWrKVNqjgMK5RA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@wdio/logger": "8.38.0",
         "@wdio/types": "8.41.0",
@@ -276,7 +280,8 @@
       "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-8.44.0.tgz",
       "integrity": "sha512-Do+AW3xuDUHWkrX++LeMBSrX2yRILlDqunRHPMv4adGFEA45m7r4WP8wGCDb+chrHGhXq5TwB9Ne4J7x1dHGng==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "examples/cap-bookshop-wdi5/node_modules/@wdio/repl": {
       "version": "8.40.3",
@@ -284,6 +289,7 @@
       "integrity": "sha512-mWEiBbaC7CgxvSd2/ozpbZWebnRIc8KRu/J81Hlw/txUWio27S7IpXBlZGVvhEsNzq0+cuxB/8gDkkXvMPbesw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/node": "^22.2.0"
       },
@@ -297,6 +303,7 @@
       "integrity": "sha512-t4NaNTvJZci3Xv/yUZPH4eTL0hxrVTf5wdwNnYIBrzMnlRDbNefjQ0P7FM7ZjQCLaH92AEH6t/XanUId7Webug==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/node": "^22.2.0"
       },
@@ -310,6 +317,7 @@
       "integrity": "sha512-C94kJjZhEfPUNbOA69BQr1SgziQYgjNXK8S1GJXQKuwxN/24PQkYCzeBqXstfxyTXyOwoQCcEZAQ/qJccboufQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@puppeteer/browsers": "^1.6.0",
         "@wdio/logger": "8.38.0",
@@ -335,6 +343,7 @@
       "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">= 14"
       }
@@ -345,6 +354,7 @@
       "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
@@ -355,6 +365,7 @@
       "integrity": "sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=14.16"
       }
@@ -365,6 +376,7 @@
       "integrity": "sha512-zkDT5WAF4hSSoUgyfg5tFIxz8XQK+25W/TLVojJTMKBaxevLBBtLxgqguAuVQB8PVW79FVjHcU+GJ9tVbDZ9mQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/http-cache-semantics": "^4.0.2",
         "get-stream": "^6.0.1",
@@ -384,6 +396,7 @@
       "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">= 12"
       }
@@ -394,6 +407,7 @@
       "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -412,6 +426,7 @@
       "integrity": "sha512-eS8dRJOckyo9maw9Tu5O5RUi/4inFLrnoLkBe3cPfDMx3WZioXtmOew4TXQaxq7Rhl4xjDtR7c6x8nNTxOvbFw==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "peer": true,
       "engines": {
         "node": ">=16.0.0"
       }
@@ -423,6 +438,7 @@
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@wdio/logger": "^8.38.0",
         "@zip.js/zip.js": "^2.7.48",
@@ -448,6 +464,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "strnum": "^1.1.1"
       },
@@ -477,6 +494,7 @@
       "dev": true,
       "hasInstallScript": true,
       "license": "MPL-2.0",
+      "peer": true,
       "dependencies": {
         "@wdio/logger": "^8.11.0",
         "decamelize": "^6.0.0",
@@ -500,6 +518,7 @@
       "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -513,6 +532,7 @@
       "integrity": "sha512-mThBblvlAF1d4O5oqyvN+ZxLAYwIJK7bpMxgYqPD9okW0C3qm5FFn7k811QrcuEBwaogR3ngOFoCfs6mRv7teQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@sindresorhus/is": "^5.2.0",
         "@szmarczak/http-timer": "^5.0.1",
@@ -539,6 +559,7 @@
       "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "agent-base": "^7.1.0",
         "debug": "^4.3.4"
@@ -553,6 +574,7 @@
       "integrity": "sha512-V5nVw1PAOgfI3Lmeaj2Exmeg7fenjhRUgz1lPSezy1CuhPYbgQtbQj4jZfEAEMlaL+vupsvhjqCyjzob0yxsmQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "quick-lru": "^5.1.1",
         "resolve-alpn": "^1.2.0"
@@ -567,6 +589,7 @@
       "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "agent-base": "^7.1.2",
         "debug": "4"
@@ -581,6 +604,7 @@
       "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
       "dev": true,
       "license": "ISC",
+      "peer": true,
       "engines": {
         "node": ">=16"
       }
@@ -604,6 +628,7 @@
       "integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
@@ -617,6 +642,7 @@
       "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
       "dev": true,
       "license": "ISC",
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -627,6 +653,7 @@
       "integrity": "sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
@@ -640,6 +667,7 @@
       "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
       "license": "ISC",
+      "peer": true,
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -655,7 +683,8 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "examples/cap-bookshop-wdi5/node_modules/node-fetch": {
       "version": "3.3.2",
@@ -663,6 +692,7 @@
       "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "data-uri-to-buffer": "^4.0.0",
         "fetch-blob": "^3.1.4",
@@ -682,6 +712,7 @@
       "integrity": "sha512-JYc0DPlpGWB40kH5g07gGTrYuMqV653k3uBKY6uITPWds3M0ov3GaWGp9lbE3Bzngx8+XkfzgvASb9vk9JDFXQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=14.16"
       },
@@ -695,6 +726,7 @@
       "integrity": "sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12.20"
       }
@@ -705,6 +737,7 @@
       "integrity": "sha512-Rb5RVBy1iyqOtNl15Cw/llpeLH8bsb37gM1FUfKQ+Wck6xHlbAhWGUFiTRHtkjqGTA5pSHz6+0hrPW/oECihPQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "agent-base": "^7.0.2",
         "debug": "^4.3.4",
@@ -725,6 +758,7 @@
       "integrity": "sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "lowercase-keys": "^3.0.0"
       },
@@ -740,7 +774,8 @@
       "resolved": "https://registry.npmjs.org/safaridriver/-/safaridriver-0.1.2.tgz",
       "integrity": "sha512-4R309+gWflJktzPXBQCobbWEHlzC4aK3a+Ov3tz2Ib2aBxiwd11phkdIBH1l0EO22x24CJMUQkpKFumRriCSRg==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "examples/cap-bookshop-wdi5/node_modules/serialize-error": {
       "version": "11.0.3",
@@ -748,6 +783,7 @@
       "integrity": "sha512-2G2y++21dhj2R7iHAdd0FIzjGwuKZld+7Pl/bTU6YIkrC2ZMbVUjm+luj6A6V34Rv9XfKJDKpTWu9W4Gse1D9g==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "type-fest": "^2.12.2"
       },
@@ -769,7 +805,8 @@
           "url": "https://github.com/sponsors/NaturalIntelligence"
         }
       ],
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "examples/cap-bookshop-wdi5/node_modules/tar-fs": {
       "version": "3.0.4",
@@ -777,6 +814,7 @@
       "integrity": "sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "mkdirp-classic": "^0.5.2",
         "pump": "^3.0.0",
@@ -789,6 +827,7 @@
       "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "b4a": "^1.6.4",
         "fast-fifo": "^1.2.0",
@@ -801,6 +840,7 @@
       "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
       "dev": true,
       "license": "(MIT OR CC0-1.0)",
+      "peer": true,
       "engines": {
         "node": ">=12.20"
       },
@@ -813,7 +853,8 @@
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
       "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "examples/cap-bookshop-wdi5/node_modules/universalify": {
       "version": "2.0.1",
@@ -863,6 +904,7 @@
       "integrity": "sha512-ucb+ow6QHTBBDAdpV1AAKPY+un2cv23QU/rsSJBmuDZi8lZc5NluWz16qVVbdD1+Hn45PXfpxQcBaAkavStORA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/node": "^22.2.0",
         "@types/ws": "^8.5.3",
@@ -932,6 +974,7 @@
       "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
       "dev": true,
       "license": "ISC",
+      "peer": true,
       "dependencies": {
         "isexe": "^3.1.1"
       },
@@ -948,6 +991,7 @@
       "integrity": "sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=10.0.0"
       },
@@ -1113,7 +1157,6 @@
       "integrity": "sha512-H3mcG6ZDLTlYfaSNi0iOKkigqMFvkTKlGUYlD8GW7nNOYRrevuA46iTypPyv+06V3fEmvvazfntkBU34L0azAw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.28.6",
         "@babel/generator": "^7.28.6",
@@ -3649,7 +3692,6 @@
       "integrity": "sha512-6t3V7fFsLlyhLSj4FS+fPz22pPVcFhFZ3QOP7otFYmkhZ4g1ierj5pf7fxJWvEsI555hGatg+Iql6cqK93RFUg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@cucumber/messages": "<=25"
       }
@@ -3812,7 +3854,6 @@
       "integrity": "sha512-Kxap9uP5jD8tHUZVjTWgzxemi/0uOsbGjd4LBOSxcJoOCRbESFwemUzilJuzNTB8pcTQUh8D5oudUyxfkJOKmA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "peerDependencies": {
         "@cucumber/messages": ">=17.1.1"
       }
@@ -3823,7 +3864,6 @@
       "integrity": "sha512-DIxSg+ZGariumO+Lq6bn4kOUIUET83A4umrnWmidjGFl8XxkBieUZtsmNbLYgH/gnsmP07EfxxdTr0hOchV1Sg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/uuid": "10.0.0",
         "class-transformer": "0.5.1",
@@ -5206,7 +5246,6 @@
       "integrity": "sha512-kQJMeH87+kWJdVw8F9GQhtsageqqxrvzg7yyOw3Tx/s7v5RToe8RnKyMM+kVtBJtNAG+Xyv/z01uYQ2jiZ3GwA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.7.2",
         "@jimp/core": "^0.14.0"
@@ -5249,7 +5288,6 @@
       "integrity": "sha512-YoYOrnVHeX3InfgbJawAU601iTZMwEBZkyqcP1V/S33Qnz9uzH1Uj1NtC6fNgWzvX6I4XbCWwtr4RrGFb5CFrw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.7.2",
         "@jimp/utils": "^0.14.0"
@@ -5264,7 +5302,6 @@
       "integrity": "sha512-9WhZcofLrT0hgI7t0chf7iBQZib//0gJh9WcQMUt5+Q1Bk04dWs8vTgLNj61GBqZXgHSPzE4OpCrrLDBG8zlhQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.7.2",
         "@jimp/utils": "^0.14.0"
@@ -5293,7 +5330,6 @@
       "integrity": "sha512-JJz512SAILYV0M5LzBb9sbOm/XEj2fGElMiHAxb7aLI6jx+n0agxtHpfpV/AePTLm1vzzDxx6AJxXbKv355hBQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.7.2",
         "@jimp/utils": "^0.14.0",
@@ -5343,7 +5379,6 @@
       "integrity": "sha512-Ojtih+XIe6/XSGtpWtbAXBozhCdsDMmy+THUJAGu2x7ZgKrMS0JotN+vN2YC3nwDpYkM+yOJImQeptSfZb2Sug==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.7.2",
         "@jimp/utils": "^0.14.0"
@@ -5487,7 +5522,6 @@
       "integrity": "sha512-qFeMOyXE/Bk6QXN0GQo89+CB2dQcXqoxUcDb2Ah8wdYlKqpi53skABkgVy5pW3EpiprDnzNDboMltdvDslNgLQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.7.2",
         "@jimp/utils": "^0.14.0"
@@ -5502,7 +5536,6 @@
       "integrity": "sha512-aGaicts44bvpTcq5Dtf93/8TZFu5pMo/61lWWnYmwJJU1RqtQlxbCLEQpMyRhKDNSfPbuP8nyGmaqXlM/82J0Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.7.2",
         "@jimp/utils": "^0.14.0"
@@ -5520,7 +5553,6 @@
       "integrity": "sha512-ZcJk0hxY5ZKZDDwflqQNHEGRblgaR+piePZm7dPwPUOSeYEH31P0AwZ1ziceR74zd8N80M0TMft+e3Td6KGBHw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.7.2",
         "@jimp/utils": "^0.14.0"
@@ -6250,7 +6282,6 @@
       "integrity": "sha512-WPf+jHAHQ7ppNIRYgdrF64+e+6qMg7NHpEaFKk9avSbcRK50iV1I5mF4ZVALimMZleN66f0Atj9VHadikp1LGg==",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@sap-ux/odata-annotation-core-types": "0.5.1",
         "@sap-ux/text-document-utils": "0.3.2"
@@ -6262,7 +6293,6 @@
       "integrity": "sha512-9Hh65kCyyr0kZNUqoRIK0fDjrEj09Fz7MdRGMIvhYOhtUGiM7hRb+ZYdEsTgS523A9LypEnxnMLEcQA8gj3hyA==",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@sap-ux/text-document-utils": "0.3.2"
       }
@@ -6290,7 +6320,6 @@
       "integrity": "sha512-kXkFdbykDgUbWegUF+5YUoiUb5xCH+Zopg9lyK0GFJnTPVjfuaW7jndhBG+Et9ppHXO29KI3nf8NKAmaUq6pAA==",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@sap-ux/i18n": "0.3.5",
         "@sap-ux/ui5-config": "0.29.10",
@@ -6701,6 +6730,7 @@
       "version": "9.39.2",
       "integrity": "sha512-q1mjIoW1VX4IvSocvM/vbTiveKC4k9eLrajNEuSsmjymSDEbpGddtpfOoN7YGAqBK3NG+uqo8ia4PDTt8buCYA==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
@@ -6712,7 +6742,6 @@
       "version": "9.6.2",
       "integrity": "sha512-BBn2k3fZFfOC8Qmgo/kC9Sjs7ClhtVjf480++LmY/vtthfuybnLA2g4SdisTbCBVePALN44JNA339wVfHCAPSw==",
       "license": "SEE LICENSE IN LICENSE",
-      "peer": true,
       "dependencies": {
         "@sap/cds-compiler": "^6.3",
         "@sap/cds-fiori": "^2",
@@ -7593,7 +7622,6 @@
       "version": "2.26.4",
       "integrity": "sha512-v0uIr9mD9iw2Ws+H6+iLNO6W+uIqeXwt8Mwe1c0CZQOn1Sk631Uy4zgdz1wOz4IY3WgxdVjBAYWZ9AS8A/dLIQ==",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "iconv-lite": "0.7.0"
       },
@@ -8684,9 +8712,9 @@
       }
     },
     "node_modules/@sapui5/types": {
-      "version": "1.143.0",
-      "resolved": "https://registry.npmjs.org/@sapui5/types/-/types-1.143.0.tgz",
-      "integrity": "sha512-3Joy60AL3psQB69gClKeLfCL7NyoPtMVE/igZCBu2UobKey2D6Cww4teCKlX8GzcUQQtu8OMMaQYDPwgVjvAXA==",
+      "version": "1.148.0",
+      "resolved": "https://registry.npmjs.org/@sapui5/types/-/types-1.148.0.tgz",
+      "integrity": "sha512-4k4vld1rP5s2obXRkrffyJ3hyfuKeJU03TjM/+JmWDqYssxYL5r+i1+Ricuh6dM34sUIB1RSqF+h/lC6m6rvlQ==",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
@@ -8940,7 +8968,6 @@
       "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.7.tgz",
       "integrity": "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "undici-types": "~7.16.0"
       }
@@ -8959,9 +8986,9 @@
       "license": "MIT"
     },
     "node_modules/@types/openui5": {
-      "version": "1.143.0",
-      "resolved": "https://registry.npmjs.org/@types/openui5/-/openui5-1.143.0.tgz",
-      "integrity": "sha512-lsQVKgcMRGe0Xd1zR8bRj8ahsR4fSNpXraHAwBi+VbSISkMIoC92Nt0qIoG03K2XZKX4mL8bjkVR+GR5XfasrQ==",
+      "version": "1.148.0",
+      "resolved": "https://registry.npmjs.org/@types/openui5/-/openui5-1.148.0.tgz",
+      "integrity": "sha512-fPQQfKMsOQjYgPothnvpfzMzFSsKh02UwNH++aXAikTshBGLIxu2OhrxjTtrMAdmce8hSvAmvwFFAehcM7kNxg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9109,7 +9136,6 @@
       "integrity": "sha512-npiaib8XzbjtzS2N4HlqPvlpxpmZ14FjSJrteZpPxGUaYPlvhzlzUZ4mZyABo0EFrOWnvyd0Xxroq//hKhtAWg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.53.0",
         "@typescript-eslint/types": "8.53.0",
@@ -9859,7 +9885,6 @@
       "version": "14.1.2",
       "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz",
       "integrity": "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==",
-      "peer": true,
       "dependencies": {
         "@types/linkify-it": "^5",
         "@types/mdurl": "^2"
@@ -9879,7 +9904,6 @@
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/@ui5/builder/-/builder-4.1.3.tgz",
       "integrity": "sha512-ScwlLZ/xyFjFOVpK1t3KfXq2i6N5iVuHW1ymWMPLdU7Qu8JFLkIWFWaLN9+rUE0pTGtewFzST+Zhk9cS0GfeRg==",
-      "peer": true,
       "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.5.5",
         "@ui5/fs": "^4.0.3",
@@ -10038,7 +10062,6 @@
       "version": "8.15.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -10066,7 +10089,6 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -13404,7 +13426,6 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -14935,7 +14956,6 @@
       "resolved": "https://registry.npmjs.org/@wdio/browserstack-service/-/browserstack-service-9.23.0.tgz",
       "integrity": "sha512-V/NUVDm28hGjL59ub5nNtPElM3hhN+WWdVn42eTvq9VCPYwGXbGfsBt2atYMGk8sH6xnMucpVoXZbuLkhN5J+A==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@browserstack/ai-sdk-node": "1.5.17",
         "@browserstack/wdio-browserstack-service": "^2.0.0",
@@ -14983,7 +15003,6 @@
       "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-9.23.0.tgz",
       "integrity": "sha512-jVuyZ84Ino6akBlmf38/bc1Ji+DI3NoGvWATQXhKaDmmF7tAhSdlUXK3VV970GfVKvGe1ARPaGtTf8L2lbRDSw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@vitest/snapshot": "^2.1.1",
         "@wdio/config": "9.23.0",
@@ -15116,7 +15135,6 @@
       "resolved": "https://registry.npmjs.org/@wdio/globals/-/globals-9.23.0.tgz",
       "integrity": "sha512-OmwPKV8c5ecLqo+EkytN7oUeYfNmRI4uOXGIR1ybP7AK5Zz+l9R0dGfoadEuwi1aZXAL0vwuhtq3p0OL3dfqHQ==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=18.20.0"
       },
@@ -15138,7 +15156,6 @@
       "resolved": "https://registry.npmjs.org/@wdio/local-runner/-/local-runner-9.23.0.tgz",
       "integrity": "sha512-kBWIqBDbCAJuxENl4t1qiCf8mivHN++cNdgsmlkP8nG7KJ8ebCseqsBHTrvx/YAqRPZIBD50cN6xsB6MZTmUfg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/node": "^20.1.0",
         "@wdio/logger": "9.18.0",
@@ -15175,7 +15192,6 @@
       "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-9.18.0.tgz",
       "integrity": "sha512-HdzDrRs+ywAqbXGKqe1i/bLtCv47plz4TvsHFH3j729OooT5VH38ctFn5aLXgECmiAKDkmH/A6kOq2Zh5DIxww==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "chalk": "^5.1.2",
         "loglevel": "^1.6.0",
@@ -15192,7 +15208,6 @@
       "resolved": "https://registry.npmjs.org/@wdio/mocha-framework/-/mocha-framework-9.23.0.tgz",
       "integrity": "sha512-1Lg8MCLNvs4a1pwz6WzWDPS44mxdAJQCw19DqWuEI8b406HtdIcPoc6sBsqkXVW8aNxMkqvTf87aMeLBFFbaYA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/mocha": "^10.0.6",
         "@types/node": "^20.11.28",
@@ -15621,7 +15636,6 @@
       "resolved": "https://registry.npmjs.org/@wdio/sauce-service/-/sauce-service-9.23.0.tgz",
       "integrity": "sha512-gN1QVKG7vKKNmXAxKW3mqXbSajY2CSevRdocJbt4ca4P+sQymshNtHWd6JRwko4WAXeMW/KwFgm4CXqCPgbvIQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@wdio/logger": "9.18.0",
         "@wdio/types": "9.20.0",
@@ -15638,7 +15652,6 @@
       "resolved": "https://registry.npmjs.org/@wdio/spec-reporter/-/spec-reporter-9.20.0.tgz",
       "integrity": "sha512-YHj3kF86RoOVVR+k3eb+e/Fki6Mq1FIrJQ380Cz5SSWbIc9gL8HXG3ydReldY6/80KLFOuHn9ZHvDHrCIXRjiw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@wdio/reporter": "9.20.0",
         "@wdio/types": "9.20.0",
@@ -15817,7 +15830,6 @@
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -16294,7 +16306,6 @@
       "resolved": "https://registry.npmjs.org/axios/-/axios-1.12.2.tgz",
       "integrity": "sha512-vMJzPewAlRyOgxV2dU0Cuz2O8zzzx9VYtbJOaBgXFeLc4IV/Eg50n4LowmehOOR61S8ZMpc2K5Sa7g6A4jfkUw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.4",
@@ -16616,6 +16627,7 @@
       "integrity": "sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==",
       "dev": true,
       "license": "Unlicense",
+      "peer": true,
       "engines": {
         "node": ">=0.6"
       }
@@ -16720,7 +16732,8 @@
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz",
       "integrity": "sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/bmp-js": {
       "version": "0.1.0",
@@ -16977,7 +16990,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.9.0",
         "caniuse-lite": "^1.0.30001759",
@@ -17097,6 +17109,7 @@
       "integrity": "sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=0.10"
       }
@@ -17355,7 +17368,6 @@
       "integrity": "sha512-4zNhdJD/iOjSH0A05ea+Ke6MU5mmpQcbQsSOkgdaUMJ9zTlDTD/GYlwohmIE2u0gaxHYiVHEn1Fw9mZ/ktJWgw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "assertion-error": "^2.0.1",
         "check-error": "^2.1.1",
@@ -17554,6 +17566,7 @@
       "integrity": "sha512-blqh+1cEQbHBKmok3rVJkBlBxt9beKBgOsxbFgs7UJcoVbbeZ+K7+6liAsjgpc8l1Xd55cQUy14fXZdGSb4zIw==",
       "devOptional": true,
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "mitt": "3.0.1",
         "urlpattern-polyfill": "10.0.0"
@@ -17567,7 +17580,8 @@
       "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz",
       "integrity": "sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==",
       "devOptional": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/ci-info": {
       "version": "4.3.1",
@@ -19780,7 +19794,6 @@
       "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "env-paths": "^2.2.1",
         "import-fresh": "^3.3.0",
@@ -19950,6 +19963,7 @@
       "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "node-fetch": "^2.6.12"
       }
@@ -20976,6 +20990,7 @@
       "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==",
       "dev": true,
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "readable-stream": "^2.0.2"
       }
@@ -20985,7 +21000,8 @@
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
       "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/duplexer2/node_modules/readable-stream": {
       "version": "2.3.8",
@@ -20993,6 +21009,7 @@
       "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -21008,7 +21025,8 @@
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/duplexer2/node_modules/string_decoder": {
       "version": "1.1.1",
@@ -21016,6 +21034,7 @@
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
@@ -21467,7 +21486,6 @@
       "integrity": "sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -21969,7 +21987,6 @@
       "resolved": "https://registry.npmjs.org/expect-webdriverio/-/expect-webdriverio-5.6.1.tgz",
       "integrity": "sha512-gQHqfI6SmtYBIkTeMizpHThdpXh6ej2Hk68oKZneFM6iu99ZGXvOPnmhd8VDus3xOWhVDDdf4sLsMV2/o+X6Yg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@vitest/snapshot": "^4.0.16",
         "deep-eql": "^5.0.2",
@@ -22415,6 +22432,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "node-domexception": "^1.0.0",
         "web-streams-polyfill": "^3.0.3"
@@ -22429,6 +22447,7 @@
       "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">= 8"
       }
@@ -22803,6 +22822,7 @@
       "integrity": "sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">= 14.17"
       }
@@ -22826,6 +22846,7 @@
       "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "fetch-blob": "^3.1.2"
       },
@@ -22935,6 +22956,7 @@
       "deprecated": "This package is no longer supported.",
       "dev": true,
       "license": "ISC",
+      "peer": true,
       "dependencies": {
         "graceful-fs": "^4.1.2",
         "inherits": "~2.0.0",
@@ -22952,6 +22974,7 @@
       "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
       "license": "ISC",
+      "peer": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -22974,6 +22997,7 @@
       "deprecated": "Rimraf versions prior to v4 are no longer supported",
       "dev": true,
       "license": "ISC",
+      "peer": true,
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -25638,6 +25662,7 @@
       "integrity": "sha512-CasD9OCEQSFIam2U8efFK81Yeg8vNMTBUqtMOHlrcWQHqUX3HeCl9Dr31u4toV7emlH8Mymk5+9p0lL6mKb/Xw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=14.16"
       },
@@ -25776,7 +25801,8 @@
       "resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz",
       "integrity": "sha512-3mk/Zag0+IJxeDrxSgaDPy4zZ3w05PRZeJNnlWhzFz5OkX49J4krc+A8X2d2M69vGMBEX0uyl8M+W+8gH+kBqQ==",
       "dev": true,
-      "license": "ISC"
+      "license": "ISC",
+      "peer": true
     },
     "node_modules/listr2": {
       "version": "9.0.5",
@@ -28830,6 +28856,7 @@
       "integrity": "sha512-ArbnyA3U5SGHokEvkfWjW+O8hOxV1RSJxOgriX/3A4xZRqixt9ZFHD0yPgZQF05Qj0oAqi8H/7stDorjoHY90Q==",
       "devOptional": true,
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "@puppeteer/browsers": "1.9.1",
         "chromium-bidi": "0.5.8",
@@ -28848,6 +28875,7 @@
       "integrity": "sha512-PuvK6xZzGhKPvlx3fpfdM2kYY3P/hB1URtK8wA7XUJ6prn6pp22zvJHu48th0SGcHL9SutbPHrFuQgfXTFobWA==",
       "devOptional": true,
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "debug": "4.3.4",
         "extract-zip": "2.0.1",
@@ -28870,6 +28898,7 @@
       "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">= 14"
       }
@@ -28880,6 +28909,7 @@
       "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -28897,7 +28927,8 @@
       "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1232444.tgz",
       "integrity": "sha512-pM27vqEfxSxRkTMnF+XCmxSEb6duO5R+t8A9DEEJgy4Wz2RVanje2mmj99B6A3zv2r/qGfYlOvYznUhuokizmg==",
       "devOptional": true,
-      "license": "BSD-3-Clause"
+      "license": "BSD-3-Clause",
+      "peer": true
     },
     "node_modules/puppeteer-core/node_modules/http-proxy-agent": {
       "version": "7.0.2",
@@ -28905,6 +28936,7 @@
       "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "agent-base": "^7.1.0",
         "debug": "^4.3.4"
@@ -28919,6 +28951,7 @@
       "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "agent-base": "^7.1.2",
         "debug": "4"
@@ -28933,6 +28966,7 @@
       "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
       "devOptional": true,
       "license": "ISC",
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -28942,7 +28976,8 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "devOptional": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/puppeteer-core/node_modules/proxy-agent": {
       "version": "6.3.1",
@@ -28950,6 +28985,7 @@
       "integrity": "sha512-Rb5RVBy1iyqOtNl15Cw/llpeLH8bsb37gM1FUfKQ+Wck6xHlbAhWGUFiTRHtkjqGTA5pSHz6+0hrPW/oECihPQ==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "agent-base": "^7.0.2",
         "debug": "^4.3.4",
@@ -28970,6 +29006,7 @@
       "integrity": "sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "mkdirp-classic": "^0.5.2",
         "pump": "^3.0.0",
@@ -28982,6 +29019,7 @@
       "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "b4a": "^1.6.4",
         "fast-fifo": "^1.2.0",
@@ -28994,6 +29032,7 @@
       "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=10.0.0"
       },
@@ -29174,7 +29213,6 @@
       "integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0",
         "object-assign": "^4.1.1",
@@ -31931,7 +31969,6 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -32014,7 +32051,6 @@
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz",
       "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==",
       "license": "BSD-3-Clause",
-      "peer": true,
       "dependencies": {
         "psl": "^1.1.33",
         "punycode": "^2.1.1",
@@ -32283,7 +32319,6 @@
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -32564,6 +32599,7 @@
       "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "buffer": "^5.2.1",
         "through": "^2.3.8"
@@ -32589,6 +32625,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "base64-js": "^1.3.1",
         "ieee754": "^1.1.13"
@@ -32599,7 +32636,6 @@
       "resolved": "https://registry.npmjs.org/undici/-/undici-6.23.0.tgz",
       "integrity": "sha512-VfQPToRA5FZs/qJxLIinmU59u0r7LXqoJkCzinq3ckNJp3vKEh7jTWN589YQ5+aoAC/TGRLyJLCPKcLQbM8r9g==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=18.17"
       }
@@ -32716,6 +32752,7 @@
       "integrity": "sha512-ti4wZj+0bQTiX2KmKWuwj7lhV+2n//uXEotUmGuQqrbVZSEGFMbI68+c6JCQ8aAmUWYvtHEz2A8K6wXvueR/6g==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "big-integer": "^1.6.17",
         "binary": "~0.3.0",
@@ -32734,7 +32771,8 @@
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
       "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/unzipper/node_modules/readable-stream": {
       "version": "2.3.8",
@@ -32742,6 +32780,7 @@
       "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -32757,7 +32796,8 @@
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/unzipper/node_modules/string_decoder": {
       "version": "1.1.1",
@@ -32765,6 +32805,7 @@
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
@@ -33422,7 +33463,6 @@
       "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-9.23.0.tgz",
       "integrity": "sha512-Y5y4jpwHvuduUfup+gXTuCU6AROn/k6qOba3st0laFluKHY+q5SHOpQAJdS8acYLwE8caDQ2dXJhmXyxuJrm0Q==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/node": "^20.11.30",
         "@types/sinonjs__fake-timers": "^8.1.5",
diff --git a/package.json b/package.json
index a770b103..0f6bf816 100644
--- a/package.json
+++ b/package.json
@@ -96,9 +96,9 @@
     "@sap-ux/ui5-middleware-fe-mockserver": "^2.4.0",
     "@sap/approuter": "^20.8.8",
     "@sap/ux-ui5-fe-mockserver-middleware": "^1.6.5",
-    "@sapui5/types": "^1.143.0",
+    "@sapui5/types": "^1.148.0",
     "@types/node": "^25.0.7",
-    "@types/openui5": "^1.143.0",
+    "@types/openui5": "^1.148.0",
     "@ui5/cli": "^4.0.39",
     "@wdio/browserstack-service": "^9.23.0",
     "@wdio/sauce-service": "^9.23.0",
diff --git a/src/client-side-js/_navTo.ts b/src/client-side-js/_navTo.ts
index 4872d697..0ea951df 100644
--- a/src/client-side-js/_navTo.ts
+++ b/src/client-side-js/_navTo.ts
@@ -41,12 +41,12 @@ async function clientSide__navTo(
                     )
                 }
             )
-            const router = window.compareVersions?.compare(window.wdi5.ui5Version, "1.120.0", ">")
+            const router = window.wdi5Ui5FeaturesAvailable.useGetComponentById
                 ? // @ts-expect-error: Property 'getRouter' does not exist on type 'Component'
                   ComponentRef.getComponentById(sComponentId).getRouter()
                 : // @ts-expect-error: Property 'getRouter' does not exist on type 'Component'
                   CoreRef.getComponent(sComponentId).getRouter()
-            const hashChanger = window.compareVersions?.compare("1.75.0", window.wdi5.ui5Version, ">")
+            const hashChanger = window.wdi5Ui5FeaturesAvailable.useOldHashChanger
                 ? // @ts-expect-error: Property 'core' does not exist on type 'typeof ui'
                   HashChangerRef.getInstance()
                 : router.getHashChanger()
@@ -65,9 +65,7 @@ async function clientSide__navTo(
             await hashChangedPromise
             return {
                 status: 0,
-                result: window.compareVersions?.compare("1.75.0", window.wdi5.ui5Version, ">")
-                    ? hashChanger.getHash()
-                    : hashChanger.hash
+                result: hashChanger.getHash()
             }
         },
         sComponentId,
diff --git a/src/client-side-js/injectTools.ts b/src/client-side-js/injectTools.ts
deleted file mode 100644
index 5cd4a09c..00000000
--- a/src/client-side-js/injectTools.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { readFile } from "node:fs/promises"
-import { createRequire } from "node:module"
-import { getFilename } from "cross-dirname"
-const { resolve } = createRequire(getFilename())
-
-async function clientSide_injectTools(browserInstance: WebdriverIO.Browser) {
-    const compareVersionsFilename = resolve("compare-versions/lib/umd/index.js")
-    const compareVersionsStringfied = await readFile(compareVersionsFilename, "utf-8")
-    return await browserInstance.execute(function wdi5_injectTools(compareVersionsStringfied) {
-        // Injects the compare-versions library into the browser context
-        if (window?.compareVersions?.compare) {
-            return true
-        }
-        // If browser context is an iframe, we get the library from the parent window. Eval doesn't work there.
-        if (window?.frameElement?.nodeName === "IFRAME") {
-            window.compareVersions = window.parent.compareVersions
-        } else {
-            // eval() is bad, but it's coming from a trusted source, it's better than manually copying the code
-            eval(compareVersionsStringfied)
-            // @ts-expect-error: compareVersions is not defined in the browser context (yet)
-            window.compareVersions = compareVersions
-        }
-        if (!window.compareVersions) {
-            throw new Error("compare-versions library could not be injected into the browser context")
-        }
-        return true
-    }, compareVersionsStringfied)
-}
-
-export { clientSide_injectTools }
diff --git a/src/client-side-js/injectUI5.ts b/src/client-side-js/injectUI5.ts
index b650fd28..8eac5766 100644
--- a/src/client-side-js/injectUI5.ts
+++ b/src/client-side-js/injectUI5.ts
@@ -5,6 +5,7 @@ import type BindingPath from "sap/ui/test/matchers/BindingPath"
 import type I18NText from "sap/ui/test/matchers/I18NText"
 import type Properties from "sap/ui/test/matchers/Properties"
 import type Ancestor from "sap/ui/test/matchers/Ancestor"
+import type Descendant from "sap/ui/test/matchers/Descendant"
 import type LabelFor from "sap/ui/test/matchers/LabelFor"
 import type UI5Element from "sap/ui/core/Element"
 import type { LibraryInfo } from "sap/ui/core/Core"
@@ -63,6 +64,7 @@ async function clientSide_injectUI5(waitForUI5Timeout: number, browserInstance:
                 I18NTextUi5LocalRef,
                 PropertiesUi5LocalRef,
                 AncestorUi5LocalRef,
+                DescendantUi5LocalRef,
                 LabelForUi5LocalRef,
                 UI5ElementRef,
                 VersionInfo
@@ -71,11 +73,12 @@ async function clientSide_injectUI5(waitForUI5Timeout: number, browserInstance:
                     Log,
                     typeof RecordReplay,
                     Control,
-                    BindingPath,
-                    I18NText,
-                    Properties,
-                    Ancestor,
-                    LabelFor,
+                    typeof BindingPath,
+                    typeof I18NText,
+                    typeof Properties,
+                    typeof Ancestor,
+                    typeof Descendant,
+                    typeof LabelFor,
                     UI5Element,
                     VersionInfo
                 ]
@@ -89,6 +92,7 @@ async function clientSide_injectUI5(waitForUI5Timeout: number, browserInstance:
                         "sap/ui/test/matchers/I18NText",
                         "sap/ui/test/matchers/Properties",
                         "sap/ui/test/matchers/Ancestor",
+                        "sap/ui/test/matchers/Descendant",
                         "sap/ui/test/matchers/LabelFor",
                         "sap/ui/core/Element",
                         "sap/ui/VersionInfo"
@@ -98,11 +102,12 @@ async function clientSide_injectUI5(waitForUI5Timeout: number, browserInstance:
                             Log,
                             typeof RecordReplay,
                             Control,
-                            BindingPath,
-                            I18NText,
-                            Properties,
-                            Ancestor,
-                            LabelFor,
+                            typeof BindingPath,
+                            typeof I18NText,
+                            typeof Properties,
+                            typeof Ancestor,
+                            typeof Descendant,
+                            typeof LabelFor,
                             UI5Element,
                             VersionInfo
                         ]
@@ -139,9 +144,6 @@ async function clientSide_injectUI5(waitForUI5Timeout: number, browserInstance:
              * used to dynamically create new control matchers when searching for elements
              */
             window.wdi5.createMatcher = (oSelector) => {
-                // since 1.72.0 the declarative matchers are available. Before that
-                // you had to instantiate the matchers manually
-                const oldAPIVersion = "1.72.0"
                 // check whether we're looking for a control via regex
                 // hint: no IE support here :)
                 if (oSelector.id && typeof oSelector.id === "string" && oSelector.id.startsWith("/", 0)) {
@@ -179,21 +181,17 @@ async function clientSide_injectUI5(waitForUI5Timeout: number, browserInstance:
                     const isRootProperty =
                         typeof oSelector?.bindingPath?.propertyPath === "string" &&
                         oSelector.bindingPath.propertyPath.charAt(0) === "/"
-                    if (
-                        hasNamedModel &&
-                        isRootProperty &&
-                        window.compareVersions?.compare("1.81.0", window.wdi5.ui5Version, ">")
-                    ) {
+                    if (hasNamedModel && isRootProperty && window.wdi5Ui5FeaturesAvailable.useOldDoubleLeadingSlash) {
                         // attach the double leading /
                         // for UI5 < 1.81
                         oSelector.bindingPath.propertyPath = `/${oSelector.bindingPath.propertyPath}`
                     }
                 }
-                if (window.compareVersions?.compare(oldAPIVersion, window.wdi5.ui5Version, ">")) {
+                // since 1.72.0 the declarative matchers are available. Before that you had to instantiate the matchers manually
+                if (window.wdi5Ui5FeaturesAvailable.useOldMatcherAPI) {
                     oSelector.matchers = []
                     // for version < 1.72 declarative matchers are not available
                     if (oSelector.bindingPath) {
-                        // @ts-expect-error: This expression is not constructable. Type has no construct signatures
                         oSelector.matchers.push(new BindingPathUi5LocalRef(oSelector.bindingPath))
                         delete oSelector.bindingPath
                     }
@@ -203,20 +201,23 @@ async function clientSide_injectUI5(waitForUI5Timeout: number, browserInstance:
                         delete oSelector.properties
                     }
                     if (oSelector.i18NText) {
-                        // @ts-expect-error: This expression is not constructable. Type has no construct signatures
                         oSelector.matchers.push(new I18NTextUi5LocalRef(oSelector.i18NText))
                         delete oSelector.i18NText
                     }
                     if (oSelector.labelFor) {
-                        // @ts-expect-error: This expression is not constructable. Type has no construct signatures
                         oSelector.matchers.push(new LabelForUi5LocalRef(oSelector.labelFor))
                         delete oSelector.labelFor
                     }
                     if (oSelector.ancestor) {
-                        // @ts-expect-error: This expression is not constructable. Type has no construct signatures
+                        // @ts-expect-error: Argument of type 'Ancestor' is not assignable to parameter of type 'Matcher'.
                         oSelector.matchers.push(new AncestorUi5LocalRef(oSelector.ancestor))
                         delete oSelector.ancestor
                     }
+                    if (oSelector.descendant) {
+                        // @ts-expect-error: Argument of type 'Descendant' is not assignable to parameter of type 'Matcher'.
+                        oSelector.matchers.push(new DescendantUi5LocalRef(oSelector.descendant))
+                        delete oSelector.descendant
+                    }
                 }
 
                 /*
@@ -252,7 +253,7 @@ async function clientSide_injectUI5(waitForUI5Timeout: number, browserInstance:
              * extract the multi use function to get a UI5 Control from a JSON Webobejct
              */
             window.wdi5.getUI5CtlForWebObj = (ui5Control) => {
-                if (window.compareVersions?.compare(window.wdi5.ui5Version, "1.108.0", ">")) {
+                if (window.wdi5Ui5FeaturesAvailable.useUI5ElementClosestTo) {
                     // @ts-expect-error: Property 'closestTo' does not exist on type 'UI5Element'. Did you mean to access the static member 'UI5Element.closestTo' instead?
                     return UI5ElementRef.closestTo(ui5Control)
                 } else {
diff --git a/src/client-side-js/injectXHRPatch.ts b/src/client-side-js/injectXHRPatch.ts
index ed999052..07e350e7 100644
--- a/src/client-side-js/injectXHRPatch.ts
+++ b/src/client-side-js/injectXHRPatch.ts
@@ -1,74 +1,69 @@
 import type { wdi5Config } from "../types/wdi5.types.js"
 
 async function clientSide_injectXHRPatch(wdi5Config: wdi5Config["wdi5"], browserInstance: WebdriverIO.Browser) {
-    const version = await browserInstance.getUI5Version()
-    return await browserInstance.execute(
-        async function wdi5_injectXHRPatch(wdi5Config, ui5Version) {
-            const originalFetch = window.fetch
+    return await browserInstance.execute(async function wdi5_injectXHRPatch(wdi5Config) {
+        const originalFetch = window.fetch
 
-            const ignoreAutoWaitUrls = wdi5Config?.ignoreAutoWaitUrls
-            function checkURL(url) {
-                return ignoreAutoWaitUrls?.map((regex) => new RegExp(regex))?.some((regex) => url.match(regex)) || false
-            }
-            const imports = ["sap/ui/thirdparty/sinon", "sap/ui/test/autowaiter/_XHRWaiter"]
-            if (window.compareVersions?.compare(ui5Version, "1.114.0", ">")) {
-                imports.push("sap/ui/test/autowaiter/_fetchWaiter")
-            }
+        const ignoreAutoWaitUrls = wdi5Config?.ignoreAutoWaitUrls
+        function checkURL(url) {
+            return ignoreAutoWaitUrls?.map((regex) => new RegExp(regex))?.some((regex) => url.match(regex)) || false
+        }
+        const imports = ["sap/ui/thirdparty/sinon", "sap/ui/test/autowaiter/_XHRWaiter"]
+        if (window.wdi5Ui5FeaturesAvailable.useFetchWaiter) {
+            imports.push("sap/ui/test/autowaiter/_fetchWaiter")
+        }
 
-            //Load the XHRWaiter before our overwrite so we are called first
-            return await new Promise((resolve, reject) => {
-                sap.ui.require(
-                    imports,
-                    function (sinon, _XHRWaiter, _fetchWaiter) {
-                        // Hook into XHR open for sinon XHRs
-                        const fnOriginalFakeOpen = sinon.FakeXMLHttpRequest.prototype.open
-                        sinon.FakeXMLHttpRequest.prototype.open = function () {
-                            // eslint-disable-next-line prefer-rest-params
-                            return fnOriginalFakeOpen.apply(this, hooktoXHROpen.apply(this, arguments))
-                        }
+        //Load the XHRWaiter before our overwrite so we are called first
+        return await new Promise((resolve, reject) => {
+            sap.ui.require(
+                imports,
+                function (sinon, _XHRWaiter, _fetchWaiter) {
+                    // Hook into XHR open for sinon XHRs
+                    const fnOriginalFakeOpen = sinon.FakeXMLHttpRequest.prototype.open
+                    sinon.FakeXMLHttpRequest.prototype.open = function () {
+                        // eslint-disable-next-line prefer-rest-params
+                        return fnOriginalFakeOpen.apply(this, hooktoXHROpen.apply(this, arguments))
+                    }
 
-                        // Hook into XHR open for regular XHRs
-                        const fnOriginalOpen = XMLHttpRequest.prototype.open
-                        XMLHttpRequest.prototype.open = function () {
-                            // eslint-disable-next-line prefer-rest-params
-                            return fnOriginalOpen.apply(this, hooktoXHROpen.apply(this, arguments))
-                        }
+                    // Hook into XHR open for regular XHRs
+                    const fnOriginalOpen = XMLHttpRequest.prototype.open
+                    XMLHttpRequest.prototype.open = function () {
+                        // eslint-disable-next-line prefer-rest-params
+                        return fnOriginalOpen.apply(this, hooktoXHROpen.apply(this, arguments))
+                    }
 
-                        function hooktoXHROpen(
-                            method: Parameters<typeof XMLHttpRequest.prototype.open>["0"],
-                            url: Parameters<typeof XMLHttpRequest.prototype.open>["1"]
-                        ) {
-                            //The ignore property will force the OPA5 _XHRWaiter to ignore certain calls for auto waiting
-                            //https://github.com/SAP/openui5/blob/45e49887f632d0a8a8ef195bd3edf10eb0be9015/src/sap.ui.core/src/sap/ui/test/autowaiter/_XHRWaiter.js
-                            //This ist the XHR request instance so setting it here will only affect the specific request
-                            this.ignored = checkURL(url)
-                            // eslint-disable-next-line prefer-rest-params
-                            return arguments
-                        }
-                        if (_fetchWaiter !== undefined) {
-                            const sapFetch = window.fetch
+                    function hooktoXHROpen(
+                        method: Parameters<typeof XMLHttpRequest.prototype.open>["0"],
+                        url: Parameters<typeof XMLHttpRequest.prototype.open>["1"]
+                    ) {
+                        //The ignore property will force the OPA5 _XHRWaiter to ignore certain calls for auto waiting
+                        //https://github.com/SAP/openui5/blob/45e49887f632d0a8a8ef195bd3edf10eb0be9015/src/sap.ui.core/src/sap/ui/test/autowaiter/_XHRWaiter.js
+                        //This ist the XHR request instance so setting it here will only affect the specific request
+                        this.ignored = checkURL(url)
+                        // eslint-disable-next-line prefer-rest-params
+                        return arguments
+                    }
+                    if (_fetchWaiter !== undefined) {
+                        const sapFetch = window.fetch
 
-                            window.fetch = function (resource) {
-                                // @ts-expect-error: Property 'url' does not exist on type 'Request | URL'. Property 'url' does not exist on type 'URL'
-                                const url = typeof resource === "object" ? resource.url : resource
-                                if (checkURL(url)) {
-                                    // eslint-disable-next-line prefer-rest-params
-                                    return originalFetch.apply(this, arguments)
-                                } else {
-                                    // eslint-disable-next-line prefer-rest-params
-                                    return sapFetch.apply(this, arguments)
-                                }
+                        window.fetch = function (resource) {
+                            // @ts-expect-error: Property 'url' does not exist on type 'Request | URL'. Property 'url' does not exist on type 'URL'
+                            const url = typeof resource === "object" ? resource.url : resource
+                            if (checkURL(url)) {
+                                // eslint-disable-next-line prefer-rest-params
+                                return originalFetch.apply(this, arguments)
+                            } else {
+                                // eslint-disable-next-line prefer-rest-params
+                                return sapFetch.apply(this, arguments)
                             }
                         }
-                        resolve(true)
-                    },
-                    reject
-                )
-            })
-        },
-        wdi5Config,
-        version
-    )
+                    }
+                    resolve(true)
+                },
+                reject
+            )
+        })
+    }, wdi5Config)
 }
 
 export { clientSide_injectXHRPatch }
diff --git a/src/client-side-js/setUI5FeaturesAvailable.ts b/src/client-side-js/setUI5FeaturesAvailable.ts
new file mode 100644
index 00000000..99c93cb9
--- /dev/null
+++ b/src/client-side-js/setUI5FeaturesAvailable.ts
@@ -0,0 +1,14 @@
+import type { ui5FeaturesAvailable } from "../types/wdi5.types.js"
+
+async function clientSide_setUI5FeaturesAvailable(
+    ui5FeaturesAvailable: ui5FeaturesAvailable,
+    browserInstance: WebdriverIO.Browser
+) {
+    return await browserInstance.execute(async function wdi5_setUI5FeaturesAvailable(
+        ui5FeaturesAvailableNode: ui5FeaturesAvailable
+    ) {
+        window.wdi5Ui5FeaturesAvailable = ui5FeaturesAvailableNode
+    }, ui5FeaturesAvailable)
+}
+
+export { clientSide_setUI5FeaturesAvailable }
diff --git a/src/lib/wdi5-bridge.ts b/src/lib/wdi5-bridge.ts
index 5185d59f..6f39a6ca 100644
--- a/src/lib/wdi5-bridge.ts
+++ b/src/lib/wdi5-bridge.ts
@@ -4,7 +4,8 @@ import type {
     wdi5Selector,
     BTPAuthenticator as BTPAuthenticatorType,
     wdi5Authenticator,
-    ControlSelectorByDOMElementOptions
+    ControlSelectorByDOMElementOptions,
+    ui5FeaturesAvailable
 } from "../types/wdi5.types.js"
 import type { ComponentTargetParameters } from "sap/ui/core/routing/Router"
 
@@ -14,7 +15,6 @@ import { tmpdir } from "node:os"
 import { compare } from "compare-versions"
 import { WDI5Control, WDI5ControlParams } from "./wdi5-control.js"
 import { WDI5FE } from "./wdi5-fe.js"
-import { clientSide_injectTools } from "../client-side-js/injectTools.js"
 import { clientSide_injectUI5 } from "../client-side-js/injectUI5.js"
 import { clientSide_injectXHRPatch } from "../client-side-js/injectXHRPatch.js"
 import { clientSide_getSelectorForElement } from "../client-side-js/getSelectorForElement.js"
@@ -23,6 +23,7 @@ import { clientSide_getObject } from "../client-side-js/getObject.js"
 import { clientSide_getUI5Version } from "../client-side-js/getUI5Version.js"
 import { clientSide__navTo } from "../client-side-js/_navTo.js"
 import { clientSide_allControls } from "../client-side-js/allControls.js"
+import { clientSide_setUI5FeaturesAvailable } from "../client-side-js/setUI5FeaturesAvailable.js"
 import { Logger as _Logger } from "./Logger.js"
 import { WDI5Object } from "./wdi5-object.js"
 import BTPAuthenticator from "./authentication/BTPAuthenticator.js"
@@ -109,6 +110,19 @@ function initBrowser(browserInstance: WebdriverIO.Browser) {
     _setupComplete = true
 }
 
+async function setUi5FeaturesAvailable(ui5Version: string, browserInstance: WebdriverIO.Browser) {
+    const ui5FeaturesAvailable: ui5FeaturesAvailable = {
+        version: ui5Version,
+        useFetchWaiter: compare(ui5Version, "1.114.0", ">"),
+        useGetComponentById: compare(ui5Version, "1.120.0", ">"),
+        useUI5ElementClosestTo: compare(ui5Version, "1.108.0", ">"),
+        useOldHashChanger: compare("1.75.0", ui5Version, ">"),
+        useOldDoubleLeadingSlash: compare("1.81.0", ui5Version, ">"),
+        useOldMatcherAPI: compare("1.72.0", ui5Version, ">")
+    }
+    return await clientSide_setUI5FeaturesAvailable(ui5FeaturesAvailable, browserInstance)
+}
+
 function checkUI5Version(ui5Version: string) {
     if (compare(ui5Version, "1.60.0", "<")) {
         // the record replay api is only available since 1.60
@@ -144,7 +158,7 @@ export async function injectUI5(config: wdi5Config, browserInstance: WebdriverIO
 
     const version = await browserInstance.getUI5Version()
     checkUI5Version(version)
-    await clientSide_injectTools(browserInstance) // helpers for wdi5 browser scope
+    await setUi5FeaturesAvailable(version, browserInstance)
     // BIDI does not allow to pass functions inside of the browser scope
     await clientSide_injectXHRPatch(config.wdi5, browserInstance)
     result = result && (await clientSide_injectUI5(waitForUI5Timeout, browserInstance))
@@ -527,8 +541,12 @@ async function _allControls(controlSelector: wdi5Selector = this._controlSelecto
 
         // domElement: domElement, id: id, aProtoFunctions
         for await (const cControl of retrievedElements) {
+            const _controlSelector = {
+                ...controlSelector,
+                selector: { ...controlSelector.selector, id: cControl.id }
+            }
             const oOptions: WDI5ControlParams = {
-                // controlSelector: controlSelector,
+                controlSelector: _controlSelector,
                 wdio_ui5_key: controlSelector.wdio_ui5_key,
                 forceSelect: controlSelector.forceSelect,
                 generatedUI5Methods: cControl.aProtoFunctions,
diff --git a/src/lib/wdi5-control.ts b/src/lib/wdi5-control.ts
index 875d190d..266b092f 100644
--- a/src/lib/wdi5-control.ts
+++ b/src/lib/wdi5-control.ts
@@ -1,3 +1,4 @@
+import type { $EnterTextSettings } from "sap/ui/test/actions/EnterText"
 import type {
     clientSide_ui5Response,
     wdi5ControlMetadata,
@@ -186,28 +187,38 @@ export class WDI5Control {
     /**
      * enters a text into a UI5 control
      * @param text
+     * @param oOptions options for the interaction
      */
-    async enterText(text: string) {
+    async enterText(text: string, oOptions?: $EnterTextSettings) {
         let selector: wdi5ControlSelector
         let logging: boolean
+        let domId: string
         if (util.types.isProxy(this._controlSelector)) {
             const _controlSelector = await Promise.resolve(this._controlSelector)
             selector = await Promise.resolve(_controlSelector?.selector)
             logging = await Promise.resolve(this._logging)
+            domId = await Promise.resolve(this._domId)
         } else {
             selector = this._controlSelector?.selector
             logging = this._logging
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
+            domId = this._domId
         }
-        const oOptions: InteractWithControlOptions = {
+        const _oOptions: InteractWithControlOptions = {
             enterText: text,
-            selector,
-            // @ts-expect-error: Property 'clearTextFirst' does not exist on type 'RecordReplay.InteractWithControlOptions'.
-            clearTextFirst: true,
+            selector: { ...selector },
+            clearTextFirst: !!(oOptions?.clearTextFirst ?? true),
+            pressEnterKey: !!oOptions?.pressEnterKey,
+            keepFocus: !!oOptions?.keepFocus,
             // @ts-expect-error: Property 'ENTER_TEXT' does not exist on type 'RecordReplay.InteractionType'.
-            interactionType: "ENTER_TEXT"
+            interactionType: "ENTER_TEXT" // RecordReplay.InteractionType.EnterText
         }
+        /* Not required like in press(), it breaks interaction, see examples\ui5-js-app\webapp\test\e2e\interaction.test.js 
+        if (domId) {
+            _oOptions.selector.id = domId
+        } */
         try {
-            await this._interactWithControl(oOptions)
+            await this._interactWithControl(_oOptions)
         } catch (error) {
             if (logging) {
                 Logger.error(`cannot call enterText(), because ${error?.message}`)
@@ -222,18 +233,21 @@ export class WDI5Control {
      */
     async press() {
         // support fluent async api
-        let className
-        let controlSelector
-        let logging
+        let className: string
+        let controlSelector: wdi5Selector
+        let logging: boolean
+        let domId: string
         if (util.types.isProxy(this._domId)) {
             const _controlInfo = await Promise.resolve(this._metadata)
             className = _controlInfo.className
             controlSelector = await Promise.resolve(this._controlSelector)
             logging = await Promise.resolve(this._logging)
+            domId = await Promise.resolve(this._domId)
         } else {
             className = this.getControlInfo().className
             controlSelector = this._controlSelector
             logging = this._logging
+            domId = this._domId
         }
 
         // when the interaction locator is existing we want to use the RecordReplay press (interactWithControl)
@@ -242,9 +256,14 @@ export class WDI5Control {
                 Logger.info(`using OPA5 Press action to interact with this ${className}...`)
             }
             const oOptions: InteractWithControlOptions = {
-                selector: controlSelector.selector,
+                selector: {
+                    ...controlSelector.selector
+                },
                 // @ts-expect-error: Property 'PRESS' does not exist on type 'RecordReplay.InteractionType'.
-                interactionType: "PRESS"
+                interactionType: "PRESS" // RecordReplay.InteractionType.Press
+            }
+            if (domId) {
+                oOptions.selector.id = domId
             }
             try {
                 await this._interactWithControl(oOptions)
@@ -252,6 +271,14 @@ export class WDI5Control {
                 if (logging) {
                     Logger.error(`cannot issue OPA5-press() on control, because ${error?.message}`)
                 }
+                // fall back to direct click when OPA5 press fails
+                try {
+                    await ((await this._getWebElement()) as unknown as WebdriverIO.Element).click()
+                } catch (clickError) {
+                    if (logging) {
+                        Logger.error(`cannot call press() fallback click, because ${clickError?.message}`)
+                    }
+                }
             }
         } else {
             // interact via wdio
@@ -320,7 +347,9 @@ export class WDI5Control {
             if (logging) {
                 this._writeObjectResultLog(result, "interactWithControl()")
             }
-            // return result.result
+            if (result.status !== 0) {
+                throw Error(result.message || "interactWithControl failed")
+            }
             return this
         } else {
             throw Error("control could not be found")
diff --git a/src/service.ts b/src/service.ts
index 626a536d..607c0d5b 100644
--- a/src/service.ts
+++ b/src/service.ts
@@ -40,6 +40,7 @@ export default class Service implements Services.ServiceInstance {
 
         if (browserInstance.isMultiremote) {
             for (const name of (browserInstance as unknown as WebdriverIO.MultiRemoteBrowser).instances) {
+                // TODO: browserInstance[name as keyof typeof browserInstance] repeated multiple times
                 if (this?._capabilities[name].capabilities["wdi5:authentication"]) {
                     await authenticate(this._capabilities[name].capabilities["wdi5:authentication"], name)
                 }
diff --git a/src/types/wdi5.types.ts b/src/types/wdi5.types.ts
index c43cf78e..9cfbb5ca 100644
--- a/src/types/wdi5.types.ts
+++ b/src/types/wdi5.types.ts
@@ -12,6 +12,8 @@ import type { $AggregationContainsPropertyEqualSettings } from "sap/ui/test/matc
 import type { ControlsBaseSelector } from "sap/ui/test/Opa5"
 import type { ControlSelector } from "sap/ui/test/RecordReplay"
 import type Control from "sap/ui/core/Control"
+/* import type Ancestor from "sap/ui/test/matchers/Ancestor"
+import type Descendant from "sap/ui/test/matchers/Descendant" */
 import type ListReport from "sap/fe/test/ListReport"
 import type ObjectPage from "sap/fe/test/ObjectPage"
 import type Shell from "sap/fe/test/Shell"
@@ -137,7 +139,7 @@ export interface wdi5ControlSelector extends ControlsBaseSelector {
     /**
      * Descendant matcher, {@link sap.ui.test.matchers.Descendant}
      */
-    descendant?: any
+    descendant?: Record<string, unknown>
     /**
      * ID of a control (global or within viewName, if viewName is defined)
      */
@@ -237,6 +239,16 @@ export interface wdi5ControlMetadata {
     key?: string // wdio_ui_key
 }
 
+export type ui5FeaturesAvailable = {
+    version: string
+    useFetchWaiter: boolean
+    useGetComponentById: boolean
+    useUI5ElementClosestTo: boolean
+    useOldHashChanger: boolean
+    useOldMatcherAPI: boolean
+    useOldDoubleLeadingSlash: boolean
+}
+
 // yet unused
 export interface wdi5Bridge {
     bridge: typeof RecordReplay
@@ -308,7 +320,7 @@ declare global {
         bridge: wdi5Bridge["bridge"]
         wdi5: wdi5Bridge["wdi5"]
         fe_bridge: wdi5Bridge["fe_bridge"]
-        compareVersions?: { compare: (version1: string, version2: string, operator: string) => boolean }
+        wdi5Ui5FeaturesAvailable: ui5FeaturesAvailable
     }
 
     // Patch SAP namespace to include sap.ui.version
diff --git a/test/tsconfig.json b/test/tsconfig.json
index 1414a33d..7affd72d 100644
--- a/test/tsconfig.json
+++ b/test/tsconfig.json
@@ -18,6 +18,7 @@
   },
   "compilerOptions": {
     // typescript options here
-    "noEmitOnError": false
+    "noEmitOnError": false,
+    "types": ["node", "@wdio/types", "@wdio/globals/types", "@wdio/mocha-framework"]
   }
 }