Modified load_modules