Improved PageObject Solution