Add more C++ and Swift