Switch singleton pattern to multiton pattern for every modules
Fix a compilation bug of modules