Added timeout config option