Add more complete client messaging