Updates for better idempotency with various authentication methods.