Added support for PageFactory implementation