1. Reuse csi_payload_t struct to hold CSI report payload on PUSCH and PUCCH PDU. 2. Move the struct to fapi header file