Add the ability to switch off CPP11