Removed C++ types temporarily.