Updates for interop