Adapted to the new page class