better c++ support