Alignment for the ZC CLI requirements