Improve module importing