Added some interoperability