Modified Pages and Page class for the new data structure