Added timeout in request handler