Improving the response API