Use new timeout modifier