Updated module loading.