Adapted to the new Page class