More client refactoring
Refactored messages