Improve module loading/unloading/reloading