Updating client with better message format