Support for new OPTI version of CBC