1. Add watch/cancel request 2. Add necessary fields in response to return watch error 3. Add watch_id into watch response