Improving response body handling