Added Timeout and ConnectionTimeout