Improve module loading