Changed spec to C++ with C wrapper