Change to use page object pattern