More progress on mapping the FFI