Improved request handling