Improve the use of the Page class