Add pagination back into the stream #170.