Add option for controlling buffer scrambling