more adaptions to import of modules