Kostas - made locator generic and not tightly coupled to webdriver.