Added timeout controls