Use updated interop macros