Improve response structure