Reverted some changes to be closer to C API