Revamped module loader