Add next page token support