Added changes to implement PageObjects Pattern