Now handling idempotency correctly