Added ClientMessage
Fixed CM