DataSourceWebDriver improvements