Adding infinite resend limit and backoff