Updated the response formats