Changed default timeout
Improvements