Add timeout to the request handling