Adapt imports so that they work with the latest version of dataconverters