Feature parity with the C++ version