Adjustments to support C++ engines