improve importing of modules