Add "client" and "requestId"