Updated source -- added interop support