[okNav] Increase flexibility of innvocation