More granularity and idempotence