Changes to Page class