Add idle-time-out support