Add timeout handling. Reduced timeout values.