Enhance idempotency