Improved timeout settings