Add c/c++ support