Importer updated for clouds