Improvement of ability to optionally change timeouts.