Idempotency improvements