Improved module loading
Improved module loading