Added client timeout option