Updated to latest FFI