Revised module loading