Updated changes for Selenium