Add an option to enable SMP version of CBC and turn it on by default