diff --git a/docs/element-selection.md b/docs/element-selection.md
index f8441b17c..bfaebda98 100644
--- a/docs/element-selection.md
+++ b/docs/element-selection.md
@@ -11,7 +11,28 @@ But what happens when it's not?
 
 ## Picking a Specific Element
 
-Say you have a list of items and you want to click the second one. You could write a more specific CSS selector, but sometimes the simplest approach is to tell CodeceptJS which element you want by position:
+Say you have a list of items and you want to click the second one. You could write a more specific CSS selector, but sometimes the simplest approach is to tell CodeceptJS which element you want by position. Chain `first()`, `last()` or `at()` to the action:
+
+```js
+I.click('a').first()
+
+// click the last link
+I.click('a').last()
+
+// click the 2nd link
+I.click('a').at(2)
+
+// fill the second-to-last matching input
+I.fillField('.email-input', 'test@example.com').at(-2)
+```
+
+Chain the selection directly to the action, in the same expression. `await I.click('a').last()` works too. Calling it after the step has run throws an error.
+
+These methods exist on helper actions only. They are not available on custom steps and page object methods.
+
+They differ from `locate('a').first()`, which builds a position into the locator. A chained selection picks from whatever the action matched, including fuzzy matches like `I.click('Submit').last()`.
+
+The same selection is available as a step option:
 
 ```js
 import step from 'codeceptjs/steps'
@@ -108,10 +129,12 @@ It works the other way too. If your helper has `strict: true` globally but you n
 I.click('a', step.opts({ exact: false }))
 ```
 
-And when you know there are multiple matches and want a specific one, `elementIndex` also overrides the strict check — no error is thrown because you've explicitly chosen which element to use:
+And when you know there are multiple matches and want a specific one, `first()`, `last()`, `at()` and `elementIndex` override the strict check — no error is thrown because you've explicitly chosen which element to use:
 
 ```js
-// strict: true in config, but this works without error
+// strict: true in config, but these work without error
+I.click('a').first()
+I.click('a').at(2)
 I.click('a', step.opts({ elementIndex: 2 }))
 ```
 
@@ -120,6 +143,6 @@ I.click('a', step.opts({ elementIndex: 2 }))
 | Situation | Approach |
 |-----------|----------|
 | You want to catch ambiguous locators early | Enable `strict: true` in helper config |
-| You need a specific element from a known list | Use `step.opts({ elementIndex: N })` |
+| You need a specific element from a known list | Chain `.first()`, `.last()` or `.at(N)` to the action |
 | You want to iterate over all matching elements | Use [`eachElement`](/els) from the `els` module |
 | You need full control over element inspection | Use [`grabWebElements`](/WebElement) to get all matches |
diff --git a/docs/locators.md b/docs/locators.md
index 4fd3ea746..6fb586345 100644
--- a/docs/locators.md
+++ b/docs/locators.md
@@ -158,17 +158,15 @@ I.tap('~submit')   // mobile
 
 ## Picking a specific element
 
-When a locator matches several elements on the page, CodeceptJS acts on the first one by default. To target a different match, pass `elementIndex` via `step.opts()`:
+When a locator matches several elements on the page, CodeceptJS acts on the first one by default. To target a different match, chain `first()`, `last()` or `at()` to the action:
 
 ```js
-import step from 'codeceptjs/steps'
-
-I.click('a', step.opts({ elementIndex: 2 }))       // the 2nd link
-I.click('a', step.opts({ elementIndex: 'last' }))  // the last link
-I.fillField('.email-input', 'u@t.com', step.opts({ elementIndex: -1 }))
+I.click('a').at(2)   // the 2nd link
+I.click('a').last()  // the last link
+I.fillField('.email-input', 'u@t.com').at(-1)
 ```
 
-`elementIndex` accepts positive numbers (1-based), negative numbers (`-1` is last), or the aliases `'first'` and `'last'`. It works with `click`, `fillField`, `selectOption`, `checkOption`, and other single-element actions.
+`at()` accepts positive numbers (1-based) and negative numbers (`-1` is last). It works with `click`, `fillField`, `selectOption`, `checkOption`, and other single-element actions. The same selection is available as `step.opts({ elementIndex: 2 })`.
 
 To catch ambiguous locators during development rather than silently using the first match, enable `strict: true` in the helper config, or pass `step.opts({ exact: true })` on a single step:
 
diff --git a/docs/migration-4.md b/docs/migration-4.md
index eba44b583..726fae99d 100644
--- a/docs/migration-4.md
+++ b/docs/migration-4.md
@@ -534,6 +534,8 @@ I.retry(3).click('Submit')  //  I.click('Submit', step.retry(3))
 I.limitTime(10).fillField('Email', 'a@b.c') // I.fillField('Email', 'a@b.c', step.timeout(10))
 ```
 
+You can also chain them to the action: `I.click('Submit').retry(3)`, `I.fillField('Email', 'a@b.c').timeout(10)`. Pass a whole config with `I.click('Submit').stepConfig(step.retry(3).timeout(10))`.
+
 `step.*` configs are also composable with the other step options:
 
 ```js
@@ -648,11 +650,13 @@ The error includes a `fetchDetails()` method that prints XPaths and HTML for eve
 Pick a specific match without writing a more specific locator:
 
 ```js
-I.click('a', step.opts({ elementIndex: 2 }))
-I.click('a', step.opts({ elementIndex: 'last' }))
-I.fillField('input', 'x', step.opts({ elementIndex: -1 }))
+I.click('a').at(2)
+I.click('a').last()
+I.fillField('input', 'x').first()
 ```
 
+`step.opts({ elementIndex: 2 })` does the same.
+
 ### Unfocused Element Detection
 
 `I.type()` and `I.pressKey()` throw `NonFocusedType` if no element has focus. Click or focus the field first.
diff --git a/docs/retry.md b/docs/retry.md
index a32d152e9..d8535b793 100644
--- a/docs/retry.md
+++ b/docs/retry.md
@@ -119,7 +119,7 @@ import step from 'codeceptjs/steps'
 Scenario('checkout', ({ I }) => {
   I.amOnPage('/cart')
   I.click('Proceed to Checkout', step.retry(5))  // retry up to 5 times
-  I.see('Payment')
+  I.see('Payment').retry(3)                      // same, chained to the action
 })
 ```
 
diff --git a/docs/timeouts.md b/docs/timeouts.md
index b23b08dda..2f82dceac 100644
--- a/docs/timeouts.md
+++ b/docs/timeouts.md
@@ -9,14 +9,14 @@ CodeceptJS provides multiple timeout configurations to control test execution ti
 
 ## Step Timeout
 
-Set timeout for individual steps using `step.timeout()`:
+Set timeout for individual steps by chaining `timeout()` to the action, or by passing `step.timeout()`:
 
 ```js
 import step from 'codeceptjs/steps'
 
 Scenario('test with step timeouts', ({ I }) => {
   I.amOnPage('/')
-  I.click('Slow Button', step.timeout(30))
+  I.click('Slow Button').timeout(30)
   I.fillField('Email', 'user@example.com', step.timeout(10))
 })
 ```
diff --git a/docs/webapi/amOnPage.mustache b/docs/webapi/amOnPage.mustache
index c6d58bdc9..ae1693333 100644
--- a/docs/webapi/amOnPage.mustache
+++ b/docs/webapi/amOnPage.mustache
@@ -8,4 +8,4 @@ I.amOnPage('/login'); // opens a login page
 ```
 
 @param {string} url url path or global url.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/appendField.mustache b/docs/webapi/appendField.mustache
index 8daf7b7e2..879ee8cbd 100644
--- a/docs/webapi/appendField.mustache
+++ b/docs/webapi/appendField.mustache
@@ -13,4 +13,4 @@ I.appendField('name', 'John', '.form-container');
 @param {CodeceptJS.LocatorOrString} field located by label|name|CSS|XPath|strict locator
 @param {string} value text value to append.
 @param {?CodeceptJS.LocatorOrString} [context=null] (optional, `null` by default) element located by CSS | XPath | strict locator.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.ElementStepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/attachFile.mustache b/docs/webapi/attachFile.mustache
index 691b57f22..97d381a3e 100644
--- a/docs/webapi/attachFile.mustache
+++ b/docs/webapi/attachFile.mustache
@@ -21,4 +21,4 @@ I.attachFile('#dropzone', 'data/avatar.jpg');
 @param {CodeceptJS.LocatorOrString} locator field located by label|name|CSS|XPath|strict locator.
 @param {string} pathToFile local file path relative to codecept.conf.ts or codecept.conf.js config file.
 @param {?CodeceptJS.LocatorOrString} [context=null] (optional, `null` by default) element located by CSS | XPath | strict locator.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.ElementStepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/blur.mustache b/docs/webapi/blur.mustache
