Changes to Page Factory