Improve ChatExchange imports after submodule is added