Adjust to use PageIdentifier