Refactored WebDriver