Updated to follow new ffi API