Feature/idempotent