Add "W""Z" for ROC ID

Add "W""Z" for ROC ID