index e10e9b4e3..000898e0c 100644
--- a/docs/webapi/blur.mustache
+++ b/docs/webapi/blur.mustache
@@ -15,4 +15,4 @@ I.dontSee('#add-to-cart-btn');
 
 @param {CodeceptJS.LocatorOrString} locator field located by label|name|CSS|XPath|strict locator.
 @param {any} [options] Playwright only: [Additional options](https://playwright.dev/docs/api/class-locator#locator-blur) for available options object as 2nd argument.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.ElementStepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/checkOption.mustache b/docs/webapi/checkOption.mustache
index c7a4c4582..160473697 100644
--- a/docs/webapi/checkOption.mustache
+++ b/docs/webapi/checkOption.mustache
@@ -10,4 +10,4 @@ I.checkOption('agree', '//form');
 ```
 @param {CodeceptJS.LocatorOrString} field checkbox located by label | name | CSS | XPath | strict locator.
 @param {?CodeceptJS.LocatorOrString} [context=null] (optional, `null` by default) element located by CSS | XPath | strict locator.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.ElementStepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/clearClipboard.mustache b/docs/webapi/clearClipboard.mustache
index 82fd51e4d..f33506834 100644
--- a/docs/webapi/clearClipboard.mustache
+++ b/docs/webapi/clearClipboard.mustache
@@ -5,4 +5,4 @@ I.clearClipboard();
 I.seeClipboardEquals('');
 ```
 
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/clearField.mustache b/docs/webapi/clearField.mustache
index fe0790120..2cd468953 100644
--- a/docs/webapi/clearField.mustache
+++ b/docs/webapi/clearField.mustache
@@ -11,4 +11,4 @@ I.clearField('Email', '.form-container');
 ```
 @param {LocatorOrString} editable field located by label|name|CSS|XPath|strict locator.
 @param {?CodeceptJS.LocatorOrString} [context=null] (optional, `null` by default) element located by CSS | XPath | strict locator.
-@returns {void} automatically synchronized promise through #recorder.
+@returns {CodeceptJS.ElementStepPromise} automatically synchronized promise through #recorder.
diff --git a/docs/webapi/click.mustache b/docs/webapi/click.mustache
index e9fa5cfbf..5253b660b 100644
--- a/docs/webapi/click.mustache
+++ b/docs/webapi/click.mustache
@@ -30,4 +30,4 @@ I.click({role: 'button', name: 'Submit'});
 
 @param {CodeceptJS.LocatorOrString} [locator='//body'] (optional, `'//body'` by default) clickable link or button located by text, or any element located by CSS|XPath|strict locator.
 @param {?CodeceptJS.LocatorOrString | null} [context=null] (optional, `null` by default) element to search in CSS|XPath|Strict locator.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.ElementStepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/clickLink.mustache b/docs/webapi/clickLink.mustache
index a1a6983ab..4a96d001f 100644
--- a/docs/webapi/clickLink.mustache
+++ b/docs/webapi/clickLink.mustache
@@ -5,4 +5,4 @@ I.clickLink('Logout', '#nav');
 ```
 @param {CodeceptJS.LocatorOrString} locator clickable link or button located by text, or any element located by CSS|XPath|strict locator
 @param {?CodeceptJS.LocatorOrString} [context=null] (optional, `null` by default) element to search in CSS|XPath|Strict locator
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.ElementStepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/closeCurrentTab.mustache b/docs/webapi/closeCurrentTab.mustache
index f7fbb3f77..88ac56cd8 100644
--- a/docs/webapi/closeCurrentTab.mustache
+++ b/docs/webapi/closeCurrentTab.mustache
@@ -4,4 +4,4 @@ Close current tab.
 I.closeCurrentTab();
 ```
 
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/closeOtherTabs.mustache b/docs/webapi/closeOtherTabs.mustache
index ac344b859..cdd18b11d 100644
--- a/docs/webapi/closeOtherTabs.mustache
+++ b/docs/webapi/closeOtherTabs.mustache
@@ -5,4 +5,4 @@ Close all tabs except for the current one.
 I.closeOtherTabs();
 ```
 
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/dontSee.mustache b/docs/webapi/dontSee.mustache
index 120367ce5..b74db6376 100644
--- a/docs/webapi/dontSee.mustache
+++ b/docs/webapi/dontSee.mustache
@@ -8,4 +8,4 @@ I.dontSee('Login', '.nav'); // no login inside .nav element
 
 @param {string} text which is not present.
 @param {CodeceptJS.LocatorOrString} [context] (optional) element located by CSS|XPath|strict locator in which to perfrom search.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/dontSeeCheckboxIsChecked.mustache b/docs/webapi/dontSeeCheckboxIsChecked.mustache
index 64359ea38..f9226ece3 100644
--- a/docs/webapi/dontSeeCheckboxIsChecked.mustache
+++ b/docs/webapi/dontSeeCheckboxIsChecked.mustache
@@ -7,4 +7,4 @@ I.dontSeeCheckboxIsChecked('agree'); // located by name
 ```
 
 @param {CodeceptJS.LocatorOrString} field located by label|name|CSS|XPath|strict locator.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/dontSeeCookie.mustache b/docs/webapi/dontSeeCookie.mustache
index 0614324cb..e1c172a10 100644
--- a/docs/webapi/dontSeeCookie.mustache
+++ b/docs/webapi/dontSeeCookie.mustache
@@ -5,4 +5,4 @@ I.dontSeeCookie('auth'); // no auth cookie
 ```
 
 @param {string} name cookie name.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/dontSeeCurrentPathEquals.mustache b/docs/webapi/dontSeeCurrentPathEquals.mustache
index 7142f8560..bf1576160 100644
--- a/docs/webapi/dontSeeCurrentPathEquals.mustache
+++ b/docs/webapi/dontSeeCurrentPathEquals.mustache
@@ -7,4 +7,4 @@ I.dontSeeCurrentPathEquals('/'); // fails for '/', '/?user=ok', '/#top'
 ```
 
 @param {string} path value to check.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/dontSeeCurrentUrlEquals.mustache b/docs/webapi/dontSeeCurrentUrlEquals.mustache
index 316312ffa..15f540352 100644
--- a/docs/webapi/dontSeeCurrentUrlEquals.mustache
+++ b/docs/webapi/dontSeeCurrentUrlEquals.mustache
@@ -7,4 +7,4 @@ I.dontSeeCurrentUrlEquals('http://mysite.com/login'); // absolute urls are also
 ```
 
 @param {string} url value to check.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/dontSeeElement.mustache b/docs/webapi/dontSeeElement.mustache
index b7639a299..573248611 100644
--- a/docs/webapi/dontSeeElement.mustache
+++ b/docs/webapi/dontSeeElement.mustache
@@ -9,4 +9,4 @@ I.dontSeeElement('.modal', '#container');
 
 @param {CodeceptJS.LocatorOrString} locator located by CSS|XPath|Strict locator.
 @param {?CodeceptJS.LocatorOrString} [context=null] (optional, `null` by default) element located by CSS | XPath | strict locator.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/dontSeeElementInDOM.mustache b/docs/webapi/dontSeeElementInDOM.mustache
index 6b509f23f..ad6a39e8a 100644
--- a/docs/webapi/dontSeeElementInDOM.mustache
+++ b/docs/webapi/dontSeeElementInDOM.mustache
@@ -5,4 +5,4 @@ I.dontSeeElementInDOM('.nav'); // checks that element is not on page visible or
 ```
 
 @param {CodeceptJS.LocatorOrString} locator located by CSS|XPath|Strict locator.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/dontSeeInCurrentUrl.mustache b/docs/webapi/dontSeeInCurrentUrl.mustache
index 56bd5cde2..8ca955558 100644
--- a/docs/webapi/dontSeeInCurrentUrl.mustache
+++ b/docs/webapi/dontSeeInCurrentUrl.mustache
@@ -1,4 +1,4 @@
 Checks that current url does not contain a provided fragment.
 
 @param {string} url value to check.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/dontSeeInField.mustache b/docs/webapi/dontSeeInField.mustache
index e1d466145..d4d38bd86 100644
--- a/docs/webapi/dontSeeInField.mustache
+++ b/docs/webapi/dontSeeInField.mustache
@@ -13,4 +13,4 @@ I.dontSeeInField('Name', 'old_value', '.form-container');
 @param {CodeceptJS.LocatorOrString} field located by label|name|CSS|XPath|strict locator.
 @param {CodeceptJS.StringOrSecret} value value to check.
 @param {?CodeceptJS.LocatorOrString} [context=null] (optional, `null` by default) element located by CSS | XPath | strict locator.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/dontSeeInSource.mustache b/docs/webapi/dontSeeInSource.mustache
index 7e6fb6b0e..7115850e1 100644
--- a/docs/webapi/dontSeeInSource.mustache
+++ b/docs/webapi/dontSeeInSource.mustache
@@ -5,4 +5,4 @@ I.dontSeeInSource('<!--'); // no comments in source
 ```
 
 @param {string} value to check.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/dontSeeInTitle.mustache b/docs/webapi/dontSeeInTitle.mustache
index 78844ce3d..d547b2a82 100644
--- a/docs/webapi/dontSeeInTitle.mustache
+++ b/docs/webapi/dontSeeInTitle.mustache
@@ -5,4 +5,4 @@ I.dontSeeInTitle('Error');
 ```
 
 @param {string} text value to check.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/doubleClick.mustache b/docs/webapi/doubleClick.mustache
index b615ed60d..c01a4960f 100644
--- a/docs/webapi/doubleClick.mustache
+++ b/docs/webapi/doubleClick.mustache
@@ -10,4 +10,4 @@ I.doubleClick('.btn.edit');
 
 @param {CodeceptJS.LocatorOrString} locator clickable link or button located by text, or any element located by CSS|XPath|strict locator.
 @param {?CodeceptJS.LocatorOrString} [context=null] (optional, `null` by default) element to search in CSS|XPath|Strict locator.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.ElementStepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/dragAndDrop.mustache b/docs/webapi/dragAndDrop.mustache
index f3ccf888f..78dd5a5ee 100644
--- a/docs/webapi/dragAndDrop.mustache
+++ b/docs/webapi/dragAndDrop.mustache
@@ -6,4 +6,4 @@ I.dragAndDrop('#dragHandle', '#container');
 
 @param {LocatorOrString} srcElement located by CSS|XPath|strict locator.
 @param {LocatorOrString} destElement located by CSS|XPath|strict locator.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.ElementStepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/dragSlider.mustache b/docs/webapi/dragSlider.mustache
index 19030606f..f9bce4fb4 100644
--- a/docs/webapi/dragSlider.mustache
+++ b/docs/webapi/dragSlider.mustache
@@ -8,4 +8,4 @@ I.dragSlider('#slider', -70);
 
 @param {CodeceptJS.LocatorOrString} locator located by label|name|CSS|XPath|strict locator.
 @param {number} offsetX position to drag.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.ElementStepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/fillField.mustache b/docs/webapi/fillField.mustache
index 044a471c4..44ec3623a 100644
--- a/docs/webapi/fillField.mustache
+++ b/docs/webapi/fillField.mustache
@@ -22,4 +22,4 @@ I.fillField('Name', 'John', '#section2');
 @param {CodeceptJS.LocatorOrString} field located by label|name|CSS|XPath|strict locator.
 @param {CodeceptJS.StringOrSecret} value text value to fill.
 @param {?CodeceptJS.LocatorOrString} [context=null] (optional, `null` by default) element located by CSS | XPath | strict locator.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.ElementStepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/focus.mustache b/docs/webapi/focus.mustache
index 3f0a2eeab..3ed90e994 100644
--- a/docs/webapi/focus.mustache
+++ b/docs/webapi/focus.mustache
@@ -10,4 +10,4 @@ I.see('#add-to-cart-bnt');
 
 @param {CodeceptJS.LocatorOrString} locator field located by label|name|CSS|XPath|strict locator.
 @param {any} [options] Playwright only: [Additional options](https://playwright.dev/docs/api/class-locator#locator-focus) for available options object as 2nd argument.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.ElementStepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/forceClick.mustache b/docs/webapi/forceClick.mustache
index 83241f16f..c1594b671 100644
--- a/docs/webapi/forceClick.mustache
+++ b/docs/webapi/forceClick.mustache
@@ -25,4 +25,4 @@ I.forceClick({css: 'nav a.login'});
 
 @param {CodeceptJS.LocatorOrString} locator clickable link or button located by text, or any element located by CSS|XPath|strict locator.
 @param {?CodeceptJS.LocatorOrString} [context=null] (optional, `null` by default) element to search in CSS|XPath|Strict locator.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.ElementStepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/forceRightClick.mustache b/docs/webapi/forceRightClick.mustache
index 3f65eea01..600cc7f27 100644
--- a/docs/webapi/forceRightClick.mustache
+++ b/docs/webapi/forceRightClick.mustache
@@ -15,4 +15,4 @@ I.forceRightClick('Menu');
 
 @param {CodeceptJS.LocatorOrString} locator clickable link or button located by text, or any element located by CSS|XPath|strict locator.
 @param {?CodeceptJS.LocatorOrString} [context=null] (optional, `null` by default) element to search in CSS|XPath|Strict locator.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/grabDataFromPerformanceTiming.mustache b/docs/webapi/grabDataFromPerformanceTiming.mustache
index 8a791a65d..3ea3041d0 100644
--- a/docs/webapi/grabDataFromPerformanceTiming.mustache
+++ b/docs/webapi/grabDataFromPerformanceTiming.mustache
@@ -17,4 +17,4 @@ let data = await I.grabDataFromPerformanceTiming();
   loadEventEnd: 241
 }
 ```
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/moveCursorTo.mustache b/docs/webapi/moveCursorTo.mustache
index b5d212669..3659b53d7 100644
--- a/docs/webapi/moveCursorTo.mustache
+++ b/docs/webapi/moveCursorTo.mustache
@@ -13,4 +13,4 @@ I.moveCursorTo('#submit', '.container');
 @param {CodeceptJS.LocatorOrString} locator located by CSS|XPath|strict locator.
 @param {number|CodeceptJS.LocatorOrString} [offsetX=0] (optional, `0` by default) X-axis offset or context locator.
 @param {number} [offsetY=0] (optional, `0` by default) Y-axis offset.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.ElementStepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/openNewTab.mustache b/docs/webapi/openNewTab.mustache
index 4eaa42f53..a42e0609d 100644
--- a/docs/webapi/openNewTab.mustache
+++ b/docs/webapi/openNewTab.mustache
@@ -4,4 +4,4 @@ Open new tab and switch to it.
 I.openNewTab();
 ```
 
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/pressKeyDown.mustache b/docs/webapi/pressKeyDown.mustache
index 41c728a87..000a6fd1a 100644
--- a/docs/webapi/pressKeyDown.mustache
+++ b/docs/webapi/pressKeyDown.mustache
@@ -9,4 +9,4 @@ I.pressKeyUp('Control');
 ```
 
 @param {string} key name of key to press down.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/pressKeyUp.mustache b/docs/webapi/pressKeyUp.mustache
index 2f5f913db..ec62c42e9 100644
--- a/docs/webapi/pressKeyUp.mustache
+++ b/docs/webapi/pressKeyUp.mustache
@@ -9,4 +9,4 @@ I.pressKeyUp('Control');
 ```
 
 @param {string} key name of key to release.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/pressKeyWithKeyNormalization.mustache b/docs/webapi/pressKeyWithKeyNormalization.mustache
index de923043f..354457d64 100644
--- a/docs/webapi/pressKeyWithKeyNormalization.mustache
+++ b/docs/webapi/pressKeyWithKeyNormalization.mustache
@@ -57,4 +57,4 @@ Some of the supported key names are:
 - `'Tab'`
 
 @param {string|string[]} key key or array of keys to press.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/refreshPage.mustache b/docs/webapi/refreshPage.mustache
index abeab0410..f0b715467 100644
--- a/docs/webapi/refreshPage.mustache
+++ b/docs/webapi/refreshPage.mustache
@@ -3,4 +3,4 @@ Reload the current page.
 ```js
 I.refreshPage();
 ```
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/resizeWindow.mustache b/docs/webapi/resizeWindow.mustache
index dbb7d2b46..58988a0cc 100644
--- a/docs/webapi/resizeWindow.mustache
+++ b/docs/webapi/resizeWindow.mustache
@@ -3,4 +3,4 @@ First parameter can be set to `maximize`.
 
 @param {number} width width in pixels or `maximize`.
 @param {number} height height in pixels.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/rightClick.mustache b/docs/webapi/rightClick.mustache
index 975c9f0d3..32a5d438b 100644
--- a/docs/webapi/rightClick.mustache
+++ b/docs/webapi/rightClick.mustache
@@ -11,4 +11,4 @@ I.rightClick('Click me', '.context');
 
 @param {CodeceptJS.LocatorOrString} locator clickable element located by CSS|XPath|strict locator.
 @param {?CodeceptJS.LocatorOrString} [context=null] (optional, `null` by default) element located by CSS|XPath|strict locator.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.ElementStepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/saveElementScreenshot.mustache b/docs/webapi/saveElementScreenshot.mustache
index 096dda455..0976b5794 100644
--- a/docs/webapi/saveElementScreenshot.mustache
+++ b/docs/webapi/saveElementScreenshot.mustache
@@ -7,4 +7,4 @@ I.saveElementScreenshot(`#submit`,'debug.png');
 
 @param {CodeceptJS.LocatorOrString} locator element located by CSS|XPath|strict locator.
 @param {string} fileName file name to save.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.ElementStepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/saveScreenshot.mustache b/docs/webapi/saveScreenshot.mustache
index 3ea13f757..b98d107a2 100644
--- a/docs/webapi/saveScreenshot.mustache
+++ b/docs/webapi/saveScreenshot.mustache
@@ -9,4 +9,4 @@ I.saveScreenshot('debug.png', true) //resizes to available scrollHeight and scro
 
 @param {string} fileName file name to save.
 @param {boolean} [fullPage=false] (optional, `false` by default) flag to enable fullscreen screenshot mode.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/scrollIntoView.mustache b/docs/webapi/scrollIntoView.mustache
index c6cc00050..5ee0f031e 100644
--- a/docs/webapi/scrollIntoView.mustache
+++ b/docs/webapi/scrollIntoView.mustache
@@ -8,4 +8,4 @@ I.scrollIntoView('#submit', { behavior: "smooth", block: "center", inline: "cent
 
 @param {LocatorOrString} locator located by CSS|XPath|strict locator.
 @param {ScrollIntoViewOptions|boolean} scrollIntoViewOptions either alignToTop=true|false or scrollIntoViewOptions. See https://developer.mozilla.org/en-US/docs/Web/API/Element/scrollIntoView.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/scrollPageToBottom.mustache b/docs/webapi/scrollPageToBottom.mustache
index b3036414c..e1fde5d2f 100644
--- a/docs/webapi/scrollPageToBottom.mustache
+++ b/docs/webapi/scrollPageToBottom.mustache
@@ -3,4 +3,4 @@ Scroll page to the bottom.
 ```js
 I.scrollPageToBottom();
 ```
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/scrollPageToTop.mustache b/docs/webapi/scrollPageToTop.mustache
index ef868e922..745ab0bc7 100644
--- a/docs/webapi/scrollPageToTop.mustache
+++ b/docs/webapi/scrollPageToTop.mustache
@@ -3,4 +3,4 @@ Scroll page to the top.
 ```js
 I.scrollPageToTop();
 ```
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/scrollTo.mustache b/docs/webapi/scrollTo.mustache
index 13ef3fa51..2fb8d6740 100644
--- a/docs/webapi/scrollTo.mustache
+++ b/docs/webapi/scrollTo.mustache
@@ -9,4 +9,4 @@ I.scrollTo('#submit', 5, 5);
 @param {CodeceptJS.LocatorOrString} locator located by CSS|XPath|strict locator.
 @param {number} [offsetX=0] (optional, `0` by default) X-axis offset.
 @param {number} [offsetY=0] (optional, `0` by default) Y-axis offset.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.ElementStepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/see.mustache b/docs/webapi/see.mustache
index 37d2d0415..bc9346356 100644
--- a/docs/webapi/see.mustache
+++ b/docs/webapi/see.mustache
@@ -8,4 +8,4 @@ I.see('Register', {css: 'form.register'}); // use strict locator
 ```
 @param {string} text expected on page.
 @param {?CodeceptJS.LocatorOrString} [context=null] (optional, `null` by default) element located by CSS|Xpath|strict locator in which to search for text.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/seeAttributesOnElements.mustache b/docs/webapi/seeAttributesOnElements.mustache
index 8956d0327..2c14fb06b 100644
--- a/docs/webapi/seeAttributesOnElements.mustache
+++ b/docs/webapi/seeAttributesOnElements.mustache
@@ -6,4 +6,4 @@ I.seeAttributesOnElements('//form', { method: "post"});
 
 @param {CodeceptJS.LocatorOrString} locator located by CSS|XPath|strict locator.
 @param {object} attributes attributes and their values to check.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/seeCheckboxIsChecked.mustache b/docs/webapi/seeCheckboxIsChecked.mustache
index d8f31e0fe..d700dacf5 100644
--- a/docs/webapi/seeCheckboxIsChecked.mustache
+++ b/docs/webapi/seeCheckboxIsChecked.mustache
@@ -7,4 +7,4 @@ I.seeCheckboxIsChecked({css: '#signup_form input[type=checkbox]'});
 ```
 
 @param {CodeceptJS.LocatorOrString} field located by label|name|CSS|XPath|strict locator.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/seeClipboardEquals.mustache b/docs/webapi/seeClipboardEquals.mustache
index f31f8e3a8..ee698c770 100644
--- a/docs/webapi/seeClipboardEquals.mustache
+++ b/docs/webapi/seeClipboardEquals.mustache
@@ -9,4 +9,4 @@ Reading the clipboard requires a secure context (`https` or `localhost`) and is
 in Chromium-based browsers, where read access is granted automatically.
 
 @param {string} text value to check.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/seeCookie.mustache b/docs/webapi/seeCookie.mustache
index 42861abbe..f8a93c59f 100644
--- a/docs/webapi/seeCookie.mustache
+++ b/docs/webapi/seeCookie.mustache
@@ -5,4 +5,4 @@ I.seeCookie('Auth');
 ```
 
 @param {string} name cookie name.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/seeCssPropertiesOnElements.mustache b/docs/webapi/seeCssPropertiesOnElements.mustache
index 057ae66b0..96075970c 100644
--- a/docs/webapi/seeCssPropertiesOnElements.mustache
+++ b/docs/webapi/seeCssPropertiesOnElements.mustache
@@ -6,4 +6,4 @@ I.seeCssPropertiesOnElements('h3', { 'font-weight': "bold"});
 
 @param {CodeceptJS.LocatorOrString} locator located by CSS|XPath|strict locator.
 @param {object} cssProperties object with CSS properties and their values to check.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/seeCurrentPathEquals.mustache b/docs/webapi/seeCurrentPathEquals.mustache
index 1b3d8d4d7..4cda604da 100644
--- a/docs/webapi/seeCurrentPathEquals.mustache
+++ b/docs/webapi/seeCurrentPathEquals.mustache
@@ -7,4 +7,4 @@ I.seeCurrentPathEquals('/'); // passes for '/', '/?user=ok', '/#top'
 ```
 
 @param {string} path value to check.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/seeCurrentUrlEquals.mustache b/docs/webapi/seeCurrentUrlEquals.mustache
index 7f19be15d..e5a8f291f 100644
--- a/docs/webapi/seeCurrentUrlEquals.mustache
+++ b/docs/webapi/seeCurrentUrlEquals.mustache
@@ -8,4 +8,4 @@ I.seeCurrentUrlEquals('http://my.site.com/register');
 ```
 
 @param {string} url value to check.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/seeElement.mustache b/docs/webapi/seeElement.mustache
index ca851a59a..aed23fdfe 100644
--- a/docs/webapi/seeElement.mustache
+++ b/docs/webapi/seeElement.mustache
@@ -13,4 +13,4 @@ I.seeElement({role: 'dialog'});
 > ℹ️ ARIA role locators (`{role, name}`) match elements the way assistive technology does and survive markup refactors. See [Locators](/locators#aria-locators).
 @param {CodeceptJS.LocatorOrString} locator located by CSS|XPath|strict locator.
 @param {?CodeceptJS.LocatorOrString} [context=null] (optional, `null` by default) element located by CSS | XPath | strict locator.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/seeElementInDOM.mustache b/docs/webapi/seeElementInDOM.mustache
index a857d3c72..44ee75fd3 100644
--- a/docs/webapi/seeElementInDOM.mustache
+++ b/docs/webapi/seeElementInDOM.mustache
@@ -5,4 +5,4 @@ Element is located by CSS or XPath.
 I.seeElementInDOM('#modal');
 ```
 @param {CodeceptJS.LocatorOrString} locator element located by CSS|XPath|strict locator.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/seeInClipboard.mustache b/docs/webapi/seeInClipboard.mustache
index aa50c950d..ee8ca37e0 100644
--- a/docs/webapi/seeInClipboard.mustache
+++ b/docs/webapi/seeInClipboard.mustache
@@ -9,4 +9,4 @@ Reading the clipboard requires a secure context (`https` or `localhost`) and is
 in Chromium-based browsers, where read access is granted automatically.
 
 @param {string} text value to check.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/seeInCurrentUrl.mustache b/docs/webapi/seeInCurrentUrl.mustache
index 9a0c6e137..dc794cb3b 100644
--- a/docs/webapi/seeInCurrentUrl.mustache
+++ b/docs/webapi/seeInCurrentUrl.mustache
@@ -5,4 +5,4 @@ I.seeInCurrentUrl('/register'); // we are on registration page
 ```
 
 @param {string} url a fragment to check
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/seeInField.mustache b/docs/webapi/seeInField.mustache
index f400d4592..edb2bec38 100644
--- a/docs/webapi/seeInField.mustache
+++ b/docs/webapi/seeInField.mustache
@@ -14,4 +14,4 @@ I.seeInField('Name', 'John', '.form-container');
 @param {CodeceptJS.LocatorOrString} field located by label|name|CSS|XPath|strict locator.
 @param {CodeceptJS.StringOrSecret} value value to check.
 @param {?CodeceptJS.LocatorOrString} [context=null] (optional, `null` by default) element located by CSS | XPath | strict locator.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/seeInPopup.mustache b/docs/webapi/seeInPopup.mustache
index 2cd1d5067..d53a44b8f 100644
--- a/docs/webapi/seeInPopup.mustache
+++ b/docs/webapi/seeInPopup.mustache
@@ -5,4 +5,4 @@ given string.
 I.seeInPopup('Popup text');
 ```
 @param {string} text value to check.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/seeInSource.mustache b/docs/webapi/seeInSource.mustache
index 77e38c614..6c5303f3d 100644
--- a/docs/webapi/seeInSource.mustache
+++ b/docs/webapi/seeInSource.mustache
@@ -4,4 +4,4 @@ Checks that the current page contains the given string in its raw source code.
 I.seeInSource('<h1>Green eggs &amp; ham</h1>');
 ```
 @param {string} text value to check.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/seeInTitle.mustache b/docs/webapi/seeInTitle.mustache
index 1124c1685..79bb91201 100644
--- a/docs/webapi/seeInTitle.mustache
+++ b/docs/webapi/seeInTitle.mustache
@@ -5,4 +5,4 @@ I.seeInTitle('Home Page');
 ```
 
 @param {string} text text value to check.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/seeNumberOfElements.mustache b/docs/webapi/seeNumberOfElements.mustache
index 07ac61835..e637f2810 100644
--- a/docs/webapi/seeNumberOfElements.mustache
+++ b/docs/webapi/seeNumberOfElements.mustache
@@ -8,4 +8,4 @@ I.seeNumberOfElements('#submitBtn', 1);
 
 @param {CodeceptJS.LocatorOrString} locator element located by CSS|XPath|strict locator.
 @param {number} num number of elements.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/seeNumberOfVisibleElements.mustache b/docs/webapi/seeNumberOfVisibleElements.mustache
index b63fea52e..ef4b7c243 100644
--- a/docs/webapi/seeNumberOfVisibleElements.mustache
+++ b/docs/webapi/seeNumberOfVisibleElements.mustache
@@ -7,4 +7,4 @@ I.seeNumberOfVisibleElements('.buttons', 3);
 
 @param {CodeceptJS.LocatorOrString} locator element located by CSS|XPath|strict locator.
 @param {number} num number of elements.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/seeTextEquals.mustache b/docs/webapi/seeTextEquals.mustache
index 2ddd0eca6..697120241 100644
--- a/docs/webapi/seeTextEquals.mustache
+++ b/docs/webapi/seeTextEquals.mustache
@@ -6,4 +6,4 @@ I.seeTextEquals('text', 'h1');
 
 @param {string} text element value to check.
 @param {CodeceptJS.LocatorOrString?} [context=null]  element located by CSS|XPath|strict locator.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/seeTitleEquals.mustache b/docs/webapi/seeTitleEquals.mustache
index 34e6aa7df..f690c79da 100644
--- a/docs/webapi/seeTitleEquals.mustache
+++ b/docs/webapi/seeTitleEquals.mustache
@@ -5,4 +5,4 @@ I.seeTitleEquals('Test title.');
 ```
 
 @param {string} text value to check.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/selectOption.mustache b/docs/webapi/selectOption.mustache
index 2dff7d2ec..7c78899a4 100644
--- a/docs/webapi/selectOption.mustache
+++ b/docs/webapi/selectOption.mustache
@@ -23,4 +23,4 @@ I.selectOption('Which OS do you use?', ['Android', 'iOS']);
 @param {LocatorOrString} select field located by label|name|CSS|XPath|strict locator.
 @param {string|Array<*>} option visible text or value of option.
 @param {?CodeceptJS.LocatorOrString} [context=null] (optional, `null` by default) element located by CSS | XPath | strict locator.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.ElementStepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/setCookie.mustache b/docs/webapi/setCookie.mustache
index 1deb9b9e4..88cff4727 100644
--- a/docs/webapi/setCookie.mustache
+++ b/docs/webapi/setCookie.mustache
@@ -13,4 +13,4 @@ I.setCookie([
 ```
 
 @param {Cookie|Array<Cookie>} cookie a cookie object or array of cookie objects.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/startRecordingTraffic.mustache b/docs/webapi/startRecordingTraffic.mustache
index e408917fc..2778f9ff6 100644
--- a/docs/webapi/startRecordingTraffic.mustache
+++ b/docs/webapi/startRecordingTraffic.mustache
@@ -5,4 +5,4 @@ This also resets recorded network requests.
 I.startRecordingTraffic();
 ```
 
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/startRecordingWebSocketMessages.mustache b/docs/webapi/startRecordingWebSocketMessages.mustache
index 0a2f95fa1..72600cdc4 100644
--- a/docs/webapi/startRecordingWebSocketMessages.mustache
+++ b/docs/webapi/startRecordingWebSocketMessages.mustache
@@ -5,4 +5,4 @@ This also resets recorded websocket messages.
 await I.startRecordingWebSocketMessages();
 ```
 
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/stopRecordingWebSocketMessages.mustache b/docs/webapi/stopRecordingWebSocketMessages.mustache
index 837db966c..915f3a755 100644
--- a/docs/webapi/stopRecordingWebSocketMessages.mustache
+++ b/docs/webapi/stopRecordingWebSocketMessages.mustache
@@ -4,4 +4,4 @@ Stops recording WS messages. Recorded WS messages is not flashed.
 await I.stopRecordingWebSocketMessages();
 ```
 
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/switchTo.mustache b/docs/webapi/switchTo.mustache
index 042f39d9c..63582536e 100644
--- a/docs/webapi/switchTo.mustache
+++ b/docs/webapi/switchTo.mustache
@@ -6,4 +6,4 @@ I.switchTo(); // switch back to main page
 ```
 
 @param {?CodeceptJS.LocatorOrString} [locator=null] (optional, `null` by default) element located by CSS|XPath|strict locator.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/switchToNextTab.mustache b/docs/webapi/switchToNextTab.mustache
index e4feceb80..e729d5256 100644
--- a/docs/webapi/switchToNextTab.mustache
+++ b/docs/webapi/switchToNextTab.mustache
@@ -7,4 +7,4 @@ I.switchToNextTab(2);
 
 @param {number} [num] (optional) number of tabs to switch forward, default: 1.
 @param {number | null} [sec] (optional) time in seconds to wait.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/switchToPreviousTab.mustache b/docs/webapi/switchToPreviousTab.mustache
index 178de24f9..eda431f26 100644
--- a/docs/webapi/switchToPreviousTab.mustache
+++ b/docs/webapi/switchToPreviousTab.mustache
@@ -7,4 +7,4 @@ I.switchToPreviousTab(2);
 
 @param {number} [num] (optional) number of tabs to switch backward, default: 1.
 @param {number?} [sec] (optional) time in seconds to wait.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/type.mustache b/docs/webapi/type.mustache
index 22156caad..988cf301e 100644
--- a/docs/webapi/type.mustache
+++ b/docs/webapi/type.mustache
@@ -18,4 +18,4 @@ I.type(secret('123456'));
 
 @param {string|string[]} key or array of keys to type.
 @param {?number} [delay=null] (optional) delay in ms between key presses
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/uncheckOption.mustache b/docs/webapi/uncheckOption.mustache
index 69d5c98ae..258c8e83a 100644
--- a/docs/webapi/uncheckOption.mustache
+++ b/docs/webapi/uncheckOption.mustache
@@ -10,4 +10,4 @@ I.uncheckOption('agree', '//form');
 ```
 @param {CodeceptJS.LocatorOrString} field checkbox located by label | name | CSS | XPath | strict locator.
 @param {?CodeceptJS.LocatorOrString} [context=null] (optional, `null` by default) element located by CSS | XPath | strict locator.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.ElementStepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/wait.mustache b/docs/webapi/wait.mustache
index 544f5ebb4..f44f69de4 100644
--- a/docs/webapi/wait.mustache
+++ b/docs/webapi/wait.mustache
@@ -5,4 +5,4 @@ I.wait(2); // wait 2 secs
 ```
 
 @param {number} sec number of second to wait.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/waitForClickable.mustache b/docs/webapi/waitForClickable.mustache
index 7e11e1d8c..36f6ba6f2 100644
--- a/docs/webapi/waitForClickable.mustache
+++ b/docs/webapi/waitForClickable.mustache
@@ -8,4 +8,4 @@ I.waitForClickable('.btn.continue', 5); // wait for 5 secs
 
 @param {CodeceptJS.LocatorOrString} locator element located by CSS|XPath|strict locator.
 @param {number} [sec] (optional, `1` by default) time in seconds to wait
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/waitForCookie.mustache b/docs/webapi/waitForCookie.mustache
index ae1419be9..80729cd75 100644
--- a/docs/webapi/waitForCookie.mustache
+++ b/docs/webapi/waitForCookie.mustache
@@ -6,4 +6,4 @@ I.waitForCookie("token");
 
 @param {string} name expected cookie name.
 @param {number} [sec=3] (optional, `3` by default) time in seconds to wait
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/waitForDetached.mustache b/docs/webapi/waitForDetached.mustache
index 16a9a920f..cdcf5342e 100644
--- a/docs/webapi/waitForDetached.mustache
+++ b/docs/webapi/waitForDetached.mustache
@@ -7,4 +7,4 @@ I.waitForDetached('#popup');
 
 @param {CodeceptJS.LocatorOrString} locator element located by CSS|XPath|strict locator.
 @param {number} [sec=1] (optional, `1` by default) time in seconds to wait
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/waitForDisabled.mustache b/docs/webapi/waitForDisabled.mustache
index c2822db30..4fe6c64ba 100644
--- a/docs/webapi/waitForDisabled.mustache
+++ b/docs/webapi/waitForDisabled.mustache
@@ -3,4 +3,4 @@ Element can be located by CSS or XPath.
 
 @param {CodeceptJS.LocatorOrString} locator element located by CSS|XPath|strict locator.
 @param {number} [sec=1] (optional) time in seconds to wait, 1 by default.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/waitForElement.mustache b/docs/webapi/waitForElement.mustache
index 726e0a054..238a7dbdd 100644
--- a/docs/webapi/waitForElement.mustache
+++ b/docs/webapi/waitForElement.mustache
@@ -8,4 +8,4 @@ I.waitForElement('.btn.continue', 5); // wait for 5 secs
 
 @param {CodeceptJS.LocatorOrString} locator element located by CSS|XPath|strict locator.
 @param {number} [sec] (optional, `1` by default) time in seconds to wait
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/waitForEnabled.mustache b/docs/webapi/waitForEnabled.mustache
index ab8c6afd4..31e6738e5 100644
--- a/docs/webapi/waitForEnabled.mustache
+++ b/docs/webapi/waitForEnabled.mustache
@@ -3,4 +3,4 @@ Element can be located by CSS or XPath.
 
 @param {CodeceptJS.LocatorOrString} locator element located by CSS|XPath|strict locator.
 @param {number} [sec=1] (optional) time in seconds to wait, 1 by default.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/waitForFunction.mustache b/docs/webapi/waitForFunction.mustache
index 2dd40ffb6..55b66955b 100644
--- a/docs/webapi/waitForFunction.mustache
+++ b/docs/webapi/waitForFunction.mustache
@@ -14,4 +14,4 @@ I.waitForFunction((count) => window.requests == count, [3], 5) // pass args and
 @param {string|function} fn to be executed in browser context.
 @param {any[]|number} [argsOrSec] (optional, `1` by default) arguments for function or seconds.
 @param {number} [sec] (optional, `1` by default) time in seconds to wait
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/waitForInvisible.mustache b/docs/webapi/waitForInvisible.mustache
index 29981388d..a22b5f1c1 100644
--- a/docs/webapi/waitForInvisible.mustache
+++ b/docs/webapi/waitForInvisible.mustache
@@ -7,4 +7,4 @@ I.waitForInvisible('#popup');
 
 @param {CodeceptJS.LocatorOrString} locator element located by CSS|XPath|strict locator.
 @param {number} [sec=1] (optional, `1` by default) time in seconds to wait
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/waitForNumberOfTabs.mustache b/docs/webapi/waitForNumberOfTabs.mustache
index 68b5035df..8a78e3c23 100644
--- a/docs/webapi/waitForNumberOfTabs.mustache
+++ b/docs/webapi/waitForNumberOfTabs.mustache
@@ -6,4 +6,4 @@ I.waitForNumberOfTabs(2);
 
 @param {number} expectedTabs expecting the number of tabs.
 @param {number} sec number of secs to wait.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/waitForText.mustache b/docs/webapi/waitForText.mustache
index 5cf82273a..e26cf3766 100644
--- a/docs/webapi/waitForText.mustache
+++ b/docs/webapi/waitForText.mustache
@@ -10,4 +10,4 @@ I.waitForText('Thank you, form has been submitted', 5, '#modal');
 @param {string }text to wait for.
 @param {number} [sec=1] (optional, `1` by default) time in seconds to wait
 @param {CodeceptJS.LocatorOrString} [context] (optional) element located by CSS|XPath|strict locator.
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/waitForValue.mustache b/docs/webapi/waitForValue.mustache
index 55a4c0512..4b825962b 100644
--- a/docs/webapi/waitForValue.mustache
+++ b/docs/webapi/waitForValue.mustache
@@ -7,4 +7,4 @@ I.waitForValue('//input', "GoodValue");
 @param {LocatorOrString} field input field.
 @param {string }value expected value.
 @param {number} [sec=1] (optional, `1` by default) time in seconds to wait
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/waitForVisible.mustache b/docs/webapi/waitForVisible.mustache
index 714431a03..5d8b1df98 100644
--- a/docs/webapi/waitForVisible.mustache
+++ b/docs/webapi/waitForVisible.mustache
@@ -7,4 +7,4 @@ I.waitForVisible('#popup');
 
 @param {CodeceptJS.LocatorOrString} locator element located by CSS|XPath|strict locator.
 @param {number} [sec=1] (optional, `1` by default) time in seconds to wait
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/waitInUrl.mustache b/docs/webapi/waitInUrl.mustache
index 84ff86f41..610239b91 100644
--- a/docs/webapi/waitInUrl.mustache
+++ b/docs/webapi/waitInUrl.mustache
@@ -6,4 +6,4 @@ I.waitInUrl('/info', 2);
 
 @param {string} urlPart value to check.
 @param {number} [sec=1] (optional, `1` by default) time in seconds to wait
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/waitNumberOfVisibleElements.mustache b/docs/webapi/waitNumberOfVisibleElements.mustache
index 9b99347dc..65db325e2 100644
--- a/docs/webapi/waitNumberOfVisibleElements.mustache
+++ b/docs/webapi/waitNumberOfVisibleElements.mustache
@@ -7,4 +7,4 @@ I.waitNumberOfVisibleElements('a', 3);
 @param {CodeceptJS.LocatorOrString} locator element located by CSS|XPath|strict locator.
 @param {number} num number of elements.
 @param {number} [sec=1] (optional, `1` by default) time in seconds to wait
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/waitToHide.mustache b/docs/webapi/waitToHide.mustache
index 941158879..042de0c44 100644
--- a/docs/webapi/waitToHide.mustache
+++ b/docs/webapi/waitToHide.mustache
@@ -7,4 +7,4 @@ I.waitToHide('#popup');
 
 @param {CodeceptJS.LocatorOrString} locator element located by CSS|XPath|strict locator.
 @param {number} [sec=1] (optional, `1` by default) time in seconds to wait
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/docs/webapi/waitUrlEquals.mustache b/docs/webapi/waitUrlEquals.mustache
index 33caddedf..e53a6ab51 100644
--- a/docs/webapi/waitUrlEquals.mustache
+++ b/docs/webapi/waitUrlEquals.mustache
@@ -7,4 +7,4 @@ I.waitUrlEquals('http://127.0.0.1:8000/info');
 
 @param {string} urlPart value to check.
 @param {number} [sec=1] (optional, `1` by default) time in seconds to wait
-@returns {void} automatically synchronized promise through #recorder
+@returns {CodeceptJS.StepPromise} automatically synchronized promise through #recorder
diff --git a/lib/actor.js b/lib/actor.js
index f16967d36..73022d78f 100644
--- a/lib/actor.js
+++ b/lib/actor.js
@@ -1,5 +1,6 @@
 import Step, { MetaStep } from './step.js'
-import recordStep from './step/record.js'
+import recordStep, { applyStepConfig } from './step/record.js'
+import StepConfig from './step/config.js'
 import { methodsOfObject } from './utils.js'
 import event from './event.js'
 import output from './output.js'
@@ -29,6 +30,23 @@ class Actor {
   }
 }
 
+function addStepConfigChain(promise, step) {
+  promise.stepConfig = config => {
+    if (step.status !== 'queued') {
+      throw new Error(`Can't configure "${step.title}": the step was already executed. Chain it to the step call: I.${step.title}(...).first()`)
+    }
+    applyStepConfig(step, config)
+    return promise
+  }
+
+  promise.first = () => promise.stepConfig(new StepConfig({ elementIndex: 'first' }))
+  promise.last = () => promise.stepConfig(new StepConfig({ elementIndex: 'last' }))
+  promise.at = position => promise.stepConfig(new StepConfig({ elementIndex: position }))
+  promise.timeout = seconds => promise.stepConfig(new StepConfig().timeout(seconds))
+  promise.retry = retry => promise.stepConfig(new StepConfig().retry(retry))
+  return promise
+}
+
 /**
  * Fetches all methods from all enabled helpers,
  * and makes them available to use from I. object
@@ -63,7 +81,7 @@ export default function (obj = {}, container) {
                 step.actor = translation.I
               }
               // add methods to promise chain
-              return recordStep(step, Array.from(arguments))
+              return addStepConfigChain(recordStep(step, Array.from(arguments)), step)
             }
           }
         })
diff --git a/lib/helper/Appium.js b/lib/helper/Appium.js
index fd569f2ec..ac375c57c 100644
--- a/lib/helper/Appium.js
+++ b/lib/helper/Appium.js
@@ -1738,7 +1738,7 @@ class Appium extends Webdriver {
    * ```
    *
    * @param {string} fileName file name to save.
-   * @return {Promise<void>}
+   * @return {CodeceptJS.StepPromise}
    */
   async saveScreenshot(fileName) {
     return super.saveScreenshot(fileName, false)
diff --git a/lib/helper/Playwright.js b/lib/helper/Playwright.js
index 6cfcf420a..4eeb20ca9 100644
--- a/lib/helper/Playwright.js
+++ b/lib/helper/Playwright.js
@@ -2140,7 +2140,7 @@ class Playwright extends Helper {
    * @param {CodeceptJS.LocatorOrString|number} locator Element to click on or X coordinate if no element.
    * @param {number} [x] X coordinate relative to element, or Y coordinate if locator is a number.
    * @param {number} [y] Y coordinate relative to element.
-   * @returns {Promise<void>}
+   * @returns {CodeceptJS.ElementStepPromise}
    */
   async clickXY(locator, x, y) {
     // If locator is a number, treat it as global X coordinate
diff --git a/lib/helper/Puppeteer.js b/lib/helper/Puppeteer.js
index 7102f35da..f38e5ae48 100644
--- a/lib/helper/Puppeteer.js
+++ b/lib/helper/Puppeteer.js
@@ -1299,7 +1299,7 @@ class Puppeteer extends Helper {
     } else {
       assertElementExists(els, locator, 'Clickable element')
     }
-    const elem = els[0]
+    const elem = selectElement(els, locator, this)
     return this.executeScript(el => {
       if (document.activeElement instanceof HTMLElement) {
         document.activeElement.blur()
diff --git a/lib/recorder.js b/lib/recorder.js
index a83e0baa1..8ebddcae9 100644
--- a/lib/recorder.js
+++ b/lib/recorder.js
@@ -184,7 +184,7 @@ export default {
    *     undefined: `add(fn)` -> `false` and `add('step',fn)` -> `true`
    *     true: it will retries if `retryOpts` set.
    *     false: ignore `retryOpts` and won't retry.
-   * @param {number} [timeout]
+   * @param {number|function} [timeout] in milliseconds, or a function returning it when the task starts
    * @return {Promise<*>}
    * @inner
    */
@@ -202,6 +202,7 @@ export default {
     debug(chalk.gray(`${currentQueue()} Queued | ${taskName}`))
 
     return (promise = Promise.resolve(promise).then(res => {
+      if (typeof timeout === 'function') timeout = timeout()
       debug(`${currentQueue()} Running | ${taskName} | Timeout: ${timeout || 'None'}`)
 
       const runTask = () => {
diff --git a/lib/step/record.js b/lib/step/record.js
index 8bac4d50a..29e7d71d6 100644
--- a/lib/step/record.js
+++ b/lib/step/record.js
@@ -4,28 +4,30 @@ import StepConfig from './config.js'
 import output from '../output.js'
 import store from '../store.js'
 import { TIMEOUT_ORDER } from '../timeout.js'
-import retryStep from './retry.js'
+import retryStep, { releaseStepRetry } from './retry.js'
 import { fixErrorStack } from '../utils/typescript.js'
+
+function applyStepConfig(step, stepConfig) {
+  const { opts, timeout, retry } = stepConfig.getConfig()
+
+  if (opts) {
+    output.debug(`Step ${step.title}: options applied ${JSON.stringify(opts)}`)
+    step.opts = { ...step.opts, ...opts }
+    store.stepOptions = step.opts
+  }
+  if (timeout) {
+    output.debug(`Step ${step.title} timeout ${timeout}s`)
+    step.setTimeout(timeout * 1000, TIMEOUT_ORDER.codeLimitTime)
+  }
+  if (retry) retryStep(step, retry)
+}
+
 function recordStep(step, args) {
   step.status = 'queued'
 
   // apply step configuration
   const lastArg = args[args.length - 1]
-  if (StepConfig.isStepConfig(lastArg)) {
-    const stepConfig = args.pop()
-    const { opts, timeout, retry } = stepConfig.getConfig()
-
-    if (opts) {
-      output.debug(`Step ${step.title}: options applied ${JSON.stringify(opts)}`)
-      store.stepOptions = opts
-      step.opts = opts
-    }
-    if (timeout) {
-      output.debug(`Step ${step.title} timeout ${timeout}s`)
-      step.setTimeout(timeout * 1000, TIMEOUT_ORDER.codeLimitTime)
-    }
-    if (retry) retryStep(retry)
-  }
+  if (StepConfig.isStepConfig(lastArg)) applyStepConfig(step, args.pop())
 
   step.setArguments(args)
   // run async before step hooks
@@ -47,18 +49,20 @@ function recordStep(step, args) {
     },
     false,
     undefined,
-    step.timeout,
+    () => step.timeout,
   )
 
   event.emit(event.step.after, step)
 
   recorder.add('step passed', () => {
+    releaseStepRetry(step)
     step.endTime = +Date.now()
     event.emit(event.step.passed, step, val)
     event.emit(event.step.finished, step)
   })
 
   recorder.catch(err => {
+    releaseStepRetry(step)
     step.status = 'failed'
     step.endTime = +Date.now()
     
@@ -79,4 +83,5 @@ function recordStep(step, args) {
   return recorder.promise()
 }
 
+export { applyStepConfig }
 export default recordStep
diff --git a/lib/step/retry.js b/lib/step/retry.js
index fdc6e8973..fba4ccc27 100644
--- a/lib/step/retry.js
+++ b/lib/step/retry.js
@@ -1,11 +1,18 @@
 import recorder from '../recorder.js'
-import event from '../event.js'
 
-function retryStep(opts) {
-  if (opts === undefined) opts = 1
-  recorder.retry(opts)
-  // remove retry once the step passed
-  recorder.add(() => event.dispatcher.once(event.step.finished, () => recorder.retries.pop()))
+function retryStep(step, opts) {
+  releaseStepRetry(step)
+  let rule = opts
+  if (Number.isInteger(opts)) rule = { retries: opts }
+  recorder.retry(rule)
+  step.retryRule = rule
 }
 
+function releaseStepRetry(step) {
+  if (!step.retryRule) return
+  recorder.retries = recorder.retries.filter(rule => rule !== step.retryRule)
+  step.retryRule = null
+}
+
+export { releaseStepRetry }
 export default retryStep
diff --git a/test/acceptance/step_chain_test.js b/test/acceptance/step_chain_test.js
new file mode 100644
index 000000000..1135bfa31
--- /dev/null
+++ b/test/acceptance/step_chain_test.js
@@ -0,0 +1,131 @@
+import assert from 'assert'
+import { container, event } from '../../lib/index.js'
+import { tryTo } from '../../lib/effects.js'
+
+Feature('step config chain')
+
+function setStrict(value) {
+  Object.values(container.helpers()).forEach(helper => {
+    if (helper.options) helper.options.strict = value
+  })
+}
+
+Before(() => setStrict(true))
+After(() => setStrict(false))
+
+const allHelpers = '@Playwright @Puppeteer @WebDriverIO'
+const browserOnly = '@Playwright @Puppeteer'
+const strictPage = '/form/strict_mode'
+const buttons = '.duplicate-btn'
+const fields = 'input[name="duplicate-field"]'
+const checkboxes = 'input[name="terms"]'
+
+function seeOnlyFieldFilled(I, position) {
+  for (const current of [1, 2, 3]) {
+    const field = { css: `${fields}:nth-of-type(${current})` }
+    if (current === position) I.seeInField(field, 'chained')
+    else I.dontSeeInField(field, 'chained')
+  }
+}
+
+const actions = [
+  ['click', allHelpers, strictPage, I => I.click(buttons)],
+  ['forceClick', allHelpers, strictPage, I => I.forceClick(buttons)],
+  ['doubleClick', allHelpers, strictPage, I => I.doubleClick(buttons)],
+  ['rightClick', allHelpers, strictPage, I => I.rightClick(buttons)],
+  ['fillField', allHelpers, strictPage, I => I.fillField(fields, 'value')],
+  ['appendField', allHelpers, strictPage, I => I.appendField(fields, 'value')],
+  ['clearField', allHelpers, strictPage, I => I.clearField(fields)],
+  ['checkOption', allHelpers, strictPage, I => I.checkOption(checkboxes)],
+  ['uncheckOption', allHelpers, strictPage, I => I.uncheckOption(checkboxes)],
+  ['selectOption', allHelpers, '/form/field_values', I => I.selectOption('select', 'not seen two')],
+  ['attachFile', allHelpers, '/form/file', I => I.attachFile('input[type="file"]', '../data/app/avatar.jpg')],
+  ['moveCursorTo', browserOnly, strictPage, I => I.moveCursorTo(buttons)],
+  ['focus', browserOnly, strictPage, I => I.focus(fields)],
+  ['blur', browserOnly, strictPage, I => I.blur(fields)],
+  ['scrollTo', browserOnly, strictPage, I => I.scrollTo(buttons)],
+  ['saveElementScreenshot', '@Playwright', strictPage, I => I.saveElementScreenshot(buttons, 'element_selection.png')],
+  ['clickXY', '@Playwright', strictPage, I => I.clickXY(buttons, 1, 1)],
+  ['clickLink', '@Puppeteer', '/info', I => I.clickLink('a[href]')],
+]
+
+for (const [name, helpers, page, action] of actions) {
+  Scenario(`${name} requires a selection in strict mode ${helpers}`, async ({ I }) => {
+    I.amOnPage(page)
+    let error
+    event.dispatcher.once(event.step.failed, (step, err) => (error = err))
+    await tryTo(() => action(I))
+    assert.equal(error?.constructor.name, 'MultipleElementsFound')
+  })
+
+  Scenario(`${name} works with first() in strict mode ${helpers}`, async ({ I }) => {
+    I.amOnPage(page)
+    await action(I).first()
+  })
+
+  Scenario(`${name} reads the selected position ${helpers}`, async ({ I }) => {
+    I.amOnPage(page)
+    let error
+    event.dispatcher.once(event.step.failed, (step, err) => (error = err))
+    await tryTo(() => action(I).at(100))
+    assert.match(error?.message || '', /exceeds the number of elements/)
+  })
+}
+
+Scenario(`first() selects the first match ${allHelpers}`, async ({ I }) => {
+  I.amOnPage(strictPage)
+  await I.fillField(fields, 'chained').first()
+  seeOnlyFieldFilled(I, 1)
+})
+
+Scenario(`last() selects the last match ${allHelpers}`, async ({ I }) => {
+  I.amOnPage(strictPage)
+  await I.fillField(fields, 'chained').last()
+  seeOnlyFieldFilled(I, 3)
+})
+
+Scenario(`at() selects a match by position ${allHelpers}`, async ({ I }) => {
+  I.amOnPage(strictPage)
+  await I.fillField(fields, 'chained').at(2)
+  seeOnlyFieldFilled(I, 2)
+})
+
+Scenario(`at() counts from the end with a negative position ${allHelpers}`, async ({ I }) => {
+  I.amOnPage(strictPage)
+  await I.fillField(fields, 'chained').at(-2)
+  seeOnlyFieldFilled(I, 2)
+})
+
+Scenario(`selection works without await ${allHelpers}`, ({ I }) => {
+  I.amOnPage(strictPage)
+  I.fillField(fields, 'chained').last()
+  seeOnlyFieldFilled(I, 3)
+})
+
+Scenario(`timeout() interrupts a step ${allHelpers}`, async ({ I }) => {
+  I.amOnPage(strictPage)
+  let error
+  event.dispatcher.once(event.step.failed, (step, err) => (error = err))
+  const startedAt = Date.now()
+  await tryTo(() => I.wait(2).timeout(0.1))
+  assert.match(error?.name || '', /TimeoutError/)
+  assert.ok(Date.now() - startedAt < 1500)
+})
+
+Scenario(`retry() repeats a step until it passes ${allHelpers}`, async ({ I }) => {
+  I.amOnPage(strictPage)
+  I.executeScript(() => {
+    setTimeout(() => {
+      const element = document.createElement('div')
+      element.id = 'appeared-later'
+      document.body.appendChild(element)
+    }, 500)
+  })
+  await I.seeElementInDOM('#appeared-later').retry({ retries: 10, minTimeout: 200, factor: 1 })
+})
+
+Scenario(`options can be combined in a chain ${allHelpers}`, async ({ I }) => {
+  I.amOnPage(strictPage)
+  await I.fillField(fields, 'chained').last().timeout(5).retry(1)
+  seeOnlyFieldFilled(I, 3)
+})
diff --git a/test/unit/actor_test.js b/test/unit/actor_test.js
index 76e8d17b2..d380be2b4 100644
--- a/test/unit/actor_test.js
+++ b/test/unit/actor_test.js
@@ -28,6 +28,7 @@ describe('Actor', () => {
             throw new Error('ups')
           },
           _hidden: () => 'hidden',
+          slow: () => new Promise(resolve => setTimeout(resolve, 200)),
           failAfter: (i = 1) => {
             counter++
             if (counter <= i) throw new Error('ups')
@@ -191,4 +192,140 @@ describe('Actor', () => {
         expect(listeners).toEqual(3)
       })
   })
+
+  describe('element selection chain', () => {
+    let startedOpts
+
+    beforeEach(() => {
+      startedOpts = undefined
+      event.dispatcher.on(event.step.started, step => (startedOpts = step.opts))
+      recorder.start()
+    })
+
+    it('should select first element and keep the step result', async () => {
+      const val = await I.hello().first()
+      expect(val).toEqual('hello world')
+      expect(startedOpts.elementIndex).toEqual('first')
+    })
+
+    it('should select last element', async () => {
+      await I.hello().last()
+      expect(startedOpts.elementIndex).toEqual('last')
+    })
+
+    it('should select element by position', async () => {
+      await I.hello().at(2)
+      expect(startedOpts.elementIndex).toEqual(2)
+    })
+
+    it('should keep options passed with step.opts', async () => {
+      await I.hello(step.opts({ exact: true })).last()
+      expect(startedOpts).toEqual({ exact: true, elementIndex: 'last' })
+    })
+
+    it('should not change the options object shared between steps', async () => {
+      const config = step.opts({ exact: true })
+      await I.hello(config).first()
+      expect(config.getConfig().opts).toEqual({ exact: true })
+    })
+
+    it('should use the option of the last selection in the chain', async () => {
+      await I.hello().first().at(3)
+      expect(startedOpts.elementIndex).toEqual(3)
+    })
+
+    it('should fail when selection is applied after the step was executed', async () => {
+      const promise = I.hello()
+      await promise
+      expect(() => promise.first()).toThrow('already')
+    })
+  })
+
+  describe('step config chain', () => {
+    const noDelay = retries => ({ retries, minTimeout: 0 })
+
+    beforeEach(() => {
+      recorder.retries = []
+      recorder.start()
+    })
+
+    afterEach(() => {
+      recorder.stop()
+      recorder.reset()
+      recorder.retries = []
+    })
+
+    it('should interrupt a step with a chained timeout', async () => {
+      await expect(I.slow().timeout(0.01)).rejects.toThrow('interrupted on timeout')
+    })
+
+    it('should keep the step running within a chained timeout', async () => {
+      await expect(I.hello().timeout(5)).resolves.toEqual('hello world')
+    })
+
+    it('should retry a step with a chained retry', async () => {
+      await I.failAfter(2).retry(noDelay(2))
+      expect(counter).toEqual(0)
+    })
+
+    it('should accept a number of retries', async () => {
+      I.failAfter(1).retry(1)
+      expect(recorder.retries).toEqual([{ retries: 1 }])
+      await recorder.promise()
+    })
+
+    it('should remove a chained retry when the step passes', async () => {
+      await I.failAfter(1).retry(noDelay(1))
+      await recorder.promise()
+      expect(recorder.retries).toEqual([])
+    })
+
+    it('should remove a chained retry when the step fails', async () => {
+      await expect(I.die().retry(noDelay(1))).rejects.toThrow('ups')
+      expect(recorder.retries).toEqual([])
+    })
+
+    it('should not retry the next step after a chained retry', async () => {
+      await I.hello().retry(noDelay(3))
+      await recorder.promise()
+      await expect(I.failAfter(1)).rejects.toThrow('ups')
+    })
+
+    it('should keep a global retry rule', async () => {
+      const globalRule = { retries: 2, minTimeout: 0, when: () => true }
+      recorder.retry(globalRule)
+      await I.failAfter(1).retry(noDelay(1))
+      await recorder.promise()
+      expect(recorder.retries).toEqual([globalRule])
+    })
+
+    it('should replace a retry chained twice', async () => {
+      await I.failAfter(1).retry(noDelay(0)).retry(noDelay(1))
+      await recorder.promise()
+      expect(recorder.retries).toEqual([])
+    })
+
+    it('should apply every option of a step config', async () => {
+      let startedOpts
+      event.dispatcher.on(event.step.started, started => (startedOpts = started.opts))
+      const config = step.opts({ exact: true }).timeout(0.01)
+      await expect(I.slow().stepConfig(config)).rejects.toThrow('interrupted on timeout')
+      expect(startedOpts).toEqual({ exact: true })
+    })
+
+    it('should combine selection with timeout and retry', async () => {
+      let startedOpts
+      event.dispatcher.on(event.step.started, started => (startedOpts = started.opts))
+      const val = await I.hello().first().timeout(5).retry(noDelay(1))
+      expect(val).toEqual('hello world')
+      expect(startedOpts.elementIndex).toEqual('first')
+    })
+
+    it('should fail when a config is applied after the step was executed', async () => {
+      const promise = I.hello()
+      await promise
+      expect(() => promise.timeout(1)).toThrow('already')
+      expect(() => promise.retry(1)).toThrow('already')
+    })
+  })
 })
diff --git a/typings/index.d.ts b/typings/index.d.ts
index d4cb014d1..4f89989ec 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -527,6 +527,18 @@ declare namespace CodeceptJS {
 
   type StringOrSecret = string | CodeceptJS.Secret
 
+  interface StepPromise extends Promise<any> {
+    stepConfig(config: CodeceptJS.StepConfig): this
+    timeout(seconds: number): this
+    retry(retry: number | object): this
+  }
+
+  interface ElementStepPromise extends StepPromise {
+    first(): this
+    last(): this
+    at(position: number): this
+  }
+
   interface GherkinCallback {
     (test: Test): void | Promise<void>
   }
diff --git a/typings/tests/helpers/Appium.types.ts b/typings/tests/helpers/Appium.types.ts
index de7581914..d9e2cfcf1 100644
--- a/typings/tests/helpers/Appium.types.ts
+++ b/typings/tests/helpers/Appium.types.ts
@@ -65,14 +65,14 @@ expectType<Promise<void>>(appium.rotate())
 expectType<Promise<void>>(appium.setImmediateValue())
 expectType<Promise<void>>(appium.simulateTouchId())
 expectType<Promise<void>>(appium.closeApp())
-expectType<void>(appium.appendField(str, str))
-expectType<void>(appium.checkOption(str))
-expectType<void>(appium.click(str))
-expectType<void>(appium.dontSeeCheckboxIsChecked(str))
-expectType<void>(appium.dontSeeElement(str))
-expectType<void>(appium.dontSeeInField(str, str))
-expectType<void>(appium.dontSee(str))
-expectType<void>(appium.fillField(str, str))
+expectType<CodeceptJS.ElementStepPromise>(appium.appendField(str, str))
+expectType<CodeceptJS.ElementStepPromise>(appium.checkOption(str))
+expectType<CodeceptJS.ElementStepPromise>(appium.click(str))
+expectType<CodeceptJS.StepPromise>(appium.dontSeeCheckboxIsChecked(str))
+expectType<CodeceptJS.StepPromise>(appium.dontSeeElement(str))
+expectType<CodeceptJS.StepPromise>(appium.dontSeeInField(str, str))
+expectType<CodeceptJS.StepPromise>(appium.dontSee(str))
+expectType<CodeceptJS.ElementStepPromise>(appium.fillField(str, str))
 expectType<Promise<string[]>>(appium.grabTextFromAll(str))
 expectType<Promise<string>>(appium.grabTextFrom(str))
 expectType<Promise<number>>(appium.grabNumberOfVisibleElements(str))
@@ -80,15 +80,15 @@ expectType<Promise<string>>(appium.grabAttributeFrom(str, str))
 expectType<Promise<string[]>>(appium.grabAttributeFromAll(str, str))
 expectType<Promise<string[]>>(appium.grabValueFromAll(str))
 expectType<Promise<string>>(appium.grabValueFrom(str))
-expectType<Promise<void>>(appium.saveScreenshot(str))
-expectType<void>(appium.scrollIntoView(str, {}))
-expectType<void>(appium.scrollIntoView(str, true))
-expectType<void>(appium.seeCheckboxIsChecked(str))
-expectType<void>(appium.seeElement(str))
-expectType<void>(appium.seeInField(str, str))
-expectType<void>(appium.see(str))
-expectType<void>(appium.selectOption(str, str))
-expectType<void>(appium.waitForElement(str))
-expectType<void>(appium.waitForVisible(str))
-expectType<void>(appium.waitForInvisible(str))
-expectType<void>(appium.waitForText(str))
+expectType<CodeceptJS.StepPromise>(appium.saveScreenshot(str))
+expectType<CodeceptJS.StepPromise>(appium.scrollIntoView(str, {}))
+expectType<CodeceptJS.StepPromise>(appium.scrollIntoView(str, true))
+expectType<CodeceptJS.StepPromise>(appium.seeCheckboxIsChecked(str))
+expectType<CodeceptJS.StepPromise>(appium.seeElement(str))
+expectType<CodeceptJS.StepPromise>(appium.seeInField(str, str))
+expectType<CodeceptJS.StepPromise>(appium.see(str))
+expectType<CodeceptJS.ElementStepPromise>(appium.selectOption(str, str))
+expectType<CodeceptJS.StepPromise>(appium.waitForElement(str))
+expectType<CodeceptJS.StepPromise>(appium.waitForVisible(str))
+expectType<CodeceptJS.StepPromise>(appium.waitForInvisible(str))
+expectType<CodeceptJS.StepPromise>(appium.waitForText(str))
diff --git a/typings/tests/helpers/AppiumTs.types.ts b/typings/tests/helpers/AppiumTs.types.ts
index de7581914..d9e2cfcf1 100644
--- a/typings/tests/helpers/AppiumTs.types.ts
+++ b/typings/tests/helpers/AppiumTs.types.ts
@@ -65,14 +65,14 @@ expectType<Promise<void>>(appium.rotate())
 expectType<Promise<void>>(appium.setImmediateValue())
 expectType<Promise<void>>(appium.simulateTouchId())
 expectType<Promise<void>>(appium.closeApp())
-expectType<void>(appium.appendField(str, str))
-expectType<void>(appium.checkOption(str))
-expectType<void>(appium.click(str))
-expectType<void>(appium.dontSeeCheckboxIsChecked(str))
-expectType<void>(appium.dontSeeElement(str))
-expectType<void>(appium.dontSeeInField(str, str))
-expectType<void>(appium.dontSee(str))
-expectType<void>(appium.fillField(str, str))
+expectType<CodeceptJS.ElementStepPromise>(appium.appendField(str, str))
+expectType<CodeceptJS.ElementStepPromise>(appium.checkOption(str))
+expectType<CodeceptJS.ElementStepPromise>(appium.click(str))
+expectType<CodeceptJS.StepPromise>(appium.dontSeeCheckboxIsChecked(str))
+expectType<CodeceptJS.StepPromise>(appium.dontSeeElement(str))
+expectType<CodeceptJS.StepPromise>(appium.dontSeeInField(str, str))
+expectType<CodeceptJS.StepPromise>(appium.dontSee(str))
+expectType<CodeceptJS.ElementStepPromise>(appium.fillField(str, str))
 expectType<Promise<string[]>>(appium.grabTextFromAll(str))
 expectType<Promise<string>>(appium.grabTextFrom(str))
 expectType<Promise<number>>(appium.grabNumberOfVisibleElements(str))
@@ -80,15 +80,15 @@ expectType<Promise<string>>(appium.grabAttributeFrom(str, str))
 expectType<Promise<string[]>>(appium.grabAttributeFromAll(str, str))
 expectType<Promise<string[]>>(appium.grabValueFromAll(str))
 expectType<Promise<string>>(appium.grabValueFrom(str))
-expectType<Promise<void>>(appium.saveScreenshot(str))
-expectType<void>(appium.scrollIntoView(str, {}))
-expectType<void>(appium.scrollIntoView(str, true))
-expectType<void>(appium.seeCheckboxIsChecked(str))
-expectType<void>(appium.seeElement(str))
-expectType<void>(appium.seeInField(str, str))
-expectType<void>(appium.see(str))
-expectType<void>(appium.selectOption(str, str))
-expectType<void>(appium.waitForElement(str))
-expectType<void>(appium.waitForVisible(str))
-expectType<void>(appium.waitForInvisible(str))
-expectType<void>(appium.waitForText(str))
+expectType<CodeceptJS.StepPromise>(appium.saveScreenshot(str))
+expectType<CodeceptJS.StepPromise>(appium.scrollIntoView(str, {}))
+expectType<CodeceptJS.StepPromise>(appium.scrollIntoView(str, true))
+expectType<CodeceptJS.StepPromise>(appium.seeCheckboxIsChecked(str))
+expectType<CodeceptJS.StepPromise>(appium.seeElement(str))
+expectType<CodeceptJS.StepPromise>(appium.seeInField(str, str))
+expectType<CodeceptJS.StepPromise>(appium.see(str))
+expectType<CodeceptJS.ElementStepPromise>(appium.selectOption(str, str))
+expectType<CodeceptJS.StepPromise>(appium.waitForElement(str))
+expectType<CodeceptJS.StepPromise>(appium.waitForVisible(str))
+expectType<CodeceptJS.StepPromise>(appium.waitForInvisible(str))
+expectType<CodeceptJS.StepPromise>(appium.waitForText(str))
diff --git a/typings/tests/helpers/Playwright.types.ts b/typings/tests/helpers/Playwright.types.ts
index c3ee53627..0f227aad0 100644
--- a/typings/tests/helpers/Playwright.types.ts
+++ b/typings/tests/helpers/Playwright.types.ts
@@ -14,28 +14,28 @@ expectType<void>(playwright.amAcceptingPopups());
 expectType<void>(playwright.acceptPopup());
 expectType<void>(playwright.amCancellingPopups());
 expectType<void>(playwright.cancelPopup());
-expectType<void>(playwright.seeInPopup(str));
+expectType<CodeceptJS.StepPromise>(playwright.seeInPopup(str));
 expectType<void>(playwright._setPage(str));
 expectType<void>(playwright._addPopupListener());
 expectType<void>(playwright._getPageUrl());
 expectType<Promise<string | null>>(playwright.grabPopupText());
 expectType<void>(playwright._createContextPage());
 expectType<void>(playwright._createContextPage({}));
-expectType<void>(playwright.amOnPage(str));
-expectType<void>(playwright.resizeWindow(num, num));
+expectType<CodeceptJS.StepPromise>(playwright.amOnPage(str));
+expectType<CodeceptJS.StepPromise>(playwright.resizeWindow(num, num));
 expectType<void>(playwright.setPlaywrightRequestHeaders(str));
-expectType<void>(playwright.moveCursorTo(str, num, num));
+expectType<CodeceptJS.ElementStepPromise>(playwright.moveCursorTo(str, num, num));
 expectError(playwright.dragAndDrop(str));
-expectType<void>(playwright.dragAndDrop(str, str));
-expectType<void>(playwright.dragAndDrop(str, str, { sourcePosition, targetPosition }));
-expectType<void>(playwright.refreshPage());
-expectType<void>(playwright.scrollPageToTop());
-expectType<void>(playwright.scrollPageToBottom());
-expectType<void>(playwright.scrollTo(str, num, num));
-expectType<void>(playwright.seeInTitle(str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.dragAndDrop(str, str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.dragAndDrop(str, str, { sourcePosition, targetPosition }));
+expectType<CodeceptJS.StepPromise>(playwright.refreshPage());
+expectType<CodeceptJS.StepPromise>(playwright.scrollPageToTop());
+expectType<CodeceptJS.StepPromise>(playwright.scrollPageToBottom());
+expectType<CodeceptJS.ElementStepPromise>(playwright.scrollTo(str, num, num));
+expectType<CodeceptJS.StepPromise>(playwright.seeInTitle(str));
 //playwright.grabPageScrollPosition();
-expectType<void>(playwright.seeTitleEquals(str));
-expectType<void>(playwright.dontSeeInTitle(str));
+expectType<CodeceptJS.StepPromise>(playwright.seeTitleEquals(str));
+expectType<CodeceptJS.StepPromise>(playwright.dontSeeInTitle(str));
 expectType<Promise<string>>(playwright.grabTitle());
 expectType<void>(playwright._locate());
 expectType<void>(playwright._locateCheckable());
@@ -47,52 +47,52 @@ expectType<void>(playwright.closeCurrentTab());
 expectType<void>(playwright.closeOtherTabs());
 expectType<void>(playwright.openNewTab());
 expectType<Promise<number>>(playwright.grabNumberOfOpenTabs());
-expectType<void>(playwright.seeElement(str));
-expectType<void>(playwright.dontSeeElement(str));
-expectType<void>(playwright.seeElementInDOM(str));
-expectType<void>(playwright.dontSeeElementInDOM(str));
+expectType<CodeceptJS.StepPromise>(playwright.seeElement(str));
+expectType<CodeceptJS.StepPromise>(playwright.dontSeeElement(str));
+expectType<CodeceptJS.StepPromise>(playwright.seeElementInDOM(str));
+expectType<CodeceptJS.StepPromise>(playwright.dontSeeElementInDOM(str));
 expectType<Promise<void>>(playwright.handleDownloads(str));
-expectType<void>(playwright.click(str));
-expectType<void>(playwright.click(str, str));
-expectType<void>(playwright.click(str, null, { position }));
-expectType<void>(playwright.forceClick(str));
-expectType<void>(playwright.focus(str));
-expectType<void>(playwright.blur(str));
-expectType<void>(playwright.doubleClick(str));
-expectType<void>(playwright.rightClick(str));
-expectType<void>(playwright.checkOption(str));
-expectType<void>(playwright.uncheckOption(str));
-expectType<void>(playwright.seeCheckboxIsChecked(str));
-expectType<void>(playwright.dontSeeCheckboxIsChecked(str));
-expectType<void>(playwright.pressKeyDown(str));
-expectType<void>(playwright.pressKeyUp(str));
-expectType<void>(playwright.pressKey(str));
-expectType<void>(playwright.type(str));
-expectType<void>(playwright.fillField(str, str));
-expectType<void>(playwright.clearField(str));
-expectType<void>(playwright.appendField(str, str));
-expectType<void>(playwright.seeInField(str, str));
-expectType<void>(playwright.dontSeeInField(str, str));
-expectType<void>(playwright.attachFile(str, str));
-expectType<void>(playwright.selectOption(str, str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.click(str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.click(str, str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.click(str, null, { position }));
+expectType<CodeceptJS.ElementStepPromise>(playwright.forceClick(str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.focus(str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.blur(str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.doubleClick(str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.rightClick(str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.checkOption(str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.uncheckOption(str));
+expectType<CodeceptJS.StepPromise>(playwright.seeCheckboxIsChecked(str));
+expectType<CodeceptJS.StepPromise>(playwright.dontSeeCheckboxIsChecked(str));
+expectType<CodeceptJS.StepPromise>(playwright.pressKeyDown(str));
+expectType<CodeceptJS.StepPromise>(playwright.pressKeyUp(str));
+expectType<CodeceptJS.StepPromise>(playwright.pressKey(str));
+expectType<CodeceptJS.StepPromise>(playwright.type(str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.fillField(str, str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.clearField(str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.appendField(str, str));
+expectType<CodeceptJS.StepPromise>(playwright.seeInField(str, str));
+expectType<CodeceptJS.StepPromise>(playwright.dontSeeInField(str, str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.attachFile(str, str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.selectOption(str, str));
 expectType<Promise<number>>(playwright.grabNumberOfVisibleElements(str));
-expectType<void>(playwright.seeInCurrentUrl(str));
-expectType<void>(playwright.dontSeeInCurrentUrl(str));
-expectType<void>(playwright.seeCurrentUrlEquals(str));
-expectType<void>(playwright.dontSeeCurrentUrlEquals(str));
-expectType<void>(playwright.see(str));
-expectType<void>(playwright.seeTextEquals(str));
-expectType<void>(playwright.dontSee(str));
+expectType<CodeceptJS.StepPromise>(playwright.seeInCurrentUrl(str));
+expectType<CodeceptJS.StepPromise>(playwright.dontSeeInCurrentUrl(str));
+expectType<CodeceptJS.StepPromise>(playwright.seeCurrentUrlEquals(str));
+expectType<CodeceptJS.StepPromise>(playwright.dontSeeCurrentUrlEquals(str));
+expectType<CodeceptJS.StepPromise>(playwright.see(str));
+expectType<CodeceptJS.StepPromise>(playwright.seeTextEquals(str));
+expectType<CodeceptJS.StepPromise>(playwright.dontSee(str));
 expectType<Promise<string>>(playwright.grabSource());
 expectType<Promise<any[]>>(playwright.grabBrowserLogs());
 expectType<Promise<string>>(playwright.grabCurrentUrl());
-expectType<void>(playwright.seeInSource(str));
-expectType<void>(playwright.dontSeeInSource(str));
-expectType<void>(playwright.seeNumberOfElements(str, num));
-expectType<void>(playwright.seeNumberOfVisibleElements(str, num));
-expectType<void>(playwright.setCookie({ name: str, value: str }));
-expectType<void>(playwright.seeCookie(str));
-expectType<void>(playwright.dontSeeCookie(str));
+expectType<CodeceptJS.StepPromise>(playwright.seeInSource(str));
+expectType<CodeceptJS.StepPromise>(playwright.dontSeeInSource(str));
+expectType<CodeceptJS.StepPromise>(playwright.seeNumberOfElements(str, num));
+expectType<CodeceptJS.StepPromise>(playwright.seeNumberOfVisibleElements(str, num));
+expectType<CodeceptJS.StepPromise>(playwright.setCookie({ name: str, value: str }));
+expectType<CodeceptJS.StepPromise>(playwright.seeCookie(str));
+expectType<CodeceptJS.StepPromise>(playwright.dontSeeCookie(str));
 expectType<any>(playwright.grabCookie());
 expectType<void>(playwright.clearCookie());
 expectType<Promise<any>>(playwright.executeScript(() => {}));
@@ -104,38 +104,38 @@ expectType<Promise<string>>(playwright.grabHTMLFrom(str));
 expectType<Promise<string[]>>(playwright.grabHTMLFromAll(str));
 expectType<Promise<string>>(playwright.grabCssPropertyFrom(str, str));
 expectType<Promise<string[]>>(playwright.grabCssPropertyFromAll(str, str));
-expectType<void>(playwright.seeCssPropertiesOnElements(str, str));
-expectType<void>(playwright.seeAttributesOnElements(str, str));
-expectType<void>(playwright.dragSlider(str, num));
+expectType<CodeceptJS.StepPromise>(playwright.seeCssPropertiesOnElements(str, str));
+expectType<CodeceptJS.StepPromise>(playwright.seeAttributesOnElements(str, str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.dragSlider(str, num));
 expectType<Promise<string>>(playwright.grabAttributeFrom(str, str));
 expectType<Promise<string[]>>(playwright.grabAttributeFromAll(str, str));
-expectType<void>(playwright.saveElementScreenshot(str, str));
-expectType<void>(playwright.saveScreenshot(str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.saveElementScreenshot(str, str));
+expectType<CodeceptJS.StepPromise>(playwright.saveScreenshot(str));
 expectType<Promise<object>>(playwright.makeApiRequest(str, str, str));
-expectType<void>(playwright.wait(num));
-expectType<void>(playwright.waitForEnabled(str));
-expectType<void>(playwright.waitForValue(str, str));
-expectType<void>(playwright.waitNumberOfVisibleElements(str, num));
-expectType<void>(playwright.waitForClickable(str));
-expectType<void>(playwright.waitForElement(str));
-expectType<void>(playwright.waitForVisible(str));
-expectType<void>(playwright.waitForInvisible(str));
-expectType<void>(playwright.waitToHide(str));
-expectType<void>(playwright.waitInUrl(str));
-expectType<void>(playwright.waitUrlEquals(str));
-expectType<void>(playwright.waitForText(str));
+expectType<CodeceptJS.StepPromise>(playwright.wait(num));
+expectType<CodeceptJS.StepPromise>(playwright.waitForEnabled(str));
+expectType<CodeceptJS.StepPromise>(playwright.waitForValue(str, str));
+expectType<CodeceptJS.StepPromise>(playwright.waitNumberOfVisibleElements(str, num));
+expectType<CodeceptJS.StepPromise>(playwright.waitForClickable(str));
+expectType<CodeceptJS.StepPromise>(playwright.waitForElement(str));
+expectType<CodeceptJS.StepPromise>(playwright.waitForVisible(str));
+expectType<CodeceptJS.StepPromise>(playwright.waitForInvisible(str));
+expectType<CodeceptJS.StepPromise>(playwright.waitToHide(str));
+expectType<CodeceptJS.StepPromise>(playwright.waitInUrl(str));
+expectType<CodeceptJS.StepPromise>(playwright.waitUrlEquals(str));
+expectType<CodeceptJS.StepPromise>(playwright.waitForText(str));
 expectType<void>(playwright.waitForRequest(str));
 expectType<void>(playwright.waitForResponse(str));
-expectType<void>(playwright.switchTo());
-expectType<void>(playwright.waitForFunction(() => { }));
+expectType<CodeceptJS.StepPromise>(playwright.switchTo());
+expectType<CodeceptJS.StepPromise>(playwright.waitForFunction(() => { }));
 expectType<void>(playwright.waitForNavigation(str));
-expectType<void>(playwright.waitForDetached(str));
-expectType<void>(playwright.grabDataFromPerformanceTiming());
+expectType<CodeceptJS.StepPromise>(playwright.waitForDetached(str));
+expectType<CodeceptJS.StepPromise>(playwright.grabDataFromPerformanceTiming());
 //expectType<Promise<number>>(playwright.grabElementBoundingRect(str));
 expectType<void>(playwright.mockRoute(str));
 expectType<void>(playwright.stopMockingRoute(str));
 
-expectType<void>(playwright.startRecordingTraffic());
+expectType<CodeceptJS.StepPromise>(playwright.startRecordingTraffic());
 expectType<void>(playwright.stopRecordingTraffic());
 expectError(playwright.seeTraffic());
 expectError(playwright.seeTraffic(str));
@@ -148,3 +148,11 @@ expectType<void>(playwright.dontSeeTraffic({ name: str, url: str }));
 expectType<void>(playwright.dontSeeTraffic({ name: str, url: /hello/ }));
 expectError(playwright.dontSeeTraffic({ name: str }));
 expectError(playwright.dontSeeTraffic({ url: str }));
+
+expectType<CodeceptJS.ElementStepPromise>(playwright.click(str).first())
+expectType<CodeceptJS.ElementStepPromise>(playwright.fillField(str, str).last())
+expectType<CodeceptJS.ElementStepPromise>(playwright.checkOption(str).at(2))
+
+expectType<CodeceptJS.StepPromise>(playwright.see(str).timeout(5))
+expectType<CodeceptJS.StepPromise>(playwright.see(str).retry(3))
+expectType<CodeceptJS.ElementStepPromise>(playwright.click(str).first().timeout(5).retry(3))
diff --git a/typings/tests/helpers/PlaywrightTs.types.ts b/typings/tests/helpers/PlaywrightTs.types.ts
index da631d33f..e44b46696 100644
--- a/typings/tests/helpers/PlaywrightTs.types.ts
+++ b/typings/tests/helpers/PlaywrightTs.types.ts
@@ -14,26 +14,26 @@ expectType<Promise<any>>(playwright.amAcceptingPopups());
 expectType<Promise<any>>(playwright.acceptPopup());
 expectType<Promise<any>>(playwright.amCancellingPopups());
 expectType<Promise<any>>(playwright.cancelPopup());
-expectType<Promise<any>>(playwright.seeInPopup(str));
+expectType<CodeceptJS.StepPromise>(playwright.seeInPopup(str));
 expectType<Promise<any>>(playwright._setPage(str));
 expectType<Promise<any>>(playwright._addPopupListener());
 expectType<Promise<any>>(playwright._getPageUrl());
 expectType<Promise<string | null>>(playwright.grabPopupText());
-expectType<Promise<any>>(playwright.amOnPage(str));
-expectType<Promise<any>>(playwright.resizeWindow(num, num));
+expectType<CodeceptJS.StepPromise>(playwright.amOnPage(str));
+expectType<CodeceptJS.StepPromise>(playwright.resizeWindow(num, num));
 expectType<Promise<any>>(playwright.setPlaywrightRequestHeaders(str));
-expectType<Promise<any>>(playwright.moveCursorTo(str, num, num));
+expectType<CodeceptJS.ElementStepPromise>(playwright.moveCursorTo(str, num, num));
 expectError(playwright.dragAndDrop(str));
-expectType<Promise<any>>(playwright.dragAndDrop(str, str));
-expectType<Promise<any>>(playwright.dragAndDrop(str, str, { sourcePosition, targetPosition }));
-expectType<Promise<any>>(playwright.refreshPage());
-expectType<Promise<any>>(playwright.scrollPageToTop());
-expectType<Promise<any>>(playwright.scrollPageToBottom());
-expectType<Promise<any>>(playwright.scrollTo(str, num, num));
-expectType<Promise<any>>(playwright.seeInTitle(str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.dragAndDrop(str, str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.dragAndDrop(str, str, { sourcePosition, targetPosition }));
+expectType<CodeceptJS.StepPromise>(playwright.refreshPage());
+expectType<CodeceptJS.StepPromise>(playwright.scrollPageToTop());
+expectType<CodeceptJS.StepPromise>(playwright.scrollPageToBottom());
+expectType<CodeceptJS.ElementStepPromise>(playwright.scrollTo(str, num, num));
+expectType<CodeceptJS.StepPromise>(playwright.seeInTitle(str));
 //expectType<Promise<any>>(playwright.grabPageScrollPosition());
-expectType<Promise<any>>(playwright.seeTitleEquals(str));
-expectType<Promise<any>>(playwright.dontSeeInTitle(str));
+expectType<CodeceptJS.StepPromise>(playwright.seeTitleEquals(str));
+expectType<CodeceptJS.StepPromise>(playwright.dontSeeInTitle(str));
 expectType<Promise<string>>(playwright.grabTitle());
 expectType<Promise<any>>(playwright._locate());
 expectType<Promise<any>>(playwright._locateCheckable());
@@ -45,52 +45,52 @@ expectType<Promise<any>>(playwright.closeCurrentTab());
 expectType<Promise<any>>(playwright.closeOtherTabs());
 expectType<Promise<any>>(playwright.openNewTab());
 expectType<Promise<number>>(playwright.grabNumberOfOpenTabs());
-expectType<Promise<any>>(playwright.seeElement(str));
-expectType<Promise<any>>(playwright.dontSeeElement(str));
-expectType<Promise<any>>(playwright.seeElementInDOM(str));
-expectType<Promise<any>>(playwright.dontSeeElementInDOM(str));
+expectType<CodeceptJS.StepPromise>(playwright.seeElement(str));
+expectType<CodeceptJS.StepPromise>(playwright.dontSeeElement(str));
+expectType<CodeceptJS.StepPromise>(playwright.seeElementInDOM(str));
+expectType<CodeceptJS.StepPromise>(playwright.dontSeeElementInDOM(str));
 expectType<Promise<void>>(playwright.handleDownloads(str));
-expectType<Promise<any>>(playwright.click(str));
-expectType<Promise<any>>(playwright.click(str, str));
-expectType<Promise<any>>(playwright.click(str, null, { position }));
-expectType<Promise<any>>(playwright.forceClick(str));
-expectType<Promise<any>>(playwright.focus(str));
-expectType<Promise<any>>(playwright.blur(str));
-expectType<Promise<any>>(playwright.doubleClick(str));
-expectType<Promise<any>>(playwright.rightClick(str));
-expectType<Promise<any>>(playwright.checkOption(str));
-expectType<Promise<any>>(playwright.uncheckOption(str));
-expectType<Promise<any>>(playwright.seeCheckboxIsChecked(str));
-expectType<Promise<any>>(playwright.dontSeeCheckboxIsChecked(str));
-expectType<Promise<any>>(playwright.pressKeyDown(str));
-expectType<Promise<any>>(playwright.pressKeyUp(str));
-expectType<Promise<any>>(playwright.pressKey(str));
-expectType<Promise<any>>(playwright.type(str));
-expectType<Promise<any>>(playwright.fillField(str, str));
-expectType<Promise<any>>(playwright.clearField(str));
-expectType<Promise<any>>(playwright.appendField(str, str));
-expectType<Promise<any>>(playwright.seeInField(str, str));
-expectType<Promise<any>>(playwright.dontSeeInField(str, str));
-expectType<Promise<any>>(playwright.attachFile(str, str));
-expectType<Promise<any>>(playwright.selectOption(str, str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.click(str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.click(str, str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.click(str, null, { position }));
+expectType<CodeceptJS.ElementStepPromise>(playwright.forceClick(str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.focus(str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.blur(str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.doubleClick(str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.rightClick(str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.checkOption(str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.uncheckOption(str));
+expectType<CodeceptJS.StepPromise>(playwright.seeCheckboxIsChecked(str));
+expectType<CodeceptJS.StepPromise>(playwright.dontSeeCheckboxIsChecked(str));
+expectType<CodeceptJS.StepPromise>(playwright.pressKeyDown(str));
+expectType<CodeceptJS.StepPromise>(playwright.pressKeyUp(str));
+expectType<CodeceptJS.StepPromise>(playwright.pressKey(str));
+expectType<CodeceptJS.StepPromise>(playwright.type(str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.fillField(str, str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.clearField(str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.appendField(str, str));
+expectType<CodeceptJS.StepPromise>(playwright.seeInField(str, str));
+expectType<CodeceptJS.StepPromise>(playwright.dontSeeInField(str, str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.attachFile(str, str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.selectOption(str, str));
 expectType<Promise<number>>(playwright.grabNumberOfVisibleElements(str));
-expectType<Promise<any>>(playwright.seeInCurrentUrl(str));
-expectType<Promise<any>>(playwright.dontSeeInCurrentUrl(str));
-expectType<Promise<any>>(playwright.seeCurrentUrlEquals(str));
-expectType<Promise<any>>(playwright.dontSeeCurrentUrlEquals(str));
-expectType<Promise<any>>(playwright.see(str));
-expectType<Promise<any>>(playwright.seeTextEquals(str));
-expectType<Promise<any>>(playwright.dontSee(str));
+expectType<CodeceptJS.StepPromise>(playwright.seeInCurrentUrl(str));
+expectType<CodeceptJS.StepPromise>(playwright.dontSeeInCurrentUrl(str));
+expectType<CodeceptJS.StepPromise>(playwright.seeCurrentUrlEquals(str));
+expectType<CodeceptJS.StepPromise>(playwright.dontSeeCurrentUrlEquals(str));
+expectType<CodeceptJS.StepPromise>(playwright.see(str));
+expectType<CodeceptJS.StepPromise>(playwright.seeTextEquals(str));
+expectType<CodeceptJS.StepPromise>(playwright.dontSee(str));
 expectType<Promise<string>>(playwright.grabSource());
 expectType<Promise<any[]>>(playwright.grabBrowserLogs());
 expectType<Promise<string>>(playwright.grabCurrentUrl());
-expectType<Promise<any>>(playwright.seeInSource(str));
-expectType<Promise<any>>(playwright.dontSeeInSource(str));
-expectType<Promise<any>>(playwright.seeNumberOfElements(str, num));
-expectType<Promise<any>>(playwright.seeNumberOfVisibleElements(str, num));
-expectType<Promise<any>>(playwright.setCookie({ name: str, value: str }));
-expectType<Promise<any>>(playwright.seeCookie(str));
-expectType<Promise<any>>(playwright.dontSeeCookie(str));
+expectType<CodeceptJS.StepPromise>(playwright.seeInSource(str));
+expectType<CodeceptJS.StepPromise>(playwright.dontSeeInSource(str));
+expectType<CodeceptJS.StepPromise>(playwright.seeNumberOfElements(str, num));
+expectType<CodeceptJS.StepPromise>(playwright.seeNumberOfVisibleElements(str, num));
+expectType<CodeceptJS.StepPromise>(playwright.setCookie({ name: str, value: str }));
+expectType<CodeceptJS.StepPromise>(playwright.seeCookie(str));
+expectType<CodeceptJS.StepPromise>(playwright.dontSeeCookie(str));
 expectType<Promise<any>>(playwright.grabCookie());
 expectType<Promise<any>>(playwright.clearCookie());
 expectType<Promise<any>>(playwright.executeScript(() => {}));
@@ -102,38 +102,38 @@ expectType<Promise<string>>(playwright.grabHTMLFrom(str));
 expectType<Promise<string[]>>(playwright.grabHTMLFromAll(str));
 expectType<Promise<string>>(playwright.grabCssPropertyFrom(str, str));
 expectType<Promise<string[]>>(playwright.grabCssPropertyFromAll(str, str));
-expectType<Promise<any>>(playwright.seeCssPropertiesOnElements(str, str));
-expectType<Promise<any>>(playwright.seeAttributesOnElements(str, str));
-expectType<Promise<any>>(playwright.dragSlider(str, num));
+expectType<CodeceptJS.StepPromise>(playwright.seeCssPropertiesOnElements(str, str));
+expectType<CodeceptJS.StepPromise>(playwright.seeAttributesOnElements(str, str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.dragSlider(str, num));
 expectType<Promise<string>>(playwright.grabAttributeFrom(str, str));
 expectType<Promise<string[]>>(playwright.grabAttributeFromAll(str, str));
-expectType<Promise<any>>(playwright.saveElementScreenshot(str, str));
-expectType<Promise<any>>(playwright.saveScreenshot(str));
+expectType<CodeceptJS.ElementStepPromise>(playwright.saveElementScreenshot(str, str));
+expectType<CodeceptJS.StepPromise>(playwright.saveScreenshot(str));
 expectType<Promise<object>>(playwright.makeApiRequest(str, str, str));
-expectType<Promise<any>>(playwright.wait(num));
-expectType<Promise<any>>(playwright.waitForEnabled(str));
-expectType<Promise<any>>(playwright.waitForValue(str, str));
-expectType<Promise<any>>(playwright.waitNumberOfVisibleElements(str, num));
-expectType<Promise<any>>(playwright.waitForClickable(str));
-expectType<Promise<any>>(playwright.waitForElement(str));
-expectType<Promise<any>>(playwright.waitForVisible(str));
-expectType<Promise<any>>(playwright.waitForInvisible(str));
-expectType<Promise<any>>(playwright.waitToHide(str));
-expectType<Promise<any>>(playwright.waitInUrl(str));
-expectType<Promise<any>>(playwright.waitUrlEquals(str));
-expectType<Promise<any>>(playwright.waitForText(str));
+expectType<CodeceptJS.StepPromise>(playwright.wait(num));
+expectType<CodeceptJS.StepPromise>(playwright.waitForEnabled(str));
+expectType<CodeceptJS.StepPromise>(playwright.waitForValue(str, str));
+expectType<CodeceptJS.StepPromise>(playwright.waitNumberOfVisibleElements(str, num));
+expectType<CodeceptJS.StepPromise>(playwright.waitForClickable(str));
+expectType<CodeceptJS.StepPromise>(playwright.waitForElement(str));
+expectType<CodeceptJS.StepPromise>(playwright.waitForVisible(str));
+expectType<CodeceptJS.StepPromise>(playwright.waitForInvisible(str));
+expectType<CodeceptJS.StepPromise>(playwright.waitToHide(str));
+expectType<CodeceptJS.StepPromise>(playwright.waitInUrl(str));
+expectType<CodeceptJS.StepPromise>(playwright.waitUrlEquals(str));
+expectType<CodeceptJS.StepPromise>(playwright.waitForText(str));
 expectType<Promise<any>>(playwright.waitForRequest(str));
 expectType<Promise<any>>(playwright.waitForResponse(str));
-expectType<Promise<any>>(playwright.switchTo());
-expectType<Promise<any>>(playwright.waitForFunction(() => { }));
+expectType<CodeceptJS.StepPromise>(playwright.switchTo());
+expectType<CodeceptJS.StepPromise>(playwright.waitForFunction(() => { }));
 expectType<Promise<any>>(playwright.waitForNavigation(str));
-expectType<Promise<any>>(playwright.waitForDetached(str));
-expectType<Promise<any>>(playwright.grabDataFromPerformanceTiming());
+expectType<CodeceptJS.StepPromise>(playwright.waitForDetached(str));
+expectType<CodeceptJS.StepPromise>(playwright.grabDataFromPerformanceTiming());
 //expectType<Promise<number>>(playwright.grabElementBoundingRect(str));
 expectType<Promise<any>>(playwright.mockRoute(str));
 expectType<Promise<any>>(playwright.stopMockingRoute(str));
 
-expectType<Promise<any>>(playwright.startRecordingTraffic());
+expectType<CodeceptJS.StepPromise>(playwright.startRecordingTraffic());
 expectType<Promise<any>>(playwright.stopRecordingTraffic());
 expectError(playwright.seeTraffic());
 expectError(playwright.seeTraffic(str));
@@ -146,3 +146,11 @@ expectType<Promise<any>>(playwright.dontSeeTraffic({ name: str, url: str }));
 expectType<Promise<any>>(playwright.dontSeeTraffic({ name: str, url: /hello/ }));
 expectError(playwright.dontSeeTraffic({ name: str }));
 expectError(playwright.dontSeeTraffic({ url: str }));
+
+expectType<CodeceptJS.ElementStepPromise>(playwright.click(str).first())
+expectType<CodeceptJS.ElementStepPromise>(playwright.fillField(str, str).last())
+expectType<CodeceptJS.ElementStepPromise>(playwright.checkOption(str).at(2))
+
+expectType<CodeceptJS.StepPromise>(playwright.see(str).timeout(5))
+expectType<CodeceptJS.StepPromise>(playwright.see(str).retry(3))
+expectType<CodeceptJS.ElementStepPromise>(playwright.click(str).first().timeout(5).retry(3))
diff --git a/typings/tests/helpers/WebDriverIO.types.ts b/typings/tests/helpers/WebDriverIO.types.ts
index de7de4783..c060ec589 100644
--- a/typings/tests/helpers/WebDriverIO.types.ts
+++ b/typings/tests/helpers/WebDriverIO.types.ts
@@ -7,10 +7,10 @@ const str = 'text'
 const num = 1
 
 expectError(wd.amOnPage())
-expectType<void>(wd.amOnPage(''))
+expectType<CodeceptJS.StepPromise>(wd.amOnPage(''))
 
 expectError(wd.focus())
-expectType<void>(wd.focus('div'))
+expectType<CodeceptJS.ElementStepPromise>(wd.focus('div'))
 wd.focus({ css: 'div' })
 wd.focus({ xpath: '//div' })
 wd.focus({ name: 'div' })
@@ -30,7 +30,7 @@ wd.focus('div', { android: '//div' })
 wd.focus('div', { ios: '//div' })
 
 expectError(wd.blur())
-expectType<void>(wd.blur('div'))
+expectType<CodeceptJS.ElementStepPromise>(wd.blur('div'))
 wd.blur({ css: 'div' })
 wd.blur({ xpath: '//div' })
 wd.blur({ name: 'div' })
@@ -49,8 +49,8 @@ wd.blur('div', { id: '//div' })
 wd.blur('div', { android: '//div' })
 wd.blur('div', { ios: '//div' })
 
-expectType<void>(wd.click())
-expectType<void>(wd.click('div'))
+expectType<CodeceptJS.ElementStepPromise>(wd.click())
+expectType<CodeceptJS.ElementStepPromise>(wd.click('div'))
 wd.click({ css: 'div' })
 wd.click({ xpath: '//div' })
 wd.click({ name: 'div' })
@@ -70,7 +70,7 @@ wd.click('div', { android: '//div' })
 wd.click('div', { ios: '//div' })
 
 expectError(wd.forceClick())
-expectType<void>(wd.forceClick('div'))
+expectType<CodeceptJS.ElementStepPromise>(wd.forceClick('div'))
 wd.forceClick({ css: 'div' })
 wd.forceClick({ xpath: '//div' })
 wd.forceClick({ name: 'div' })
@@ -90,7 +90,7 @@ wd.forceClick('div', { android: '//div' })
 wd.forceClick('div', { ios: '//div' })
 
 expectError(wd.doubleClick())
-expectType<void>(wd.doubleClick('div'))
+expectType<CodeceptJS.ElementStepPromise>(wd.doubleClick('div'))
 wd.doubleClick({ css: 'div' })
 wd.doubleClick({ xpath: '//div' })
 wd.doubleClick({ name: 'div' })
@@ -110,7 +110,7 @@ wd.doubleClick('div', { android: '//div' })
 wd.doubleClick('div', { ios: '//div' })
 
 expectError(wd.rightClick())
-expectType<void>(wd.rightClick('div'))
+expectType<CodeceptJS.ElementStepPromise>(wd.rightClick('div'))
 wd.rightClick({ css: 'div' })
 wd.rightClick({ xpath: '//div' })
 wd.rightClick({ name: 'div' })
@@ -131,7 +131,7 @@ wd.rightClick('div', { ios: '//div' })
 
 expectError(wd.fillField())
 expectError(wd.fillField('div'))
-expectType<void>(wd.fillField('div', str))
+expectType<CodeceptJS.ElementStepPromise>(wd.fillField('div', str))
 wd.fillField({ css: 'div' }, str)
 wd.fillField({ xpath: '//div' }, str)
 wd.fillField({ name: 'div' }, str)
@@ -143,7 +143,7 @@ wd.fillField(locate('div'), str)
 
 expectError(wd.appendField())
 expectError(wd.appendField('div'))
-expectType<void>(wd.appendField('div', str))
+expectType<CodeceptJS.ElementStepPromise>(wd.appendField('div', str))
 wd.appendField({ css: 'div' }, str)
 wd.appendField({ xpath: '//div' }, str)
 wd.appendField({ name: 'div' }, str)
@@ -164,98 +164,98 @@ wd.clearField({ ios: 'div' })
 
 expectError(wd.selectOption())
 expectError(wd.selectOption('div'))
-expectType<void>(wd.selectOption('div', str))
+expectType<CodeceptJS.ElementStepPromise>(wd.selectOption('div', str))
 
 expectError(wd.attachFile())
 expectError(wd.attachFile('div'))
-expectType<void>(wd.attachFile('div', str))
+expectType<CodeceptJS.ElementStepPromise>(wd.attachFile('div', str))
 
 expectError(wd.checkOption())
-expectType<void>(wd.checkOption('div'))
+expectType<CodeceptJS.ElementStepPromise>(wd.checkOption('div'))
 
 expectError(wd.uncheckOption())
-expectType<void>(wd.uncheckOption('div'))
+expectType<CodeceptJS.ElementStepPromise>(wd.uncheckOption('div'))
 
 expectError(wd.seeInTitle())
-expectType<void>(wd.seeInTitle(str))
+expectType<CodeceptJS.StepPromise>(wd.seeInTitle(str))
 
 expectError(wd.seeTitleEquals())
-expectType<void>(wd.seeTitleEquals(str))
+expectType<CodeceptJS.StepPromise>(wd.seeTitleEquals(str))
 
 expectError(wd.dontSeeInTitle())
-expectType<void>(wd.dontSeeInTitle(str))
+expectType<CodeceptJS.StepPromise>(wd.dontSeeInTitle(str))
 
 expectError(wd.see())
-expectType<void>(wd.see(str))
-expectType<void>(wd.see(str, 'div'))
+expectType<CodeceptJS.StepPromise>(wd.see(str))
+expectType<CodeceptJS.StepPromise>(wd.see(str, 'div'))
 
 expectError(wd.dontSee())
-expectType<void>(wd.dontSee(str))
-expectType<void>(wd.dontSee(str, 'div'))
+expectType<CodeceptJS.StepPromise>(wd.dontSee(str))
+expectType<CodeceptJS.StepPromise>(wd.dontSee(str, 'div'))
 
 expectError(wd.seeTextEquals())
-expectType<void>(wd.seeTextEquals(str))
-expectType<void>(wd.seeTextEquals(str, 'div'))
+expectType<CodeceptJS.StepPromise>(wd.seeTextEquals(str))
+expectType<CodeceptJS.StepPromise>(wd.seeTextEquals(str, 'div'))
 
 expectError(wd.seeInField())
 expectError(wd.seeInField('div'))
-expectType<void>(wd.seeInField('div', str))
+expectType<CodeceptJS.StepPromise>(wd.seeInField('div', str))
 
 expectError(wd.dontSeeInField())
 expectError(wd.dontSeeInField('div'))
-expectType<void>(wd.dontSeeInField('div', str))
+expectType<CodeceptJS.StepPromise>(wd.dontSeeInField('div', str))
 
 expectError(wd.seeCheckboxIsChecked())
-expectType<void>(wd.seeCheckboxIsChecked('div'))
+expectType<CodeceptJS.StepPromise>(wd.seeCheckboxIsChecked('div'))
 
 expectError(wd.dontSeeCheckboxIsChecked())
-expectType<void>(wd.dontSeeCheckboxIsChecked('div'))
+expectType<CodeceptJS.StepPromise>(wd.dontSeeCheckboxIsChecked('div'))
 
 expectError(wd.seeElement())
-expectType<void>(wd.seeElement('div'))
+expectType<CodeceptJS.StepPromise>(wd.seeElement('div'))
 
 expectError(wd.dontSeeElement())
-expectType<void>(wd.dontSeeElement('div'))
+expectType<CodeceptJS.StepPromise>(wd.dontSeeElement('div'))
 
 expectError(wd.seeElementInDOM())
-expectType<void>(wd.seeElementInDOM('div'))
+expectType<CodeceptJS.StepPromise>(wd.seeElementInDOM('div'))
 
 expectError(wd.dontSeeElementInDOM())
-expectType<void>(wd.dontSeeElementInDOM('div'))
+expectType<CodeceptJS.StepPromise>(wd.dontSeeElementInDOM('div'))
 
 expectError(wd.seeInSource())
-expectType<void>(wd.seeInSource(str))
+expectType<CodeceptJS.StepPromise>(wd.seeInSource(str))
 
 expectError(wd.dontSeeInSource())
-expectType<void>(wd.dontSeeInSource(str))
+expectType<CodeceptJS.StepPromise>(wd.dontSeeInSource(str))
 
 expectError(wd.seeNumberOfElements())
 expectError(wd.seeNumberOfElements('div'))
-expectType<void>(wd.seeNumberOfElements('div', num))
+expectType<CodeceptJS.StepPromise>(wd.seeNumberOfElements('div', num))
 
 expectError(wd.seeNumberOfVisibleElements())
 expectError(wd.seeNumberOfVisibleElements('div'))
-expectType<void>(wd.seeNumberOfVisibleElements('div', num))
+expectType<CodeceptJS.StepPromise>(wd.seeNumberOfVisibleElements('div', num))
 
 expectError(wd.seeCssPropertiesOnElements())
 expectError(wd.seeCssPropertiesOnElements('div'))
-expectType<void>(wd.seeCssPropertiesOnElements('div', str))
+expectType<CodeceptJS.StepPromise>(wd.seeCssPropertiesOnElements('div', str))
 
 expectError(wd.seeAttributesOnElements())
 expectError(wd.seeAttributesOnElements('div'))
-expectType<void>(wd.seeAttributesOnElements('div', str))
+expectType<CodeceptJS.StepPromise>(wd.seeAttributesOnElements('div', str))
 
 expectError(wd.seeInCurrentUrl())
-expectType<void>(wd.seeInCurrentUrl(str))
+expectType<CodeceptJS.StepPromise>(wd.seeInCurrentUrl(str))
 
 expectError(wd.seeCurrentUrlEquals())
-expectType<void>(wd.seeCurrentUrlEquals(str))
+expectType<CodeceptJS.StepPromise>(wd.seeCurrentUrlEquals(str))
 
 expectError(wd.dontSeeInCurrentUrl())
-expectType<void>(wd.dontSeeInCurrentUrl(str))
+expectType<CodeceptJS.StepPromise>(wd.dontSeeInCurrentUrl(str))
 
 expectError(wd.dontSeeCurrentUrlEquals())
-expectType<void>(wd.dontSeeCurrentUrlEquals(str))
+expectType<CodeceptJS.StepPromise>(wd.dontSeeCurrentUrlEquals(str))
 
 expectError(wd.executeScript())
 expectType<Promise<any>>(wd.executeScript(str))
@@ -273,26 +273,26 @@ wd.scrollIntoView('div', true)
 wd.scrollIntoView('div', { behavior: 'auto', block: 'center', inline: 'center' })
 
 expectError(wd.scrollTo())
-expectType<void>(wd.scrollTo('div'))
-expectType<void>(wd.scrollTo('div', num, num))
+expectType<CodeceptJS.ElementStepPromise>(wd.scrollTo('div'))
+expectType<CodeceptJS.ElementStepPromise>(wd.scrollTo('div', num, num))
 
 expectError(wd.moveCursorTo())
-expectType<void>(wd.moveCursorTo('div'))
-expectType<void>(wd.moveCursorTo('div', num, num))
+expectType<CodeceptJS.ElementStepPromise>(wd.moveCursorTo('div'))
+expectType<CodeceptJS.ElementStepPromise>(wd.moveCursorTo('div', num, num))
 
 expectError(wd.saveScreenshot())
-expectType<void>(wd.saveScreenshot(str))
-expectType<void>(wd.saveScreenshot(str, true))
+expectType<CodeceptJS.StepPromise>(wd.saveScreenshot(str))
+expectType<CodeceptJS.StepPromise>(wd.saveScreenshot(str, true))
 
 expectError(wd.setCookie())
-expectType<void>(wd.setCookie({ name: str, value: str }))
-expectType<void>(wd.setCookie([{ name: str, value: str }]))
+expectType<CodeceptJS.StepPromise>(wd.setCookie({ name: str, value: str }))
+expectType<CodeceptJS.StepPromise>(wd.setCookie([{ name: str, value: str }]))
 
 expectType<void>(wd.clearCookie())
 expectType<void>(wd.clearCookie(str))
 
 expectError(wd.seeCookie())
-expectType<void>(wd.seeCookie(str))
+expectType<CodeceptJS.StepPromise>(wd.seeCookie(str))
 
 expectType<void>(wd.acceptPopup())
 
@@ -302,111 +302,111 @@ expectError(wd.seeInPopup())
 expectType<void>(wd.seeInPopup(str))
 
 expectError(wd.pressKeyDown())
-expectType<void>(wd.pressKeyDown(str))
+expectType<CodeceptJS.StepPromise>(wd.pressKeyDown(str))
 
 expectError(wd.pressKeyUp())
-expectType<void>(wd.pressKeyUp(str))
+expectType<CodeceptJS.StepPromise>(wd.pressKeyUp(str))
 
 expectError(wd.pressKey())
-expectType<void>(wd.pressKey(str))
+expectType<CodeceptJS.StepPromise>(wd.pressKey(str))
 
 expectError(wd.type())
-expectType<void>(wd.type(str))
+expectType<CodeceptJS.StepPromise>(wd.type(str))
 
 expectError(wd.resizeWindow())
 expectError(wd.resizeWindow(num))
-expectType<void>(wd.resizeWindow(num, num))
+expectType<CodeceptJS.StepPromise>(wd.resizeWindow(num, num))
 
 expectError(wd.dragAndDrop())
 expectError(wd.dragAndDrop('div'))
-expectType<void>(wd.dragAndDrop('div', 'div'))
+expectType<CodeceptJS.ElementStepPromise>(wd.dragAndDrop('div', 'div'))
 
 expectError(wd.dragSlider())
-expectType<void>(wd.dragSlider('div', num))
+expectType<CodeceptJS.ElementStepPromise>(wd.dragSlider('div', num))
 
 expectError(wd.switchToWindow())
 expectType<void>(wd.switchToWindow(str))
 
-expectType<void>(wd.closeOtherTabs())
+expectType<CodeceptJS.StepPromise>(wd.closeOtherTabs())
 
 expectError(wd.wait())
-expectType<void>(wd.wait(num))
+expectType<CodeceptJS.StepPromise>(wd.wait(num))
 
 expectError(wd.waitForEnabled())
-expectType<void>(wd.waitForEnabled('div'))
-expectType<void>(wd.waitForEnabled('div', num))
+expectType<CodeceptJS.StepPromise>(wd.waitForEnabled('div'))
+expectType<CodeceptJS.StepPromise>(wd.waitForEnabled('div', num))
 
 expectError(wd.waitForElement())
-expectType<void>(wd.waitForElement('div'))
-expectType<void>(wd.waitForElement('div', num))
+expectType<CodeceptJS.StepPromise>(wd.waitForElement('div'))
+expectType<CodeceptJS.StepPromise>(wd.waitForElement('div', num))
 
 expectError(wd.waitForClickable())
-expectType<void>(wd.waitForClickable('div'))
-expectType<void>(wd.waitForClickable('div', num))
+expectType<CodeceptJS.StepPromise>(wd.waitForClickable('div'))
+expectType<CodeceptJS.StepPromise>(wd.waitForClickable('div', num))
 
 expectError(wd.waitForVisible())
-expectType<void>(wd.waitForVisible('div'))
-expectType<void>(wd.waitForVisible('div', num))
+expectType<CodeceptJS.StepPromise>(wd.waitForVisible('div'))
+expectType<CodeceptJS.StepPromise>(wd.waitForVisible('div', num))
 
 expectError(wd.waitForInvisible())
-expectType<void>(wd.waitForInvisible('div'))
-expectType<void>(wd.waitForInvisible('div', num))
+expectType<CodeceptJS.StepPromise>(wd.waitForInvisible('div'))
+expectType<CodeceptJS.StepPromise>(wd.waitForInvisible('div', num))
 
 expectError(wd.waitToHide())
-expectType<void>(wd.waitToHide('div'))
-expectType<void>(wd.waitToHide('div', num))
+expectType<CodeceptJS.StepPromise>(wd.waitToHide('div'))
+expectType<CodeceptJS.StepPromise>(wd.waitToHide('div', num))
 
 expectError(wd.waitForDetached())
-expectType<void>(wd.waitForDetached('div'))
-expectType<void>(wd.waitForDetached('div', num))
+expectType<CodeceptJS.StepPromise>(wd.waitForDetached('div'))
+expectType<CodeceptJS.StepPromise>(wd.waitForDetached('div', num))
 
 expectError(wd.waitForFunction())
-expectType<void>(wd.waitForFunction('div'))
-expectType<void>(wd.waitForFunction(() => {}))
-expectType<void>(wd.waitForFunction(() => {}, [num], num))
-expectType<void>(wd.waitForFunction(() => {}, [str], num))
+expectType<CodeceptJS.StepPromise>(wd.waitForFunction('div'))
+expectType<CodeceptJS.StepPromise>(wd.waitForFunction(() => {}))
+expectType<CodeceptJS.StepPromise>(wd.waitForFunction(() => {}, [num], num))
+expectType<CodeceptJS.StepPromise>(wd.waitForFunction(() => {}, [str], num))
 
 expectError(wd.waitInUrl())
-expectType<void>(wd.waitInUrl(str))
-expectType<void>(wd.waitInUrl(str, num))
+expectType<CodeceptJS.StepPromise>(wd.waitInUrl(str))
+expectType<CodeceptJS.StepPromise>(wd.waitInUrl(str, num))
 
 expectError(wd.waitForText())
-expectType<void>(wd.waitForText(str))
-expectType<void>(wd.waitForText(str, num, str))
+expectType<CodeceptJS.StepPromise>(wd.waitForText(str))
+expectType<CodeceptJS.StepPromise>(wd.waitForText(str, num, str))
 
 expectError(wd.waitForValue())
 expectError(wd.waitForValue(str))
-expectType<void>(wd.waitForValue(str, str))
-expectType<void>(wd.waitForValue(str, str, num))
+expectType<CodeceptJS.StepPromise>(wd.waitForValue(str, str))
+expectType<CodeceptJS.StepPromise>(wd.waitForValue(str, str, num))
 
 expectError(wd.waitNumberOfVisibleElements())
 expectError(wd.waitNumberOfVisibleElements('div'))
-expectType<void>(wd.waitNumberOfVisibleElements(str, num))
-expectType<void>(wd.waitNumberOfVisibleElements(str, num, num))
+expectType<CodeceptJS.StepPromise>(wd.waitNumberOfVisibleElements(str, num))
+expectType<CodeceptJS.StepPromise>(wd.waitNumberOfVisibleElements(str, num, num))
 
 expectError(wd.waitUrlEquals())
-expectType<void>(wd.waitUrlEquals(str))
-expectType<void>(wd.waitUrlEquals(str, num))
+expectType<CodeceptJS.StepPromise>(wd.waitUrlEquals(str))
+expectType<CodeceptJS.StepPromise>(wd.waitUrlEquals(str, num))
 
-expectType<void>(wd.switchTo())
-expectType<void>(wd.switchTo('div'))
+expectType<CodeceptJS.StepPromise>(wd.switchTo())
+expectType<CodeceptJS.StepPromise>(wd.switchTo('div'))
 
-expectType<void>(wd.switchToNextTab(num, num))
+expectType<CodeceptJS.StepPromise>(wd.switchToNextTab(num, num))
 
-expectType<void>(wd.switchToPreviousTab(num, num))
+expectType<CodeceptJS.StepPromise>(wd.switchToPreviousTab(num, num))
 
-expectType<void>(wd.closeCurrentTab())
+expectType<CodeceptJS.StepPromise>(wd.closeCurrentTab())
 
-expectType<void>(wd.openNewTab())
+expectType<CodeceptJS.StepPromise>(wd.openNewTab())
 
-expectType<void>(wd.refreshPage())
+expectType<CodeceptJS.StepPromise>(wd.refreshPage())
 
-expectType<void>(wd.scrollPageToTop())
+expectType<CodeceptJS.StepPromise>(wd.scrollPageToTop())
 
-expectType<void>(wd.scrollPageToBottom())
+expectType<CodeceptJS.StepPromise>(wd.scrollPageToBottom())
 
 expectError(wd.dontSeeCookie())
-expectType<void>(wd.dontSeeCookie(str))
+expectType<CodeceptJS.StepPromise>(wd.dontSeeCookie(str))
 
 expectError(wd.dragAndDrop())
 expectError(wd.dragAndDrop('#dragHandle'))