Updates for Page generation