Add timeout and timeouts config options