Rework PWD and CWD responses