Add Client State Indication (CSI) support