Changing some things to make sure that all modules are loaded and nothing is missing