Added timeout and retry defaults