better handling of cloud response payloads