Improving request handling