Add pagination to streams