Improved handling of requests