Added page and page_entry