Modifications for new cxxcam