Add option to disable data scrubbing