Adapt to new page API