add timeout and connection timeout settings