Update with interop info and bug fix