Separate module from interoperability-framework