[minor] Implement retries and timeouts