Added timeout override