Made minor changes to enhance the JSON request/response