Modified Page class