added support for next page token