Update for module loading