Refactored some of the modules for singleton