Satisfying QA issues with Client MEssage classes