Improve idempotence