Added pagination support to streams