More C API changes