A user equipment (UE) for channel state information (CSI) feedback comprises a transceiver configured to receive, from a base station (BS), configuration information for the CSI feedback, the configuration information indicating a number of antenna panels (Ng) at the BS and a codebook mode, wherein Ng>1 and each of the antenna panels comprises antenna ports with a first polarization (P1) and antenna ports with a second polarization (P2). The UE further comprises a processor operably connected to the transceiver, the processor configured to identify the number of antenna panels (Ng) at the BS, identify a codebook for the CSI feedback based on the codebook mode configured between a first codebook mode and a second codebook mode, and generate the CSI feedback using the identified codebook. The transceiver is further configured to transmit the generated CSI feedback to the BS.