Add simple CPP support