Changed method to load modules