Preparing for table streaming function