Improve timeout performance