Restructured Client message handling