Improve a lot of the interoperability