JSON response format

Change-Id: I5f1e96e780fa35b85ce87738c8f3864b177d50e3