Shared folder & idempotence changes