Improved request handling.